Merge "Drop requirements for unsupported python versions"

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

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
@@ -43,7 +42,6 @@ hacking==2.0.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

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