From 1ed287c92acbf2aba80d37c0fc214caad633a5c1 Mon Sep 17 00:00:00 2001 From: Luka Peschke Date: Mon, 22 Oct 2018 18:08:29 +0200 Subject: [PATCH] Use global-requirements for requirements This updates cloudkittyclient's requirement files in order to use openstack/requirements for constraints. This will help to avoid dependency conflicts when cloudkittyclient is deployed in an openstack context. Work items: * Updated requirements.txt, test-requirements.txt and doc/requirements.txt with the `update-requirements` tool provided by openstack/requirements. * Added a lower-constraints.txt file. * Added the "check-requirements" zuul job template to the CI. Change-Id: I12a882ce4d24ade153a64b75852396377ac42ca6 --- .zuul.yaml | 1 + doc/requirements.txt | 4 ++-- lower-constraints.txt | 23 +++++++++++++++++++++++ requirements.txt | 14 +++++++------- test-requirements.txt | 2 +- 5 files changed, 34 insertions(+), 10 deletions(-) create mode 100644 lower-constraints.txt diff --git a/.zuul.yaml b/.zuul.yaml index fc5a336..5c1eb2c 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -28,6 +28,7 @@ - project: templates: + - check-requirements - openstack-cover-jobs - openstack-python-jobs - openstack-python35-jobs diff --git a/doc/requirements.txt b/doc/requirements.txt index d6b1081..9e2690a 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -3,5 +3,5 @@ # process, which may cause wedges in the gate later. openstackdocstheme>=1.18.1 # Apache-2.0 -sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD -reno>=2.5.0 # Apache2 +sphinx>=1.6.2,!=1.6.6,!=1.6.7 # BSD +reno>=2.5.0 # Apache-2.0 diff --git a/lower-constraints.txt b/lower-constraints.txt new file mode 100644 index 0000000..90a28ad --- /dev/null +++ b/lower-constraints.txt @@ -0,0 +1,23 @@ +# requirements +pbr==2.0.0 # Apache-2.0 +cliff==2.11.0 # Apache-2.0 +keystoneauth1==3.4.0 # Apache-2.0 +oslo.utils==3.35 # Apache-2.0 +oslo.log==3.36 # Apache-2.0 +PyYAML==3.12 # MIT +jsonpath-rw-ext==1.0 # Apache-2.0 +six==1.11 # MIT +os-client-config==1.29.0 # Apache-2.0 + +# test-requirements.txt +coverage==4.0 # Apache-2.0 +python-subunit==0.0.18 # Apache-2.0/BSD +oslotest==1.10.0 # Apache-2.0 +stestr==2.0 # Apache-2.0 +mock==2.0 # BSD +python-openstackclient==3.14 # Apache-2.0 + +# doc/requirements.txt +openstackdocstheme==1.18.1 # Apache-2.0 +sphinx==1.6.2 # BSD +reno==2.5.0 # Apache2 diff --git a/requirements.txt b/requirements.txt index 22627a2..264165a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,12 +2,12 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr!=2.1.0,>=2.0.0 # Apache-2.0 -cliff>=2.11.0,<3.0 # Apache-2.0 -keystoneauth1>=3.4.0,<4.0 # Apache-2.0 -oslo.utils>=3.35,<4.0 # Apache-2.0 -oslo.log>=3.36,<4.0 # Apache-2.0 -PyYAML>=3.12,<4.0 # MIT +pbr>=2.0.0,!=2.1.0 # Apache-2.0 +cliff>=2.11.0 # Apache-2.0 +keystoneauth1>=3.4.0 # Apache-2.0 +oslo.utils>=3.35 # Apache-2.0 +oslo.log>=3.36 # Apache-2.0 +PyYAML>=3.12 # MIT jsonpath-rw-ext>=1.0 # Apache-2.0 -six>=1.11,<2.0 # MIT +six>=1.11 # MIT os-client-config>=1.29.0 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index 6acdb32..ad71606 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,7 +4,7 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 -coverage!=4.4,>=4.0 # Apache-2.0 +coverage>=4.0,!=4.4 # Apache-2.0 python-subunit>=0.0.18 # Apache-2.0/BSD oslotest>=1.10.0 # Apache-2.0 stestr>=2.0 # Apache-2.0