From 4b71d3a75ec92205c04cf70532a9a4bec02d5b35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Fri, 17 Apr 2020 17:41:59 +0200 Subject: [PATCH] Cleanup py27 support Removes all mentions of py27. Change-Id: I2a1767c3df332cccf13303ce734c40d04dfd6ec9 Co-Authored-By: jacky06 --- lower-constraints.txt | 4 +--- requirements.txt | 6 +----- setup.cfg | 6 +++++- setup.py | 9 --------- tox.ini | 4 ++-- 5 files changed, 9 insertions(+), 20 deletions(-) diff --git a/lower-constraints.txt b/lower-constraints.txt index 9cfd298..bf8d05e 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -33,7 +33,6 @@ iso8601==0.1.12 Jinja2==2.10 jmespath==0.9.3 jsonpatch==1.21 -jsonpickle==0.9 jsonpointer==2.0 jsonschema==2.6.0 keystoneauth1==3.4.0 @@ -84,11 +83,10 @@ requests==2.18.4 requestsexceptions==1.4.0 restructuredtext-lint==1.1.3 rfc3986==1.2.0 -setuptools==21.0.0 simplejson==3.13.2 smmap2==2.0.3 snowballstemmer==1.2.1 -Sphinx==1.6.2 +Sphinx==1.8.0 sphinxcontrib-websupport==1.0.1 stevedore==1.28.0 stestr==2.0.0 diff --git a/requirements.txt b/requirements.txt index fe3b4ea..106d350 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,6 @@ -# The order of packages is significant, because pip processes them in the order -# of appearance. Changing the order has an impact on the overall integration -# process, which may cause wedges in the gate later. - -Babel>=2.5.3 # BSD cliff>=2.11.0 # Apache-2.0 cliff-tablib>=2.0 # Apache-2.0 +docker>=2.4.2 # Apache-2.0 jsonpickle>=0.9 # BSD oslo.i18n>=3.20.0 # Apache-2.0 paramiko>=2.6.0 # LGPL diff --git a/setup.cfg b/setup.cfg index 24a7d27..0665291 100644 --- a/setup.cfg +++ b/setup.cfg @@ -6,7 +6,8 @@ description-file = author = OpenStack author-email = openstack-discuss@lists.openstack.org home-page = https://docs.openstack.org/kolla-cli/latest/ - +python-requires = >=3.6 +license = Apache License, Version 2.0 classifier = Environment :: OpenStack Intended Audience :: Developers @@ -14,6 +15,9 @@ classifier = Intended Audience :: System Administrators License :: OSI Approved :: Apache Software License Operating System :: POSIX :: Linux + Programming Language :: Python + Programming Language :: Python :: Implementation :: CPython + Programming Language :: Python :: 3 :: Only Programming Language :: Python :: 3 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 diff --git a/setup.py b/setup.py index 566d844..cd35c3c 100755 --- 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>=2.0.0'], pbr=True) diff --git a/tox.ini b/tox.ini index 886a679..90644f3 100644 --- a/tox.ini +++ b/tox.ini @@ -14,8 +14,8 @@ whitelist_externals = mkdir mypy rm -install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages} -deps = -r{toxinidir}/requirements.txt +deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_LOG_CAPTURE OS_TEST_TIMEOUT