Skip to content

Commit

Permalink
Fix CI again (#90)
Browse files Browse the repository at this point in the history
* Fix CI again

* Try invoking isort etc directly

* Don't bother nuking pyc files

* Remove usedevelop and commented-out 'find' invocation
  • Loading branch information
David Robertson authored Jan 9, 2023
1 parent 2ec5ec5 commit fa27fa1
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 23 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

- uses: "actions/setup-python@v4"
with:
python-version: "3.6"
python-version: "3.x"

- name: "Install dependencies"
run: |
Expand All @@ -41,7 +41,7 @@ jobs:

- uses: "actions/setup-python@v2"
with:
python-version: "3.6"
python-version: "3.x"

- name: "Install packaging tools"
run: "python -m pip install --upgrade build twine"
Expand All @@ -60,7 +60,7 @@ jobs:

strategy:
matrix:
python-version: ["3.6", "3.7", "3.8", "3.9"]
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:

- uses: "actions/setup-python@v4"
with:
python-version: "3.6"
python-version: "3.x"

- name: "Install packaging tools"
run: "python -m pip install --upgrade build twine"
Expand Down
22 changes: 3 additions & 19 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,9 @@ setenv =
passenv = *

commands =
/usr/bin/find "{toxinidir}" -name '*.pyc' -delete
coverage run --include=s3_storage_provider.py -m twisted.trial test_s3
coverage report -m

[testenv:py35]
usedevelop=true

[testenv:py36]
usedevelop=true

[testenv:py37]
usedevelop=true

[testenv:py38]
usedevelop=true

[testenv:py39]
usedevelop=true

[testenv:packaging]
deps =
check-manifest
Expand All @@ -45,16 +29,16 @@ commands =

[testenv:pep8]
skip_install = True
basepython = python3.6
basepython = python3.7
deps =
flake8
# We pin so that our tests don't start failing on new releases of black.
black==19.10b0
commands =
python -m black --check --diff . scripts/s3_media_upload
/bin/sh -c "flake8 s3_storage_provider.py setup.py scripts/s3_media_upload"
flake8 s3_storage_provider.py setup.py scripts/s3_media_upload

[testenv:check_isort]
skip_install = True
deps = isort
commands = /bin/sh -c "isort -c -sp setup.cfg -rc s3_storage_provider.py setup.py scripts/s3_media_upload"
commands = isort -c -sp setup.cfg -rc s3_storage_provider.py setup.py scripts/s3_media_upload

0 comments on commit fa27fa1

Please sign in to comment.