Skip to content

Commit

Permalink
Merge pull request #192 from python-greenlet/issue186
Browse files Browse the repository at this point in the history
Officially drop support for 2.4/5/6 and 3.0/1/2/3/4.
  • Loading branch information
jamadden committed Oct 2, 2020
2 parents 80c92d3 + bb249b6 commit de1441d
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 43 deletions.
18 changes: 2 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ sudo: false

matrix:
include:
- arch: amd64
python: 2.6
dist: precise
- arch: arm64
python: 2.7
dist: bionic
Expand All @@ -15,18 +12,6 @@ matrix:
- arch: ppc64le
python: 2.7
dist: bionic
- arch: amd64
python: 3.3
dist: precise
- arch: arm64
python: 3.4
dist: xenial
- arch: amd64
python: 3.4
dist: xenial
- arch: ppc64le
python: 3.4
dist: xenial
- arch: arm64
python: 3.5
dist: bionic
Expand Down Expand Up @@ -63,7 +48,8 @@ matrix:
- arch: ppc64le
python: 3.8
dist: bionic
- python: 3.9-dev

install: python setup.py build_ext -i
install: pip install -U -e .[test]

script: python run-tests.py
4 changes: 3 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
- (Packaging) Stop asking setuptools to build both .tar.gz and .zip
sdists. PyPI has standardized on .tar.gz for all platforms.
- (Documentation) Publish the change log to https://greenlet.readthedocs.io
- Drop support for Python 3.0, 3.1 and 3.2.
- Drop support for Python 2.4, 2.5, 2.6, 3.0, 3.1, 3.2 and 3.4.
The project metadata now includes the ``python_requires`` data to
help installation tools understand supported versions.


0.4.17 (2020-09-22)
Expand Down
21 changes: 2 additions & 19 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: 0.4.17.{build}
environment:
global:
# SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
Expand All @@ -16,22 +15,6 @@ environment:
PYTHON_ARCH: "64"
PYTHON_VERSION: "2.7.x"

- PYTHON_ROOT: "C:\\Python33"
PYTHON_ARCH: "32"
PYTHON_VERSION: "3.3.x"

- PYTHON_ROOT: "C:\\Python33-x64"
PYTHON_ARCH: "64"
PYTHON_VERSION: "3.3.x"

- PYTHON_ROOT: "C:\\Python34"
PYTHON_ARCH: "32"
PYTHON_VERSION: "3.4.x"

- PYTHON_ROOT: "C:\\Python34-x64"
PYTHON_ARCH: "64"
PYTHON_VERSION: "3.4.x"

- PYTHON_ROOT: "C:\\Python35"
PYTHON_ARCH: "32"
PYTHON_VERSION: "3.5.x"
Expand Down Expand Up @@ -76,14 +59,14 @@ install:
- "%CMD_IN_ENV% pip install --upgrade -r dev-requirements.txt"

build_script:
- "%CMD_IN_ENV% python setup.py build"
- "%CMD_IN_ENV% python -m pip install -U -e .[test]"

# XXX: setup.py test is deprecated
test_script:
- "%CMD_IN_ENV% python setup.py test"

after_test:
- "%CMD_IN_ENV% python setup.py bdist_wheel"
- "%CMD_IN_ENV% python setup.py bdist_egg"

artifacts:
- path: dist\*
2 changes: 1 addition & 1 deletion greenlet.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
extern "C" {
#endif

#define GREENLET_VERSION "0.4.17"
#define GREENLET_VERSION "1.0.0.dev0"

#if PY_VERSION_HEX >= 0x030700A3
# define GREENLET_USE_EXC_INFO
Expand Down
8 changes: 2 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def _find_platform_headers():

setup(
name="greenlet",
version='0.4.17',
version='1.0.0.dev0',
description='Lightweight in-process concurrent programming',
long_description=readfile("README.rst"),
url="https://github.com/python-greenlet/greenlet",
Expand All @@ -86,13 +86,8 @@ def _find_platform_headers():
'Programming Language :: C',
'Programming Language :: Python',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.4',
'Programming Language :: Python :: 2.5',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
Expand All @@ -106,6 +101,7 @@ def _find_platform_headers():
'Sphinx',
]
},
python_requires=">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*",
# XXX: This is deprecated. appveyor.yml still uses it though.
test_suite='tests.test_collector',
zip_safe=False,
Expand Down

0 comments on commit de1441d

Please sign in to comment.