From 15e6c371e63004ce03e6843ba8a32be9ed322611 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Wed, 22 Apr 2020 14:37:25 -0600 Subject: [PATCH] Drop py27 support Change-Id: I4f1a8941a8a3cdf6331aec7a6b8058fbeeb076b6 --- .zuul.yaml | 1 - setup.cfg | 9 +-------- setup.py | 9 --------- tox.ini | 6 +++--- 4 files changed, 4 insertions(+), 21 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 7e91d88..bf5fee8 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,6 +1,5 @@ - project: templates: - - openstack-python-jobs - openstack-python3-ussuri-jobs - docs-on-readthedocs vars: diff --git a/setup.cfg b/setup.cfg index f8743d7..594ec39 100644 --- a/setup.cfg +++ b/setup.cfg @@ -13,9 +13,8 @@ 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 :: Only Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 @@ -28,9 +27,3 @@ console_scripts = ovb-deploy = openstack_virtual_baremetal.deploy:main ovb-build-nodes-json = openstack_virtual_baremetal.build_nodes_json:main openstackbmc = openstack_virtual_baremetal.openstackbmc:main - - -[build_sphinx] -all_files = 1 -build-dir = doc/build -source-dir = doc/source diff --git a/setup.py b/setup.py index 782bb21..0cdc8c2 100644 --- a/setup.py +++ b/setup.py @@ -13,17 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT import setuptools -# In python < 2.7.4, a lazy loading of package `pbr` will break -# setuptools if some other modules registered functions in `atexit`. -# solution from: http://bugs.python.org/issue15881#msg170215 -try: - import multiprocessing # noqa -except ImportError: - pass - setuptools.setup( setup_requires=['pbr>=1.8'], pbr=True) diff --git a/tox.ini b/tox.ini index 35c65be..8dc38bf 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] -minversion = 3.1 +minversion = 3.2.0 skipsdist = True -envlist = py27,py37,pep8 +envlist = py37,py38,pep8 ignore_basepython_conflict = True [testenv] @@ -41,7 +41,7 @@ commands = coverage xml -o cover/coverage.xml [testenv:genconfig] -commands = python bin/environment-generator.py sample-env-generator --index doc/source/deploy/environment-index.rst +commands = python3 bin/environment-generator.py sample-env-generator --index doc/source/deploy/environment-index.rst [flake8] ignore = H803,W504