diff options
-rw-r--r-- | .github/workflows/coverage.yml | 10 | ||||
-rw-r--r-- | .github/workflows/kit.yml | 5 | ||||
-rw-r--r-- | .github/workflows/testsuite.yml | 10 | ||||
-rw-r--r-- | tox.ini | 13 |
4 files changed, 5 insertions, 33 deletions
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index eab835fd..2db830d5 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -30,8 +30,6 @@ jobs: 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.7" - "pypy3" @@ -39,9 +37,6 @@ jobs: # Windows PyPy doesn't seem to work? - os: windows-latest python-version: "pypy3" - # Microsoft removed vcpython27, so we can't do Windows 2.7 - - os: windows-latest - python-version: "2.7" # If one job fails, stop the whole thing. fail-fast: true @@ -56,11 +51,6 @@ jobs: with: python-version: "${{ matrix.python-version }}" - - name: "Install Visual C++ if needed" - if: runner.os == 'Windows' && matrix.python-version == '2.7' - run: | - choco install vcpython27 -f -y - - name: "Install dependencies" run: | set -xe diff --git a/.github/workflows/kit.yml b/.github/workflows/kit.yml index c93812d1..d8baaaee 100644 --- a/.github/workflows/kit.yml +++ b/.github/workflows/kit.yml @@ -42,11 +42,6 @@ jobs: run: | python -m pip install -c requirements/pins.pip cibuildwheel - - name: "Install Visual C++ for Python 2.7" - if: runner.os == 'Windows' - run: | - choco install vcpython27 -f -y - - name: "Build wheels" env: # Don't build wheels for PyPy. diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml index 115ce80b..94748db4 100644 --- a/.github/workflows/testsuite.yml +++ b/.github/workflows/testsuite.yml @@ -26,8 +26,6 @@ jobs: 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" @@ -38,9 +36,6 @@ jobs: # Windows PyPy doesn't seem to work? - os: windows-latest python-version: "pypy3" - # Microsoft removed vcpython27, so we can't do Windows 2.7 - - os: windows-latest - python-version: "2.7" fail-fast: false steps: @@ -52,11 +47,6 @@ jobs: with: python-version: "${{ matrix.python-version }}" - - name: "Install Visual C++ if needed" - if: runner.os == 'Windows' && matrix.python-version == '2.7' - run: | - choco install vcpython27 -f -y - - name: "Install dependencies" run: | set -xe @@ -3,7 +3,7 @@ [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 +envlist = py{36,37,38,39,310}, pypy3, doc, lint skip_missing_interpreters = {env:COVERAGE_SKIP_MISSING_INTERPRETERS:True} toxworkdir = {env:TOXWORKDIR:.tox} @@ -18,9 +18,9 @@ deps = -r requirements/pip.pip -r requirements/pytest.pip # gevent 1.3 causes a failure: https://github.com/nedbat/coveragepy/issues/663 - py{27,35,36}: gevent==1.2.2 - py{27,35,36,37,38}: eventlet==0.25.1 - py{27,35,36,37,38}: greenlet==0.4.15 + py{36}: gevent==1.2.2 + py{36,37,38}: eventlet==0.25.1 + py{36,37,38}: greenlet==0.4.15 # Windows can't update the pip version with pip running, so use Python # to install things. @@ -28,7 +28,7 @@ install_command = python -m pip install -U {opts} {packages} passenv = * setenv = - pypy,pypy{2,3}: COVERAGE_NO_CTRACER=no C extension under PyPy + pypy,pypy3: COVERAGE_NO_CTRACER=no C extension under PyPy jython: COVERAGE_NO_CTRACER=no C extension under Jython jython: PYTEST_ADDOPTS=-n 0 @@ -86,12 +86,9 @@ commands = [gh-actions] python = - 2.7: py27 - 3.5: py35 3.6: py36 3.7: py37 3.8: py38 3.9: py39 3.10: py310 - pypy: pypy pypy3: pypy3 |