mirror of
https://github.com/sphinx-doc/sphinx.git
synced 2025-02-25 18:55:22 -06:00
Drop python 2.7 and 3.4 support
This commit is contained in:
parent
92bd804b89
commit
9412bd76b7
@ -5,8 +5,6 @@ environment:
|
|||||||
PYTHONWARNINGS: all
|
PYTHONWARNINGS: all
|
||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
- PYTHON: 27
|
|
||||||
TEST_IGNORE: --ignore py35
|
|
||||||
- PYTHON: 37
|
- PYTHON: 37
|
||||||
- PYTHON: 37-x64
|
- PYTHON: 37-x64
|
||||||
|
|
||||||
|
@ -11,16 +11,9 @@ env:
|
|||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- python: 'pypy'
|
- python: '3.5'
|
||||||
env: TOXENV=pypy
|
|
||||||
- python: '2.7'
|
|
||||||
env:
|
env:
|
||||||
- TOXENV=du13
|
- TOXENV=du13
|
||||||
- PYTEST_ADDOPTS="--cov ./ --cov-append --cov-config setup.cfg"
|
|
||||||
- python: '3.4'
|
|
||||||
env: TOXENV=py34
|
|
||||||
- python: '3.5'
|
|
||||||
env: TOXENV=py35
|
|
||||||
- python: '3.6'
|
- python: '3.6'
|
||||||
env:
|
env:
|
||||||
- TOXENV=py36
|
- TOXENV=py36
|
||||||
|
2
CHANGES
2
CHANGES
@ -7,6 +7,8 @@ Dependencies
|
|||||||
Incompatible changes
|
Incompatible changes
|
||||||
--------------------
|
--------------------
|
||||||
|
|
||||||
|
* Drop python 2.7 and 3.4 support
|
||||||
|
|
||||||
Deprecated
|
Deprecated
|
||||||
----------
|
----------
|
||||||
|
|
||||||
|
19
setup.py
19
setup.py
@ -11,8 +11,8 @@ import sphinx
|
|||||||
with open('README.rst') as f:
|
with open('README.rst') as f:
|
||||||
long_desc = f.read()
|
long_desc = f.read()
|
||||||
|
|
||||||
if sys.version_info < (2, 7) or (3, 0) <= sys.version_info < (3, 4):
|
if sys.version_info < (3, 5):
|
||||||
print('ERROR: Sphinx requires at least Python 2.7 or 3.4 to run.')
|
print('ERROR: Sphinx requires at least Python 3.5 to run.')
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
install_requires = [
|
install_requires = [
|
||||||
@ -35,9 +35,6 @@ extras_require = {
|
|||||||
':sys_platform=="win32"': [
|
':sys_platform=="win32"': [
|
||||||
'colorama>=0.3.5',
|
'colorama>=0.3.5',
|
||||||
],
|
],
|
||||||
':python_version<"3.5"': [
|
|
||||||
'typing'
|
|
||||||
],
|
|
||||||
'websupport': [
|
'websupport': [
|
||||||
'sqlalchemy>=0.9',
|
'sqlalchemy>=0.9',
|
||||||
'whoosh>=2.0',
|
'whoosh>=2.0',
|
||||||
@ -49,11 +46,6 @@ extras_require = {
|
|||||||
'html5lib',
|
'html5lib',
|
||||||
'flake8>=3.5.0',
|
'flake8>=3.5.0',
|
||||||
'flake8-import-order',
|
'flake8-import-order',
|
||||||
],
|
|
||||||
'test:python_version<"3"': [
|
|
||||||
'enum34',
|
|
||||||
],
|
|
||||||
'test:python_version>="3"': [
|
|
||||||
'mypy',
|
'mypy',
|
||||||
'typed_ast',
|
'typed_ast',
|
||||||
],
|
],
|
||||||
@ -195,12 +187,11 @@ setup(
|
|||||||
'License :: OSI Approved :: BSD License',
|
'License :: OSI Approved :: BSD License',
|
||||||
'Operating System :: OS Independent',
|
'Operating System :: OS Independent',
|
||||||
'Programming Language :: Python',
|
'Programming Language :: Python',
|
||||||
'Programming Language :: Python :: 2',
|
|
||||||
'Programming Language :: Python :: 2.7',
|
|
||||||
'Programming Language :: Python :: 3',
|
'Programming Language :: Python :: 3',
|
||||||
'Programming Language :: Python :: 3.4',
|
'Programming Language :: Python :: 3 :: Only',
|
||||||
'Programming Language :: Python :: 3.5',
|
'Programming Language :: Python :: 3.5',
|
||||||
'Programming Language :: Python :: 3.6',
|
'Programming Language :: Python :: 3.6',
|
||||||
|
'Programming Language :: Python :: 3.7',
|
||||||
'Programming Language :: Python :: Implementation :: CPython',
|
'Programming Language :: Python :: Implementation :: CPython',
|
||||||
'Programming Language :: Python :: Implementation :: PyPy',
|
'Programming Language :: Python :: Implementation :: PyPy',
|
||||||
'Framework :: Setuptools Plugin',
|
'Framework :: Setuptools Plugin',
|
||||||
@ -235,7 +226,7 @@ setup(
|
|||||||
'build_sphinx = sphinx.setup_command:BuildDoc',
|
'build_sphinx = sphinx.setup_command:BuildDoc',
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
|
python_requires=">=3.5",
|
||||||
install_requires=install_requires,
|
install_requires=install_requires,
|
||||||
extras_require=extras_require,
|
extras_require=extras_require,
|
||||||
cmdclass=cmdclass,
|
cmdclass=cmdclass,
|
||||||
|
4
tox.ini
4
tox.ini
@ -1,13 +1,13 @@
|
|||||||
[tox]
|
[tox]
|
||||||
minversion = 2.0
|
minversion = 2.0
|
||||||
envlist = docs,flake8,mypy,coverage,py{27,34,35,36,37,38,py},du{11,12,13,14}
|
envlist = docs,flake8,mypy,coverage,py{35,36,37,38,py},du{11,12,13,14}
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
passenv =
|
passenv =
|
||||||
https_proxy http_proxy no_proxy PERL PERL5LIB PYTEST_ADDOPTS EPUBCHECK_PATH
|
https_proxy http_proxy no_proxy PERL PERL5LIB PYTEST_ADDOPTS EPUBCHECK_PATH
|
||||||
description =
|
description =
|
||||||
py{27,34,35,36,37,38,py}: Run unit tests against {envname}.
|
py{35,36,37,38,py}: Run unit tests against {envname}.
|
||||||
du{11,12,13,14}: Run unit tests with the given version of docutils.
|
du{11,12,13,14}: Run unit tests with the given version of docutils.
|
||||||
|
|
||||||
# TODO(stephenfin) Replace this with the 'extras' config option when tox 2.4 is
|
# TODO(stephenfin) Replace this with the 'extras' config option when tox 2.4 is
|
||||||
|
Loading…
Reference in New Issue
Block a user