Skip to content

Commit

Permalink
Minimal set of changes to remove Python 2.7 from CI to unbreak builds.
Browse files Browse the repository at this point in the history
  • Loading branch information
jamadden committed Jun 20, 2023
1 parent f3c5d48 commit 1fbcc47
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Expand Up @@ -25,7 +25,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, "3.10", "3.11"]
python-version: [3.5, 3.6, 3.7, 3.8, 3.9, "3.10", "3.11"]
# Jan 2023: We have pinned back from ubuntu-latest (which is
# now ubuntu 22.04) because older Python versions like
# 3.5, 3.6 and presumably 2.7 are not available in it.
Expand Down Expand Up @@ -96,7 +96,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: [2.7, 3.5, "3.11"]
python-version: [3.5, "3.11"]
os: [ubuntu-20.04, macos-latest]
steps:
- uses: actions/checkout@v3
Expand Down
10 changes: 0 additions & 10 deletions appveyor.yml
Expand Up @@ -69,11 +69,6 @@ environment:
PYTHON_EXE: python
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019

- PYTHON: "C:\\Python27-x64"
PYTHON_ARCH: "64"
PYTHON_VERSION: "2.7.x"
PYTHON_EXE: python

# Tested 32-bit versions. A small, hand-picked selection covering
# important variations. No need to include newer versions of
# cpython here, 32-bit x86 windows is on the way out.
Expand All @@ -84,11 +79,6 @@ environment:
PYTHON_EXE: python
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019

- PYTHON: "C:\\Python27"
PYTHON_ARCH: "32"
PYTHON_VERSION: "2.7.x"
PYTHON_EXE: python


# Untested 64-bit versions. We don't expect any variance here from
# the other tested 64-bit versions, OR they are very EOL
Expand Down
2 changes: 1 addition & 1 deletion make-manylinux
Expand Up @@ -32,7 +32,7 @@ if [ -d /greenlet -a -d /opt/python ]; then
mkdir -p /greenlet/wheelhouse
OPATH="$PATH"
which auditwheel
for variant in `ls -d /opt/python/cp{27,35,36,37,38,39,310,311}*`; do
for variant in `ls -d /opt/python/cp{36,37,38,39,310,311}*`; do
export PATH="$variant/bin:$OPATH"
echo "Building $variant $(python --version)"

Expand Down
4 changes: 1 addition & 3 deletions setup.py
Expand Up @@ -228,8 +228,6 @@ def get_greenlet_version():
'Natural Language :: English',
'Programming Language :: C',
'Programming Language :: Python',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
Expand All @@ -255,6 +253,6 @@ def get_greenlet_version():
'psutil',
],
},
python_requires=">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*",
python_requires=">=3.5",
zip_safe=False,
)
2 changes: 1 addition & 1 deletion tox.ini
@@ -1,6 +1,6 @@
[tox]
envlist =
py27,py35,py36,py37,py38,py39,py310,py27-ns,py310-ns,py311,py311-ns,docs
py35,py36,py37,py38,py39,py310,py27-ns,py310-ns,py311,py311-ns,docs

[testenv]
setenv =
Expand Down

0 comments on commit 1fbcc47

Please sign in to comment.