Skip to content

Commit f490a60

Browse files
authored
Simplify tox configuration (jpadilla#573)
Remove the extra dimension: {windows,linux}. In local testing, this suffix has no practical effect on test runs as the OS is always either Linux or Window. Adding this suffixes forces many extra test runs when simply using the command "tox". This has been removed to avoid these extra runs. This allowed removing the environment variable PLATFORM. Both Windows and Linux still run in CI. Use only the component "crypto" to install the extra cryptography package. This simplifies adding Python versions in the future as modifying this line is no longer required. Merge suffixes to one line: py{36,37,38,39}-{crypto,nocrypto}. Again, this simplifies adding Python versions in the future as one needs to modify only one line.
1 parent 14fc3e9 commit f490a60

File tree

2 files changed

+2
-11
lines changed

2 files changed

+2
-11
lines changed

.github/workflows/main.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ jobs:
3535
3636
- name: "Run tox targets for ${{ matrix.python-version }}"
3737
run: "python -m tox"
38-
env:
39-
PLATFORM: ${{ matrix.platform }}
4038

4139
# We always use a modern Python version for combining coverage to prevent
4240
# parsing errors in older versions for modern code.

tox.ini

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,11 @@ python =
1414
3.9: py39
1515

1616

17-
[gh-actions:env]
18-
PLATFORM =
19-
ubuntu-latest: linux
20-
windows-latest: windows
21-
22-
2317
[tox]
2418
envlist =
2519
lint
2620
typing
27-
py{36,37,38,39}-crypto-{linux,windows}
28-
py{36,37,38,39}-nocrypto-{linux,windows}
21+
py{36,37,38,39}-{crypto,nocrypto}
2922
docs
3023
pypi-description
3124
coverage-report
@@ -39,7 +32,7 @@ setenv =
3932
VIRTUALENV_NO_DOWNLOAD=1
4033
extras =
4134
tests
42-
py{36,37,38,39}-crypto-{linux,windows}: crypto
35+
crypto: crypto
4336
commands = {envpython} -b -m coverage run -m pytest {posargs}
4437

4538

0 commit comments

Comments
 (0)