diff --git a/.zuul.yaml b/.zuul.yaml index 35eecfd..a60d493 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,10 +1,8 @@ - project: templates: - check-requirements - - lib-forward-testing - lib-forward-testing-python3 - openstack-lower-constraints-jobs - - openstack-python-jobs - openstack-python3-ussuri-jobs - periodic-stable-jobs - publish-openstack-docs-pti diff --git a/doc/requirements.txt b/doc/requirements.txt index ba4505b..5ce890b 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -4,6 +4,5 @@ # For generating sphinx documentation doc8>=0.6.0 # Apache-2.0 -sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD -sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD +sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2 # BSD openstackdocstheme>=1.18.1 # Apache-2.0 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..af6b2d4 --- /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 automaton is Python 3.6. diff --git a/setup.cfg b/setup.cfg index 1570036..09d0d48 100644 --- a/setup.cfg +++ b/setup.cfg @@ -6,38 +6,17 @@ author-email = openstack-discuss@lists.openstack.org home-page = https://docs.openstack.org/automaton/latest/ description-file = README.rst +python-requires = >=3.6 classifier = Development Status :: 3 - Alpha Intended Audience :: Developers License :: OSI Approved :: Apache Software License Operating System :: POSIX - Programming Language :: Python :: 2 - Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Topic :: Software Development :: Libraries -[global] -setup-hooks = - pbr.hooks.setup_hook - [files] packages = automaton - -[nosetests] -cover-erase = true -verbosity = 2 - -[wheel] -universal = 1 - -[build_sphinx] -source-dir = doc/source -build-dir = doc/build -all_files = 1 -warning-is-error = 1 - -[upload_sphinx] -upload-dir = doc/build/html diff --git a/tox.ini b/tox.ini index ef55503..3f93d90 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] -minversion = 2.0 -envlist = py27,py37,docs,pep8 +minversion = 3.1.1 +envlist = py37,docs,pep8 ignore_basepython_conflict = True [testenv] @@ -26,7 +26,7 @@ deps = -r{toxinidir}/doc/requirements.txt commands = doc8 --ignore-path "doc/source/history.rst" doc/source - sphinx-build -W doc/source doc/build + sphinx-build -W -b html doc/source doc/build/html [testenv:releasenotes] deps = {[testenv:docs]deps}