Skip to content

Commit

Permalink
Merge pull request #361 from python-greenlet/remove-obsolete-python-a…
Browse files Browse the repository at this point in the history
…nd-compiler-support

Remove obsolete python and compiler support
  • Loading branch information
jamadden committed Jun 21, 2023
2 parents 1db0fc6 + 728e2ea commit c2fe7fd
Show file tree
Hide file tree
Showing 21 changed files with 288 additions and 730 deletions.
36 changes: 2 additions & 34 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,8 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: [3.5, 3.6, 3.7, 3.8, 3.9, "3.10", "3.11", "3.12-dev"]
# 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.
os: [ubuntu-20.04, macos-latest]
python-version: [3.7, 3.8, 3.9, "3.10", "3.11", "3.12-dev"]
os: [ubuntu-latest, macos-latest]
exclude:
- os: macos-latest
python-version: 3.12-dev
Expand Down Expand Up @@ -96,35 +93,6 @@ jobs:
run: |
twine upload --skip-existing dist/*
test_non_standard_thread:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: [3.5, "3.11"]
os: [ubuntu-20.04, macos-latest]
steps:
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
cache: 'pip'
cache-dependency-path: setup.py
- name: Install dependencies
run: |
python -m pip install -U pip setuptools wheel
python -m pip install -U twine
- name: Install greenlet
env:
CPPFLAGS: "-DG_USE_STANDARD_THREADING=0 -UNDEBUG -Ofast"
run: |
python setup.py bdist_wheel
python -m pip install -U -v -e ".[test,docs]"
- name: Test
run: |
python -c 'import greenlet._greenlet as G; assert not G.GREENLET_USE_STANDARD_THREADING'
python -m unittest discover -v greenlet.tests
CodeQL:
runs-on: ubuntu-latest
permissions:
Expand Down
6 changes: 6 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@
<https://github.com/python-greenlet/greenlet/pull/327>`_; thanks go
to (at least) Michael Droettboom, Andreas Motl, Thomas A Caswell,
raphaelauv, Hugo van Kemenade, Mark Shannon, and Petr Viktorin.
- Remove support for end-of-life Python versions, including Python
2.7, Python 3.5 and Python 3.6.
- Require a compiler that supports ``noinline`` directives. See
`issue 271
<https://github.com/python-greenlet/greenlet/issues/266>`_.
- Require a compiler that supports C++11.


2.0.2 (2023-01-28)
Expand Down
34 changes: 9 additions & 25 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,23 @@ environment:

# Fully supported 64-bit versions, with testing. This should be
# all the current (non EOL) versions.
- PYTHON: "C:\\Python312-x64"
PYTHON_VERSION: "3.12.0b3"
PYTHON_ARCH: "64"
PYTHON_EXE: python
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022

- PYTHON: "C:\\Python311-x64"
PYTHON_VERSION: "3.11.0"
PYTHON_ARCH: "64"
PYTHON_EXE: python
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022

- PYTHON: "C:\\Python310-x64"
PYTHON_VERSION: "3.10.0"
PYTHON_ARCH: "64"
PYTHON_EXE: python
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022

- PYTHON: "C:\\Python39-x64"
PYTHON_ARCH: "64"
Expand Down Expand Up @@ -83,17 +89,7 @@ environment:
# Untested 64-bit versions. We don't expect any variance here from
# the other tested 64-bit versions, OR they are very EOL

- PYTHON: "C:\\Python36-x64"
PYTHON_ARCH: "64"
PYTHON_VERSION: "3.6.x"
PYTHON_EXE: python
GWHEEL_ONLY: true

- PYTHON: "C:\\Python35-x64"
PYTHON_ARCH: "64"
PYTHON_VERSION: "3.5.x"
PYTHON_EXE: python
GWHEEL_ONLY: true
# None right now.

# Untested 32-bit versions. As above, we don't expect any variance
# from the tested 32-bit versions, OR they are very EOL.
Expand All @@ -110,18 +106,6 @@ environment:
PYTHON_EXE: python
GWHEEL_ONLY: true

- PYTHON: "C:\\Python36"
PYTHON_ARCH: "32"
PYTHON_VERSION: "3.6.x"
PYTHON_EXE: python
GWHEEL_ONLY: true

- PYTHON: "C:\\Python35"
PYTHON_ARCH: "32"
PYTHON_VERSION: "3.5.x"
PYTHON_EXE: python
GWHEEL_ONLY: true



cache:
Expand Down
4 changes: 2 additions & 2 deletions make-manylinux
Original file line number Diff line number Diff line change
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{36,37,38,39,310,311}*`; do
for variant in `ls -d /opt/python/cp{37,38,39,310,311,312}*`; do
export PATH="$variant/bin:$OPATH"
echo "Building $variant $(python --version)"

Expand All @@ -53,5 +53,5 @@ fi

# Mount the current directory as /greenlet
# Can't use -i on Travis with arm64, "input device not a tty"
docker run --rm -v "$(pwd):/greenlet" ${DOCKER_IMAGE:-quay.io/pypa/manylinux2010_x86_64} /greenlet/$(basename $0)
docker run --rm -v "$(pwd):/greenlet" ${DOCKER_IMAGE:-quay.io/pypa/manylinux2014_x86_64} /greenlet/$(basename $0)
ls -l wheelhouse
10 changes: 2 additions & 8 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,7 @@ def get_greenlet_version():
'Programming Language :: C',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3 :: Only',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
Expand All @@ -242,17 +241,12 @@ def get_greenlet_version():
extras_require={
'docs': [
'Sphinx',
# 0.18b1 breaks sphinx 1.8.5 which is the latest version that runs
# on Python 2. The version pin sphinx itself contains isn't specific enough.
'docutils < 0.18; python_version < "3"',
],
'test': [
'objgraph',
# Sigh, all releases of this were yanked from PyPI.
#'faulthandler; python_version == "2.7" and platform_python_implementation == "CPython"',
'psutil',
],
},
python_requires=">=3.5",
python_requires=">=3.7",
zip_safe=False,
)

0 comments on commit c2fe7fd

Please sign in to comment.