Skip to content

Commit fa27fa1

Browse files
author
David Robertson
authored
Fix CI again (#90)
* Fix CI again * Try invoking isort etc directly * Don't bother nuking pyc files * Remove usedevelop and commented-out 'find' invocation
1 parent 2ec5ec5 commit fa27fa1

File tree

3 files changed

+7
-23
lines changed

3 files changed

+7
-23
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
- uses: "actions/setup-python@v4"
2020
with:
21-
python-version: "3.6"
21+
python-version: "3.x"
2222

2323
- name: "Install dependencies"
2424
run: |
@@ -41,7 +41,7 @@ jobs:
4141

4242
- uses: "actions/setup-python@v2"
4343
with:
44-
python-version: "3.6"
44+
python-version: "3.x"
4545

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

6161
strategy:
6262
matrix:
63-
python-version: ["3.6", "3.7", "3.8", "3.9"]
63+
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
6464

6565
steps:
6666
- uses: actions/checkout@v2

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111

1212
- uses: "actions/setup-python@v4"
1313
with:
14-
python-version: "3.6"
14+
python-version: "3.x"
1515

1616
- name: "Install packaging tools"
1717
run: "python -m pip install --upgrade build twine"

tox.ini

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,9 @@ setenv =
1818
passenv = *
1919

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

25-
[testenv:py35]
26-
usedevelop=true
27-
28-
[testenv:py36]
29-
usedevelop=true
30-
31-
[testenv:py37]
32-
usedevelop=true
33-
34-
[testenv:py38]
35-
usedevelop=true
36-
37-
[testenv:py39]
38-
usedevelop=true
39-
4024
[testenv:packaging]
4125
deps =
4226
check-manifest
@@ -45,16 +29,16 @@ commands =
4529

4630
[testenv:pep8]
4731
skip_install = True
48-
basepython = python3.6
32+
basepython = python3.7
4933
deps =
5034
flake8
5135
# We pin so that our tests don't start failing on new releases of black.
5236
black==19.10b0
5337
commands =
5438
python -m black --check --diff . scripts/s3_media_upload
55-
/bin/sh -c "flake8 s3_storage_provider.py setup.py scripts/s3_media_upload"
39+
flake8 s3_storage_provider.py setup.py scripts/s3_media_upload
5640

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

0 commit comments

Comments
 (0)