From 22ec98e6aa9944ac0db081a2d8d1d085fddfad37 Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Tue, 12 Nov 2019 16:20:57 -0600 Subject: [PATCH] Drop requirements for unsupported python versions This drops the requirements entries for python versions that we no longer support. Change-Id: I011d7992be4d1b3a9b6442a68128a61e85241aa8 Signed-off-by: Sean McGinnis --- doc/requirements.txt | 3 +-- lower-constraints.txt | 2 -- requirements.txt | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/doc/requirements.txt b/doc/requirements.txt index 153365e86da..4cd964f84d4 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -3,8 +3,7 @@ # process, which may cause wedges in the gate later. openstackdocstheme>=1.20.0 # Apache-2.0 reno>=2.5.0 # Apache-2.0 -sphinx!=1.6.6,!=1.6.7,>=1.6.3,<2.0.0;python_version=='2.7' # BSD -sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.3;python_version>='3.4' # BSD +sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.3 # BSD os-api-ref>=1.4.0 # Apache-2.0 sphinxcontrib-apidoc>=0.2.0 # BSD sphinx-feature-classification>=0.1.0 # Apache 2.0 diff --git a/lower-constraints.txt b/lower-constraints.txt index 51cbc86d21f..f5ef63a7bed 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -26,7 +26,6 @@ docutils==0.14 dogpile.cache==0.6.5 dulwich==0.19.0 enum-compat==0.0.2 -enum34==1.0.4;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD eventlet==0.22.0 extras==1.0.0 fasteners==0.14.1 @@ -42,7 +41,6 @@ hacking==1.1.0 httplib2==0.9.1 idna==2.6 imagesize==1.0.0 -ipaddress==1.0.17;python_version<'3.3' # PSF iso8601==0.1.11 Jinja2==2.10 jsonpatch==1.21 diff --git a/requirements.txt b/requirements.txt index 96785d63e02..1cb46960682 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,13 +5,11 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0 decorator>=3.4.0 # BSD defusedxml>=0.5.0 # PSF -enum34>=1.0.4;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD eventlet!=0.23.0,!=0.25.0,>=0.22.0 # MIT greenlet>=0.4.10 # MIT httplib2>=0.9.1 # MIT iso8601>=0.1.11 # MIT jsonschema>=2.6.0 # MIT -ipaddress>=1.0.17;python_version<'3.3' # PSF keystoneauth1>=3.7.0 # Apache-2.0 keystonemiddleware>=4.21.0 # Apache-2.0 lxml!=3.7.0,>=3.4.1 # BSD