Skip to content

Commit

Permalink
Reapply "Merge pull request #633 from cherrypy/debt/drop-py37"
Browse files Browse the repository at this point in the history
This reverts commit 688fc83.
  • Loading branch information
webknjaz committed Apr 22, 2024
1 parent 5bedc7c commit 62acde5
Show file tree
Hide file tree
Showing 25 changed files with 1 addition and 1,792 deletions.
44 changes: 0 additions & 44 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ env:
PRE_COMMIT_COLOR: always
PY_COLORS: 1 # Recognized by the `py` package, dependency of `pytest`
PYTHONIOENCODING: utf-8
PYTHONLEGACYWINDOWSSTDIO: 1 # Python 3.6 hack
PYTHONUTF8: 1
TOX_PARALLEL_NO_SPINNER: 1
TOX_TESTENV_PASSENV: >- # Make tox-wrapped tools see color requests
Expand Down Expand Up @@ -912,46 +911,13 @@ jobs:
3.10
- 3.9
- 3.8
- pypy-3.7
- 3.7
- 3.6
- pypy-3.6
os:
- ubuntu-22.04
- ubuntu-20.04
- macos-11.0
- macos-latest
- windows-2019
- windows-2022
exclude:
# NOTE: Windows PyPy jobs are excluded to address the tox bug
# NOTE: https://github.com/tox-dev/tox/issues/1704.
# NOTE: They should be re-added once it's fixed.
- os: windows-2022
python-version: pypy-3.6
- os: windows-2019
python-version: pypy-3.6
# NOTE: Windows PyPy 3.7 jobs are excluded because of the lack
# NOTE: of the build deps to compile cryptography.
# NOTE: They should be re-added once it's fixed.
- os: windows-2022
python-version: pypy-3.7
- os: windows-2019
python-version: pypy-3.7
# NOTE: macOS PyPy jobs are excluded because installing cryptography
# NOTE: needs openssl headers that aren't present at the moment.
# TODO: Remove the exclusions once this is addressed.
- os: macOS-11.0
python-version: pypy-3.6
- os: macos-latest
python-version: pypy-3.6
- os: macos-11.0
python-version: pypy-3.7
- os: macos-latest
python-version: pypy-3.7
# NOTE: Python 3.6 is not available for Ubuntu 22.04
- os: ubuntu-22.04
python-version: 3.6

continue-on-error: >-
${{
Expand Down Expand Up @@ -1055,16 +1021,6 @@ jobs:
--user
'${{ env.TOX_VERSION }}'
- name: Patch tox.ini for Python 3.6 under Windows
if: >-
runner.os == 'Windows'
&& matrix.python-version == '3.6'
run: >-
sed -i
's/^package_env\(\s\)\?=.*/package_env = py36-win-dummy/g'
tox.ini
shell: bash

- name: Download all the dists
uses: actions/download-artifact@v3
with:
Expand Down
1 change: 0 additions & 1 deletion requirements/tox-py36-cp36-darwin-x86_64.in

This file was deleted.

151 changes: 0 additions & 151 deletions requirements/tox-py36-cp36-darwin-x86_64.txt

This file was deleted.

1 change: 0 additions & 1 deletion requirements/tox-py36-cp36-linux-x86_64.in

This file was deleted.

151 changes: 0 additions & 151 deletions requirements/tox-py36-cp36-linux-x86_64.txt

This file was deleted.

1 change: 0 additions & 1 deletion requirements/tox-py36-cp36-win32-amd64.in

This file was deleted.

Loading

0 comments on commit 62acde5

Please sign in to comment.