diff --git a/.zuul.yaml b/.zuul.yaml index 7ff94b8..980f881 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,5 +1,4 @@ - project: templates: - - openstack-python-jobs - openstack-python3-ussuri-jobs - publish-openstack-docs-pti diff --git a/releasenotes/notes/drop-python-2-7-73d3113c69d724d6.yaml b/releasenotes/notes/drop-python-2-7-73d3113c69d724d6.yaml new file mode 100644 index 0000000..15d1047 --- /dev/null +++ b/releasenotes/notes/drop-python-2-7-73d3113c69d724d6.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + Python 2.7 support has been dropped. The minimum version of Python now + supported by whereto is Python 3.6. diff --git a/setup.cfg b/setup.cfg index 8a0b489..67e87d0 100644 --- a/setup.cfg +++ b/setup.cfg @@ -6,6 +6,7 @@ description-file = author = OpenStack author-email = openstack-discuss@lists.openstack.org home-page = https://docs.openstack.org/whereto/latest/ +python-requires = >=3.6 classifier = Environment :: OpenStack Intended Audience :: Information Technology @@ -13,8 +14,6 @@ classifier = License :: OSI Approved :: Apache Software License Operating System :: POSIX :: Linux Programming Language :: Python - Programming Language :: Python :: 2 - Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 @@ -27,15 +26,6 @@ packages = console_scripts = whereto = whereto.app:main -[build_sphinx] -all-files = 1 -warning-is-error = 1 -source-dir = doc/source -build-dir = doc/build - -[upload_sphinx] -upload-dir = doc/build/html - [compile_catalog] directory = whereto/locale domain = whereto @@ -49,6 +39,3 @@ input_file = whereto/locale/whereto.pot keywords = _ gettext ngettext l_ lazy_gettext mapping_file = babel.cfg output_file = whereto/locale/whereto.pot - -[wheel] -universal = 1 diff --git a/test-requirements.txt b/test-requirements.txt index 48fd5d5..8913907 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -5,8 +5,7 @@ hacking>=0.12.0,<0.13 # Apache-2.0 coverage>=4.0,!=4.4 # Apache-2.0 -sphinx>=1.8.0,<2.0.0;python_version=='2.7' # BSD -sphinx>=1.8.0,!=2.1.0;python_version>='3.4' # BSD +sphinx>=1.8.0,!=2.1.0 # BSD oslotest>=1.10.0 # Apache-2.0 testrepository>=0.0.18 # Apache-2.0/BSD testtools>=1.4.0 # MIT diff --git a/tox.ini b/tox.ini index 6a4fbbe..fcd4587 100644 --- a/tox.ini +++ b/tox.ini @@ -1,11 +1,12 @@ [tox] -minversion = 2.0 -envlist = py27,py37,pep8 +minversion = 3.1.1 +envlist = py37,pep8 skipsdist = True +ignore_basepython_conflict = True [testenv] +basepython = python3 usedevelop = True -install_command = pip install {opts} {packages} setenv = VIRTUAL_ENV={envdir} PYTHONWARNINGS=default::DeprecationWarning @@ -18,37 +19,30 @@ commands = coverage report --show-missing [testenv:pep8] -basepython = python3 commands = flake8 {posargs} [testenv:venv] # The sphinxcontrib.autoprogram extension requires python 3's version # of argparse, so force python 3 here to ensure the check job that # builds the docs on OpenStack infrastructure uses python 3. -basepython = python3 commands = {posargs} [testenv:bindep] -basepython = python3 deps = bindep commands = bindep test [testenv:cover] -basepython = python3 commands = python setup.py test --coverage --testr-args='{posargs}' [testenv:docs] -basepython = python3 commands = sphinx-build --keep-going -b html -W doc/source doc/build/html [testenv:releasenotes] -basepython = python3 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html [testenv:debug] -basepython = python3 commands = oslo_debug_helper {posargs} [flake8]