diff --git a/lower-constraints.txt b/lower-constraints.txt index 9cfd298..7d3803e 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -2,7 +2,6 @@ alabaster==0.7.10 ansible==2.5.0 appdirs==1.4.3 asn1crypto==0.24.0 -Babel==2.5.3 bandit==1.1.0 bashate==0.5.1 beautifulsoup4==4.6.0 @@ -41,7 +40,7 @@ linecache2==1.0.0 MarkupSafe==1.0 monotonic==1.4 mox3==0.25.0 -mypy==0.6 +mypy==0.600 msgpack==0.5.6 munch==2.2.0 netaddr==0.7.18 @@ -95,7 +94,7 @@ stestr==2.0.0 testscenarios==0.4 testtools==2.2.0 traceback2==1.4.0 -typing==3.6 +typing==3.6.6 unittest2==1.1.0 urllib3==1.22 warlock==1.3.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