Skip to content

Commit

Permalink
🔧 MAINTAIN: Resolve CI Failures; Drop Python 3.6 (#20)
Browse files Browse the repository at this point in the history
  • Loading branch information
KyleKing authored Aug 23, 2024
1 parent 8c9cd4a commit d146c1f
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 28 deletions.
37 changes: 19 additions & 18 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,47 +13,48 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v1
uses: actions/setup-python@v5
with:
python-version: 3.7
- uses: pre-commit/action@v2.0.0
python-version: 3.11
- uses: pre-commit/action@v3.0.0

tests:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: [3.7, 3.11]
os: [ubuntu-latest, windows-latest]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

- name: Installation (deps and package)
# we install with flit --pth-file,
# so that coverage will be recorded up for the module
run: |
pip install flit
pip install flit~=3.0
flit install --deps=production --extras=test --pth-file
- name: Run pytest
run: |
pytest --cov=mdformat_tables --cov-report=xml --cov-report=term-missing
- name: Upload to Codecov
if: matrix.python-version == 3.7
uses: codecov/codecov-action@v1
with:
name: pytests-py3.7
flags: pytests
file: ./coverage.xml
fail_ci_if_error: true
# FYI: Requires token to continue usage
# - name: Upload to Codecov
# if: matrix.python-version == 3.7
# uses: codecov/codecov-action@v1
# with:
# name: pytests-py3.7
# flags: pytests
# file: ./coverage.xml
# fail_ci_if_error: true

pre-commit-hook:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -81,9 +82,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout source
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Set up Python 3.7
uses: actions/setup-python@v1
uses: actions/setup-python@v5
with:
python-version: 3.7
- name: install flit
Expand Down
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ repos:
hooks:
- id: black
- repo: https://github.com/PyCQA/flake8
rev: 3.9.2
rev: 7.0.0
hooks:
- id: flake8
additional_dependencies:
- flake8-bugbear==20.11.1
- flake8-builtins==1.5.3
- flake8-comprehensions==3.3.1
- flake8-bugbear>=20.11.1
- flake8-builtins>=1.5.3
- flake8-comprehensions>=3.3.1
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ classifiers = [
]
keywords = "mdformat,markdown,markdown-it"

requires-python=">=3.6.1"
requires-python=">=3.7.0"
requires=["mdformat>=0.7.5,<0.8.0"]

[tool.flit.metadata.requires-extra]
Expand Down
10 changes: 5 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
[tox]
envlist = py{36,37,38,39}
envlist = py{37,311},py{37,311}-hook
isolated_build = True

[testenv:py{36,37,38,39}]
[testenv:py{37,311}]
extras = test
commands = pytest --cov={envsitepackagesdir}/mdformat_tables {posargs}
commands = pytest --cov={envsitepackagesdir}/mdformat_tables {posargs} --ff --nf -vv

[testenv:py{36,37,38,39}-pre-commit]
[testenv:pre-commit]
deps = pre-commit
commands = pre-commit run {posargs}

[testenv:py{36,37,38,39}-hook]
[testenv:py{37,311}-hook]
deps = pre-commit
commands = pre-commit run --config .pre-commit-test.yaml {posargs:--all-files --verbose --show-diff-on-failure}

Expand Down

0 comments on commit d146c1f

Please sign in to comment.