diff options
| -rw-r--r-- | .github/workflows/coverage.yml | 5 | ||||
| -rw-r--r-- | .github/workflows/testsuite.yml | 5 | ||||
| -rw-r--r-- | requirements/ci.pip | 2 | ||||
| -rw-r--r-- | requirements/dev.pip | 3 | ||||
| -rw-r--r-- | requirements/pins.pip | 4 | ||||
| -rw-r--r-- | requirements/pytest.pip | 3 | ||||
| -rw-r--r-- | requirements/wheel.pip | 7 | ||||
| -rw-r--r-- | tox.ini | 2 |
8 files changed, 25 insertions, 6 deletions
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 447464eb..61ec9865 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -27,9 +27,12 @@ jobs: - macos-latest - windows-latest python-version: + # When changing this list, be sure to check the [gh-actions] list in + # tox.ini so that tox will run properly. - "2.7" - "3.5" - "3.9" + - "3.10.0-alpha.5" - "pypy3" exclude: # Windows PyPy doesn't seem to work? @@ -58,6 +61,8 @@ jobs: set -xe python -VV python -m site + # Need to install setuptools first so that ci.pip will succeed. + python -m pip install -c requirements/pins.pip setuptools wheel python -m pip install -r requirements/ci.pip python -m pip install -c requirements/pins.pip tox-gh-actions diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml index 24bd926e..a88bfba4 100644 --- a/.github/workflows/testsuite.yml +++ b/.github/workflows/testsuite.yml @@ -26,12 +26,15 @@ jobs: - macos-latest - windows-latest python-version: + # When changing this list, be sure to check the [gh-actions] list in + # tox.ini so that tox will run properly. - "2.7" - "3.5" - "3.6" - "3.7" - "3.8" - "3.9" + - "3.10.0-alpha.5" - "pypy3" exclude: # Windows PyPy doesn't seem to work? @@ -58,6 +61,8 @@ jobs: set -xe python -VV python -m site + # Need to install setuptools first so that ci.pip will succeed. + python -m pip install -c requirements/pins.pip setuptools wheel python -m pip install -r requirements/ci.pip python -m pip install -c requirements/pins.pip tox-gh-actions diff --git a/requirements/ci.pip b/requirements/ci.pip index 060d1de3..72c6a790 100644 --- a/requirements/ci.pip +++ b/requirements/ci.pip @@ -1,6 +1,8 @@ # Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 # For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt +-c pins.pip + # Things CI servers need for running tests. -r tox.pip -r pytest.pip diff --git a/requirements/dev.pip b/requirements/dev.pip index 608df1cf..3bfb527f 100644 --- a/requirements/dev.pip +++ b/requirements/dev.pip @@ -23,3 +23,6 @@ readme_renderer==26.0 requests==2.25.1 twine==3.3.0 libsass==0.20.1 + +# Just so I have a debugger if I want it +pudb==2019.2 diff --git a/requirements/pins.pip b/requirements/pins.pip index 223e7cbd..04721c8b 100644 --- a/requirements/pins.pip +++ b/requirements/pins.pip @@ -5,3 +5,7 @@ cibuildwheel==1.7.0 tox-gh-actions==2.2.0 + +# setuptools 45.x is py3-only +setuptools==44.1.1 +wheel==0.35.1 diff --git a/requirements/pytest.pip b/requirements/pytest.pip index 43d4efe5..ecdf619c 100644 --- a/requirements/pytest.pip +++ b/requirements/pytest.pip @@ -19,6 +19,3 @@ hypothesis==4.57.1 # Our testing mixins unittest-mixins==1.6 #-e/Users/ned/unittest_mixins - -# Just so I have a debugger if I want it -pudb==2019.2 diff --git a/requirements/wheel.pip b/requirements/wheel.pip index ae84163a..f294ab3b 100644 --- a/requirements/wheel.pip +++ b/requirements/wheel.pip @@ -1,8 +1,9 @@ # Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 # For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt +-c pins.pip + # Things needed to make wheels for coverage.py -# setuptools 45.x is py3-only -setuptools==44.1.1 -wheel==0.35.1 +setuptools +wheel @@ -2,6 +2,7 @@ # For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt [tox] +# When changing this list, be sure to check the [gh-actions] list below. envlist = py{27,35,36,37,38,39,310}, pypy{2,3}, doc, lint skip_missing_interpreters = {env:COVERAGE_SKIP_MISSING_INTERPRETERS:True} toxworkdir = {env:TOXWORKDIR:.tox} @@ -93,5 +94,6 @@ python = 3.7: py37 3.8: py38 3.9: py39 + 3.10: py310 pypy: pypy pypy3: pypy3 |