From b081289e72fac8aeb1e58a01234cfc6d9a0c0c85 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Wed, 17 Jan 2018 20:27:06 +0000 Subject: [PATCH] Updated from global requirements Change-Id: Ie20ba5b4b93f701e2d9e76395b4f76af28b9f0f5 --- requirements.txt | 4 ++-- test-requirements.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 29cb6b847..1b003b801 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0 munch>=2.1.0 # MIT decorator>=3.4.0 # BSD jmespath>=0.9.0 # MIT -jsonpatch>=1.16 # BSD +jsonpatch!=1.20,>=1.16 # BSD ipaddress>=1.0.16;python_version<'3.3' # PSF os-client-config>=1.28.0 # Apache-2.0 # These two are here to prevent issues with version pin mismatches from our @@ -16,7 +16,7 @@ six>=1.10.0 # MIT futures>=3.0.0;python_version=='2.7' or python_version=='2.6' # BSD iso8601>=0.1.11 # MIT -keystoneauth1>=3.2.0 # Apache-2.0 +keystoneauth1>=3.3.0 # Apache-2.0 netifaces>=0.10.4 # MIT dogpile.cache>=0.6.2 # BSD diff --git a/test-requirements.txt b/test-requirements.txt index 0b7659437..098892f14 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -8,9 +8,9 @@ fixtures>=3.0.0 # Apache-2.0/BSD mock>=2.0.0 # BSD python-subunit>=1.0.0 # Apache-2.0/BSD openstackdocstheme>=1.17.0 # Apache-2.0 -oslotest>=1.10.0 # Apache-2.0 +oslotest>=3.2.0 # Apache-2.0 requests-mock>=1.1.0 # Apache-2.0 -sphinx>=1.6.2 # BSD +sphinx!=1.6.6,>=1.6.2 # BSD stestr>=1.0.0 # Apache-2.0 testscenarios>=0.4 # Apache-2.0/BSD testtools>=2.2.0 # MIT