diff --git a/.zuul.yaml b/.zuul.yaml index d7d4fd3..36f1aa3 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,6 +1,5 @@ - project: templates: - - openstack-python-jobs - openstack-python3-ussuri-jobs - openstack-cover-jobs - publish-openstack-docs-pti diff --git a/README.rst b/README.rst index 3e49092..a094784 100644 --- a/README.rst +++ b/README.rst @@ -148,6 +148,5 @@ Testing There are multiple test targets that can be run to validate the code. * tox -e pep8 - style guidelines enforcement -* tox -e py27 - traditional unit testing with python 2.7 * tox -e py36 - traditional unit testing with python 3.6 * tox -e py37 - traditional unit testing with python 3.7 diff --git a/doc/requirements.txt b/doc/requirements.txt index b03569f..1cd0dd7 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -4,5 +4,4 @@ openstackdocstheme>=1.30.0 # Apache-2.0 sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD -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 diff --git a/releasenotes/notes/drop-py-2-7-5ef11499fe79e1ca.yaml b/releasenotes/notes/drop-py-2-7-5ef11499fe79e1ca.yaml new file mode 100644 index 0000000..b2ded1a --- /dev/null +++ b/releasenotes/notes/drop-py-2-7-5ef11499fe79e1ca.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + Python 2.7 support has been dropped. Last release of python-searchlightclient + to support python 2.7 is OpenStack Train. The minimum version of Python now + supported is Python 3.6. diff --git a/setup.cfg b/setup.cfg index 832433a..fbe928b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -13,8 +13,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 diff --git a/tox.ini b/tox.ini index 7751846..d8b154c 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,8 @@ [tox] -envlist = pypy,py27,py37,pep8 -minversion = 2.0 +envlist = pypy,py37,pep8 +minversion = 3.1.1 skipsdist = True +ignore_basepython_conflict = True [testenv] basepython = python3