Merge pull request #1908 from benoit-pierre/drop_py34_support
drop support for Python 3.4
This commit is contained in:
commit
95accbbd4f
|
@ -12,7 +12,6 @@ jobs:
|
|||
env: DISABLE_COVERAGE=1 # Don't run coverage on pypy (too slow).
|
||||
- python: pypy3
|
||||
env: DISABLE_COVERAGE=1
|
||||
- python: 3.4
|
||||
- python: 3.5
|
||||
- python: 3.6
|
||||
- python: 3.7
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
Drop support for Python 3.4.
|
|
@ -41,7 +41,7 @@ Please see the `setuptools PyPI page <https://pypi.org/project/setuptools/>`_
|
|||
for download links and basic installation instructions for each of the
|
||||
supported platforms.
|
||||
|
||||
You will need at least Python 3.4 or 2.7. An ``easy_install`` script will be
|
||||
You will need at least Python 3.5 or 2.7. An ``easy_install`` script will be
|
||||
installed in the normal location for Python scripts on your platform.
|
||||
|
||||
Note that the instructions on the setuptools PyPI page assume that you are
|
||||
|
|
|
@ -88,8 +88,8 @@ __import__('pkg_resources.extern.packaging.markers')
|
|||
__metaclass__ = type
|
||||
|
||||
|
||||
if (3, 0) < sys.version_info < (3, 4):
|
||||
raise RuntimeError("Python 3.4 or later is required")
|
||||
if (3, 0) < sys.version_info < (3, 5):
|
||||
raise RuntimeError("Python 3.5 or later is required")
|
||||
|
||||
if six.PY2:
|
||||
# Those builtin exceptions are only defined in Python 3
|
||||
|
|
|
@ -38,7 +38,6 @@ classifiers =
|
|||
Programming Language :: Python :: 2
|
||||
Programming Language :: Python :: 2.7
|
||||
Programming Language :: Python :: 3
|
||||
Programming Language :: Python :: 3.4
|
||||
Programming Language :: Python :: 3.5
|
||||
Programming Language :: Python :: 3.6
|
||||
Programming Language :: Python :: 3.7
|
||||
|
@ -50,7 +49,7 @@ classifiers =
|
|||
|
||||
[options]
|
||||
zip_safe = True
|
||||
python_requires = >=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*
|
||||
python_requires = >=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*
|
||||
py_modules = easy_install
|
||||
packages = find:
|
||||
|
||||
|
|
|
@ -77,12 +77,9 @@ def _get_pip_versions():
|
|||
'pip==10.0.1',
|
||||
'pip==18.1',
|
||||
'pip==19.0.1',
|
||||
'https://github.com/pypa/pip/archive/master.zip',
|
||||
]
|
||||
|
||||
# Pip's master dropped support for 3.4.
|
||||
if not six.PY34:
|
||||
network_versions.append('https://github.com/pypa/pip/archive/master.zip')
|
||||
|
||||
versions = [None] + [
|
||||
pytest.param(v, **({} if network else {'marks': pytest.mark.skip}))
|
||||
for v in network_versions
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
mock
|
||||
pytest-flake8; python_version!="3.4"
|
||||
pytest-flake8<=1.0.0; python_version=="3.4"
|
||||
pytest-flake8
|
||||
virtualenv>=13.0.0
|
||||
pytest-virtualenv>=1.2.7
|
||||
pytest>=3.7
|
||||
|
|
Loading…
Reference in New Issue