From 4af42f837fbbf75585fd3525df27002c7a5da69a Mon Sep 17 00:00:00 2001 From: Brian Haley Date: Wed, 8 Jan 2020 16:21:24 -0500 Subject: [PATCH] Complete dropping py27 support goal This takes care of the last details for dropping py27 support by adding a proper min version of python in setup.cfg. Change-Id: I693db277d802b2a54084cc1be11d8ce04ad9be2e --- doc/requirements.txt | 4 ++-- requirements.txt | 2 +- setup.cfg | 1 + test-requirements.txt | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/doc/requirements.txt b/doc/requirements.txt index e6aff26088..ebc9d6e968 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -9,7 +9,7 @@ sphinxcontrib-blockdiag>=1.5.4 # BSD sphinxcontrib-nwdiag>=0.9.5 # BSD sphinxcontrib-seqdiag>=0.8.4 # BSD docutils>=0.11 # OSI-Approved Open Source, Public Domain -sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD +sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2 # BSD graphviz!=0.5.0,>=0.4 # MIT License openstackdocstheme>=1.20.0 # Apache-2.0 sadisplay>=0.4.8 # BSD @@ -23,4 +23,4 @@ sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD pydot>=1.2.4 # MIT License pydotplus>=2.0.2 # MIT License pyparsing>=2.1.0 # MIT -networkx>=1.10;python_version>='3.4' # BSD +networkx>=1.10 # BSD diff --git a/requirements.txt b/requirements.txt index 10713a9e7b..6dad6db5e8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -55,5 +55,5 @@ Flask!=0.11,>=0.10 # BSD netifaces>=0.10.4 # MIT cryptography>=2.1 # BSD/Apache-2.0 pyroute2>=0.4.21;sys_platform!='win32' # Apache-2.0 (+ dual licensed GPL2) -gunicorn>=19.9.0;python_version>='3.0' # MIT +gunicorn>=19.9.0 # MIT Werkzeug>=0.14.1 # BSD License diff --git a/setup.cfg b/setup.cfg index deb2b6e00f..da4e744897 100644 --- a/setup.cfg +++ b/setup.cfg @@ -6,6 +6,7 @@ description-file = author = OpenStack author-email = openstack-discuss@lists.openstack.org home-page = https://docs.openstack.org/octavia/latest/ +python-requires = >=3.6 classifier = Development Status :: 5 - Production/Stable Environment :: OpenStack diff --git a/test-requirements.txt b/test-requirements.txt index 324f224891..035b09071d 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -9,7 +9,7 @@ flake8-import-order==0.12 # LGPLv3 mock>=2.0.0 # BSD python-subunit>=1.0.0 # Apache-2.0/BSD oslotest>=3.2.0 # Apache-2.0 -pylint>=1.9.2;python_version>='3.0' # GPLv2 +pylint>=1.9.2 # GPLv2 testrepository>=0.0.18 # Apache-2.0/BSD testtools>=2.2.0 # MIT testresources>=2.0.0 # Apache-2.0/BSD @@ -18,5 +18,5 @@ doc8>=0.6.0 # Apache-2.0 bandit!=1.6.0,>=1.1.0 # Apache-2.0 tempest>=17.1.0 # Apache-2.0 # Required for pep8 - doc8 tests -sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD +sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD bashate>=0.5.1 # Apache-2.0