Adjust requirements and lower-constraints

Conservative changes to get the l-c job passing with the new
pip resolver.

Big (or weird) changes:
- os-win 3.0.0 -> 4.1.0 (u-c allows 4.3.3)
- oslo.service 1.24.0 -> 1.31.0 (u-c allows 1.40.2)
  * These were the minimum versions that can take eventlet >=0.22.0
    (which cinder wants)
- pytz 2013.6 -> 2015.7 (u-c allows 2019.2)
  * needed for babel*
- added simplejson==3.0.0 (u-c allows 3.16.0)
  * was unconstrained, and pip was downloading 2.6.2 that used py2
    syntax incompatible with py3 and would error out the install
- python-subunit 1.2.0 -> 1.3.0 (u-c allows 1.4.0)
  * needed by stestr 2.2.0
- downgrade: SQLAlchemy-Utils 0.36.1 -> 0.33.11
  * a backport had exceeded u-c of 0.34.2
- downgrade: docutils 0.14 -> 0.11 (u-c allows 0.15.2)
  * all relevant versions of restructuredtext-lint are pinned to 0.11
- downgrade: pycodestyle 2.5.0 -> 2.0.0
  * probably due to flake8, but at this point I don't care
- added some indirect dependencies to test-requirements.txt (even
  though they're not actually test requirements) to tighten versions
  up for the resolver (otherwise there are too many choices and
  dependency resolution was taking >6 hours); also had to add to
  l-c to satisfy requirements job

Change-Id: Icf2bd2f28950bb89a8d75c698fb1ac39cf991fa0

3 files changed, 31 insertions, 19 deletions

diff --git a/lower-constraints.txt b/lower-constraints.txt
index 024b069d9..84e3de4d5 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -4,6 +4,7 @@ amqp==2.2.2
 appdirs==1.4.3
 asn1crypto==0.24.0
 automaton==1.14.0
+Babel==2.7.0
 bandit==1.6.0
 bcrypt==3.1.4
 cachetools==2.0.1
@@ -15,14 +16,14 @@ cliff==2.11.0
 cmd2==0.8.1
 contextlib2==0.5.5
 coverage==4.0
-cryptography==2.1
+cryptography==2.1.4
 cursive==0.2.1
 ddt==1.2.1
 debtcollector==1.19.0
 decorator==3.4.0
 defusedxml==0.5.0
 doc8==0.6.0
-docutils==0.14
+docutils==0.11
 dogpile.cache==0.6.5
 dulwich==0.19.0
 enum-compat==0.0.2
@@ -31,14 +32,13 @@ eventlet==0.22.0
 extras==1.0.0
 fasteners==0.14.1
 fixtures==3.0.0
-flake8==2.5.5
+flake8==2.6.0
 future==0.16.0
 futurist==1.6.0
 gitdb2==2.0.3
 GitPython==2.1.8
 google-api-python-client==1.4.2
 greenlet==0.4.10
-hacking==1.1.0
 httplib2==0.9.1
 idna==2.6
 imagesize==1.0.0
@@ -48,6 +48,7 @@ Jinja2==2.10
 jsonpatch==1.21
 jsonpointer==2.0
 jsonschema==2.6.0
+hacking==1.1.0
 keystoneauth1==3.7.0
 keystonemiddleware==4.21.0
 kombu==4.1.0
@@ -58,6 +59,7 @@ MarkupSafe==1.0
 mccabe==0.2.1
 mock==2.0.0
 monotonic==1.4
+mox3==0.28.0
 msgpack==0.5.6
 netaddr==0.7.19
 netifaces==0.10.6
@@ -67,11 +69,12 @@ openstackdocstheme==1.20.0
 os-api-ref==1.4.0
 os-brick==2.10.5
 os-client-config==1.29.0
-os-win==3.0.0
+os-service-types==1.6.0
+os-win==4.1.0
 oslo.cache==1.29.0
 oslo.concurrency==3.26.0
 oslo.config==5.2.0
-oslo.context==2.19.2
+oslo.context==2.22.0
 oslo.db==4.27.0
 oslo.i18n==3.15.3
 oslo.log==3.36.0
@@ -82,7 +85,7 @@ oslo.privsep==1.32.0
 oslo.reports==1.18.0
 oslo.rootwrap==5.8.0
 oslo.serialization==2.18.0
-oslo.service==1.24.0
+oslo.service==1.31.0
 oslo.utils==3.34.0
 oslo.versionedobjects==1.31.2
 oslo.vmware==2.17.0
@@ -101,7 +104,7 @@ psycopg2==2.7
 pyasn1-modules==0.2.1
 pyasn1==0.4.2
 pycadf==2.7.0
-pycodestyle==2.5.0
+pycodestyle==2.0.0
 pycparser==2.18
 pyflakes==0.8.1
 Pygments==2.2.0
@@ -118,11 +121,11 @@ python-glanceclient==2.15.0
 python-keystoneclient==3.15.0
 python-mimeparse==1.6.0
 python-novaclient==9.1.0
-python-subunit==1.2.0
+python-subunit==1.3.0
 python-swiftclient==3.2.0
-pytz==2013.6
+pytz==2015.7
 pyudev==0.21.0
-PyYAML==3.12
+PyYAML==3.13
 reno==2.5.0
 repoze.lru==0.7
 requests==2.14.2
@@ -132,6 +135,7 @@ rfc3986==1.1.0
 Routes==2.3.1
 rsa==3.4.2
 rtslib-fb==2.1.65
+simplejson==3.0.0
 six==1.10.0
 smmap2==2.0.3
 snowballstemmer==1.2.1
@@ -140,7 +144,7 @@ sphinx-feature-classification==0.1.0
 sphinxcontrib-websupport==1.0.1
 sqlalchemy-migrate==0.11.0
 SQLAlchemy==1.0.10
-SQLAlchemy-Utils==0.36.1
+SQLAlchemy-Utils==0.33.11
 sqlparse==0.2.4
 statsd==3.2.2
 stestr==2.2.0
diff --git a/requirements.txt b/requirements.txt
index 3bd2ee40e..c90a8bf73 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -18,7 +18,7 @@ lxml!=3.7.0,>=3.4.1 # BSD
 oauth2client!=4.0.0,>=1.5.0 # Apache-2.0
 oslo.config>=5.2.0 # Apache-2.0
 oslo.concurrency>=3.26.0 # Apache-2.0
-oslo.context>=2.19.2 # Apache-2.0
+oslo.context>=2.22.0 # Apache-2.0
 oslo.db>=4.27.0 # Apache-2.0
 oslo.log>=3.36.0 # Apache-2.0
 oslo.messaging>=6.4.0 # Apache-2.0
@@ -28,7 +28,7 @@ oslo.privsep>=1.32.0 # Apache-2.0
 oslo.reports>=1.18.0 # Apache-2.0
 oslo.rootwrap>=5.8.0 # Apache-2.0
 oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
-oslo.service!=1.28.1,>=1.24.0 # Apache-2.0
+oslo.service>=1.31.0 # Apache-2.0
 oslo.upgradecheck>=0.1.0 # Apache-2.0
 oslo.utils>=3.34.0 # Apache-2.0
 oslo.versionedobjects>=1.31.2 # Apache-2.0
@@ -44,7 +44,7 @@ python-glanceclient>=2.15.0 # Apache-2.0
 python-keystoneclient>=3.15.0 # Apache-2.0
 python-novaclient>=9.1.0 # Apache-2.0
 python-swiftclient>=3.2.0 # Apache-2.0
-pytz>=2013.6 # MIT
+pytz>=2015.7 # MIT
 requests>=2.14.2,!=2.20.0 # Apache-2.0
 retrying!=1.3.0,>=1.2.3 # Apache-2.0
 Routes>=2.3.1 # MIT
@@ -59,9 +59,9 @@ WebOb>=1.7.1 # MIT
 oslo.i18n>=3.15.3 # Apache-2.0
 oslo.vmware>=2.17.0 # Apache-2.0
 os-brick>=2.10.5 # Apache-2.0
-os-win>=3.0.0 # Apache-2.0
+os-win>=4.1.0 # Apache-2.0
 tooz>=1.58.0 # Apache-2.0
 google-api-python-client>=1.4.2 # Apache-2.0
 castellan>=0.16.0 # Apache-2.0
-cryptography>=2.1 # BSD/Apache-2.0
+cryptography>=2.1.4 # BSD/Apache-2.0
 cursive>=0.2.1 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index a8514b563..9b283076e 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -11,10 +11,10 @@ fixtures>=3.0.0 # Apache-2.0/BSD
 mock>=2.0.0 # BSD
 os-api-ref>=1.4.0 # Apache-2.0
 oslotest>=3.2.0 # Apache-2.0
-pycodestyle==2.5.0 # MIT License
+pycodestyle>=2.0.0 # MIT License
 PyMySQL>=0.7.6 # MIT License
 psycopg2>=2.7 # LGPL/ZPL
-SQLAlchemy-Utils>=0.36.1 # BSD License
+SQLAlchemy-Utils>=0.33.11 # BSD License
 testtools>=2.2.0 # MIT
 testresources>=2.0.0 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD
@@ -24,3 +24,11 @@ tempest>=17.1.0 # Apache-2.0
 # so we need to pin it here to a known working version
 bandit==1.6.0 # Apache-2.0
 doc8>=0.6.0 # Apache-2.0
+#
+# These are here to enable the resolver to work faster.
+# They are not directly used by cinder.  Without these
+# dependency resolution was taking >6 hours.
+mox3>=0.28.0
+os-service-types>=1.6.0
+msgpack>=0.5.6
+Babel>=2.7.0