diff --git a/.zuul.yaml b/.zuul.yaml index b166a7510..53a58f331 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -361,7 +361,6 @@ templates: - check-requirements - openstack-lower-constraints-jobs - - openstack-python35-jobs - openstack-python3-ussuri-jobs - openstacksdk-functional-tips - openstacksdk-tox-tips diff --git a/doc/source/contributor/setup.rst b/doc/source/contributor/setup.rst index 8275da02d..66109ac4b 100644 --- a/doc/source/contributor/setup.rst +++ b/doc/source/contributor/setup.rst @@ -34,15 +34,13 @@ as an administrator in some situations.:: You can create a virtualenv in any location. A common usage is to store all of your virtualenvs in the same place, such as under your home directory. -To create a virtualenv for the default Python, likely a version 2, run -the following:: +To create a virtualenv for the default Python, run the following:: $ virtualenv $HOME/envs/sdk -To create an environment for a different version, such as Python 3, run -the following:: +To create an environment for a different version, run the following:: - $ virtualenv -p python3.5 $HOME/envs/sdk3 + $ virtualenv -p python3.8 $HOME/envs/sdk3 When you want to enable your environment so that you can develop inside of it, you *activate* it. To activate an environment, run the /bin/activate diff --git a/doc/source/contributor/testing.rst b/doc/source/contributor/testing.rst index c45b88049..49ec9c057 100644 --- a/doc/source/contributor/testing.rst +++ b/doc/source/contributor/testing.rst @@ -14,15 +14,14 @@ Run In order to run the entire unit test suite, simply run the ``tox`` command inside of your source checkout. This will attempt to run every test command -listed inside of ``tox.ini``, which includes Python 2.7, 3.5, -and a PEP 8 check. You should run the full test suite on all versions before +listed inside of ``tox.ini``, which includes Python 3.8, and a PEP 8 check. +You should run the full test suite on all versions before submitting changes for review in order to avoid unexpected failures in the continuous integration system.:: (sdk3)$ tox ... - py35: commands succeeded - py27: commands succeeded + py38: commands succeeded pep8: commands succeeded congratulations :) @@ -30,8 +29,8 @@ During development, it may be more convenient to run a subset of the tests to keep test time to a minimum. You can choose to run the tests only on one version. A step further is to run only the tests you are working on.:: - (sdk3)$ tox -e py35 # Run run the tests on Python 3.5 - (sdk3)$ tox -e py35 TestContainer # Run only the TestContainer tests on 3.5 + (sdk3)$ tox -e py38 # Run run the tests on Python 3.8 + (sdk3)$ tox -e py38 TestContainer # Run only the TestContainer tests on 3.8 Functional Tests ---------------- diff --git a/releasenotes/notes/dropped-python-3.5-b154887cce87947c.yaml b/releasenotes/notes/dropped-python-3.5-b154887cce87947c.yaml new file mode 100644 index 000000000..a78c85f45 --- /dev/null +++ b/releasenotes/notes/dropped-python-3.5-b154887cce87947c.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + Python 3.5 is no longer supported. diff --git a/setup.cfg b/setup.cfg index b969c7750..a635769c4 100644 --- a/setup.cfg +++ b/setup.cfg @@ -14,11 +14,10 @@ classifier = Operating System :: POSIX :: Linux Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 -python-requires = >=3.5 +python-requires = >=3.6 [files] packages = diff --git a/tox.ini b/tox.ini index 8ddc7c2a5..ef1491a33 100644 --- a/tox.ini +++ b/tox.ini @@ -130,7 +130,3 @@ deps = -c{toxinidir}/lower-constraints.txt -r{toxinidir}/test-requirements.txt -r{toxinidir}/requirements.txt - -[testenv:py35] -basepython = python3.5 -deps = {[testenv:lower-constraints]deps}