diff --git a/.zuul.yaml b/.zuul.yaml index bef090e..6f7f39b 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -112,6 +112,7 @@ centos_kernel_file: ~/CentOS-7-x86_64-GenericCloud.kernel centos_partition_file: ~/CentOS-7-x86_64-GenericCloud-root.qcow2 metalsmith_root_size: 9 + metalsmith_python: python3 - job: name: metalsmith-integration-glance-localboot-centos7 @@ -130,16 +131,13 @@ metalsmith_traits: [CUSTOM_GOLD] - job: - name: metalsmith-integration-glance-netboot-cirros-iscsi-py3 + name: metalsmith-integration-glance-netboot-cirros-iscsi description: | Integration job using Glance as image source and CirrOS with netboot. parent: metalsmith-integration-base vars: - devstack_localrc: - USE_PYTHON3: true metalsmith_netboot: true metalsmith_precreate_port: true - metalsmith_python: python3 - job: name: metalsmith-integration-glance-netboot-cirros-direct @@ -154,7 +152,7 @@ IRONIC_DEFAULT_DEPLOY_INTERFACE: direct - job: - name: metalsmith-integration-http-netboot-cirros-direct-py3 + name: metalsmith-integration-http-netboot-cirros-direct description: | Integration job using HTTP as image source and direct deploy. parent: metalsmith-integration-base @@ -162,16 +160,13 @@ vars: metalsmith_netboot: true metalsmith_precreate_port: true - metalsmith_python: python3 metalsmith_use_http: true devstack_localrc: IRONIC_DEFAULT_DEPLOY_INTERFACE: direct - USE_PYTHON3: true - project: templates: - check-requirements - - openstack-python-jobs - openstack-python3-ussuri-jobs - openstack-lower-constraints-jobs - openstack-cover-jobs @@ -180,12 +175,12 @@ check: jobs: - metalsmith-integration-glance-localboot-centos7 - - metalsmith-integration-glance-netboot-cirros-iscsi-py3 + - metalsmith-integration-glance-netboot-cirros-iscsi - metalsmith-integration-glance-netboot-cirros-direct - - metalsmith-integration-http-netboot-cirros-direct-py3 + - metalsmith-integration-http-netboot-cirros-direct gate: jobs: - metalsmith-integration-glance-localboot-centos7 - - metalsmith-integration-glance-netboot-cirros-iscsi-py3 + - metalsmith-integration-glance-netboot-cirros-iscsi - metalsmith-integration-glance-netboot-cirros-direct - - metalsmith-integration-http-netboot-cirros-direct-py3 + - metalsmith-integration-http-netboot-cirros-direct diff --git a/doc/requirements.txt b/doc/requirements.txt index 22a69db..45d104d 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -2,7 +2,6 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. reno>=2.5.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,>=1.6.2;python_version>='3.4' # BSD sphinxcontrib-apidoc>=0.2.0 # BSD sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD diff --git a/releasenotes/notes/drop-py-2-7-3cd57c85e8eb8d2d.yaml b/releasenotes/notes/drop-py-2-7-3cd57c85e8eb8d2d.yaml new file mode 100644 index 0000000..1ae61cc --- /dev/null +++ b/releasenotes/notes/drop-py-2-7-3cd57c85e8eb8d2d.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + Python 2.7 support has been dropped. Last release of metalsmith to support + Python 2.7 is OpenStack Train. The minimum version of Python now supported + by metalsmith is Python 3.6. diff --git a/requirements.txt b/requirements.txt index d9ed681..fccb1a9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,5 +5,4 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0 openstacksdk>=0.29.0 # Apache-2.0 requests>=2.18.4 # Apache-2.0 six>=1.10.0 # MIT -enum34>=1.0.4;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD PrettyTable<0.8,>=0.7.2 # BSD diff --git a/setup.cfg b/setup.cfg index 4f001c3..1dfd368 100644 --- a/setup.cfg +++ b/setup.cfg @@ -14,8 +14,6 @@ classifier = License :: OSI Approved :: Apache Software License Operating System :: OS Independent 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 49dccf5..4283527 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,8 @@ [tox] -envlist = py3,py27,pep8 +envlist = py3,pep8 [testenv] +basepython = python3 usedevelop = True setenv = VIRTUAL_ENV={envdir} LANGUAGE=en_US @@ -17,7 +18,6 @@ commands = passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY [testenv:cover] -basepython = python3 setenv = {[testenv]setenv} PYTHON=coverage run --branch --source metalsmith --parallel-mode commands = @@ -29,7 +29,6 @@ commands = coverage xml -o cover/coverage.xml [testenv:venv] -basepython = python3 deps = -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} -r{toxinidir}/requirements.txt @@ -41,13 +40,11 @@ passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY \ OS_USER_DOMAIN_NAME OS_PROJECT_DOMAIN_NAME OS_CLOUD OS_CACERT [testenv:pep8] -basepython = python3 commands = flake8 metalsmith doc8 README.rst doc/source roles [testenv:docs] -basepython = python3 deps = -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} -r{toxinidir}/doc/joined-requirements.txt @@ -55,7 +52,6 @@ commands = sphinx-build -a -E -W -b html doc/source doc/build/html [testenv:pdf-docs] -basepython = python3 whitelist_externals = make deps = {[testenv:docs]deps} commands = @@ -63,7 +59,6 @@ commands = make -C doc/build/pdf [testenv:releasenotes] -basepython = python3 deps = -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} -r{toxinidir}/doc/joined-requirements.txt @@ -71,7 +66,6 @@ commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html [testenv:lower-constraints] -basepython = python3 deps = -c{toxinidir}/lower-constraints.txt -r{toxinidir}/test-requirements.txt