Use global-requirements for requirements

This updates cloudkitty's requirement and setup files in order to use
openstack/requirements for constraints. This will help to avoid dependency
conflicts when cloudkitty is deployed in an openstack context.

Work items:

* Updated requirements.txt, test-requirements.txt and setup.py 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: I5aab02374523be83a65c8b7f47f1df5e93b5a3d2
This commit is contained in:
Luka Peschke
2018-10-15 14:18:09 +02:00
parent da54a587c5
commit c417e5f6cb
5 changed files with 61 additions and 17 deletions

View File

@@ -24,6 +24,7 @@
- project: - project:
templates: templates:
- check-requirements
- openstack-cover-jobs - openstack-cover-jobs
- openstack-python-jobs - openstack-python-jobs
- openstack-python35-jobs - openstack-python35-jobs

43
lower-constraints.txt Normal file
View File

@@ -0,0 +1,43 @@
# requirements
pbr==2.0.0 # Apache-2.0
alembic==0.8.0 # MIT
eventlet==0.18.2 # MIT
keystonemiddleware==4.0.0 # Apache-2.0
gnocchiclient==2.5.0 # Apache-2.0
python-monascaclient==1.9.0 # Apache-2.0
python-keystoneclient==1.9.0 # Apache-2.0
keystoneauth1==2.1.0 # Apache-2.0
iso8601==0.1.9 # MIT
PasteDeploy==1.5.0 # MIT
pecan==1.0.0 # BSD
WSME==0.8 # MIT
oslo.config==3.7.0 # Apache-2.0
oslo.context==2.9.0 # Apache-2.0
oslo.concurrency==3.5.0 # Apache-2.0
oslo.db==4.1.0 # Apache-2.0
oslo.i18n==2.1.0 # Apache-2.0
oslo.log==1.14.0 # Apache-2.0
oslo.messaging==5.24.2 # Apache-2.0
oslo.middleware==3.27.0 # Apache-2.0
oslo.policy==0.5.0 # Apache-2.0
oslo.utils==3.5.0 # Apache-2.0
SQLAlchemy==1.0.10 # MIT
six==1.9.0 # MIT
stevedore==1.5.0 # Apache-2.0
tooz==1.28.0 # Apache-2.0
voluptuous==0.11.1 # BSD-3
# test-requirements
coverage==3.6 # Apache-2.0
kombu==4.0.0 # BSD
ddt==1.0.1 # MIT
gabbi==1.26.1 # Apache-2.0
testscenarios==0.4 # Apache-2.0/BSD
stestr==2.0.0 # Apache-2.0
mock==1.2 # BSD
sphinx==1.6.2 # BSD
openstackdocstheme==1.20.0 # Apache-2.0
oslotest==1.10.0 # Apache-2.0
sphinxcontrib-pecanwsme==0.8 # Apache-2.0
reno==1.8.0 # Apache2
sphinxcontrib-httpdomain==1.6.0 # Apache-2.0

View File

@@ -1,30 +1,30 @@
# The order of packages is significant, because pip processes them in the order # The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration # of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
pbr>=1.6 # Apache-2.0 pbr>=2.0.0,!=2.1.0 # Apache-2.0
alembic>=0.8.0 # MIT alembic>=0.8.0 # MIT
eventlet!=0.18.3,>=0.18.2 # MIT eventlet>=0.18.2,!=0.18.3,!=0.20.1,!=0.21.0,!=0.23.0 # MIT
keystonemiddleware!=4.1.0,>=4.0.0 # Apache-2.0 keystonemiddleware>=4.0.0 # Apache-2.0
gnocchiclient>=2.5.0 # Apache-2.0 gnocchiclient>=2.5.0 # Apache-2.0
python-monascaclient>=1.7.0 # Apache-2.0 python-monascaclient>=1.9.0 # Apache-2.0
python-keystoneclient!=1.8.0,!=2.1.0,>=1.6.0 # Apache-2.0 python-keystoneclient>=1.9.0,!=2.1.0 # Apache-2.0
keystoneauth1>=2.1.0 # Apache-2.0 keystoneauth1>=2.1.0 # Apache-2.0
iso8601>=0.1.9 # MIT iso8601>=0.1.9 # MIT
PasteDeploy>=1.5.0 # MIT PasteDeploy>=1.5.0 # MIT
pecan>=1.0.0 # BSD pecan>=1.0.0,!=1.0.2,!=1.0.3,!=1.0.4,!=1.2 # BSD
WSME>=0.8 # MIT WSME>=0.8 # MIT
oslo.config>=3.7.0 # Apache-2.0 oslo.config>=3.7.0,!=4.3.0,!=4.4.0 # Apache-2.0
oslo.context>=2.9.0 # Apache-2.0 oslo.context>=2.9.0 # Apache-2.0
oslo.concurrency>=3.5.0 # Apache-2.0 oslo.concurrency>=3.5.0 # Apache-2.0
oslo.db>=4.1.0 # Apache-2.0 oslo.db>=4.1.0 # Apache-2.0
oslo.i18n>=2.1.0 # Apache-2.0 oslo.i18n>=2.1.0 # Apache-2.0
oslo.log>=1.14.0 # Apache-2.0 oslo.log>=1.14.0 # Apache-2.0
oslo.messaging!=5.25.0,>=5.24.2 # Apache-2.0 oslo.messaging>=5.24.2,!=9.0.0 # Apache-2.0
oslo.middleware>=3.27.0 # Apache-2.0 oslo.middleware>=3.27.0 # Apache-2.0
oslo.policy>=0.5.0 # Apache-2.0 oslo.policy>=0.5.0 # Apache-2.0
oslo.utils>=3.5.0 # Apache-2.0 oslo.utils>=3.5.0 # Apache-2.0
SQLAlchemy<1.1.0,>=1.0.10 # MIT SQLAlchemy>=1.0.10,!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8 # MIT
six>=1.9.0 # MIT six>=1.9.0 # MIT
stevedore>=1.5.0 # Apache-2.0 stevedore>=1.5.0 # Apache-2.0
tooz>=1.28.0 # Apache-2.0 tooz>=1.28.0 # Apache-2.0
voluptuous>=0.11.1,<1.0.0 # BSD-3 voluptuous>=0.11.1 # BSD License

View File

@@ -25,5 +25,5 @@ except ImportError:
pass pass
setuptools.setup( setuptools.setup(
setup_requires=['pbr>=1.8'], setup_requires=['pbr>=2.0.0'],
pbr=True) pbr=True)

View File

@@ -3,18 +3,18 @@
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
# hacking should be first # hacking should be first
hacking>=0.12.0,!=0.13.0,<0.14 # Apache-2.0 hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
coverage>=3.6 # Apache-2.0 coverage>=3.6,!=4.4 # Apache-2.0
kombu<4.0.0 # BSD kombu>=4.0.0,!=4.0.2 # BSD
ddt>=1.0.1 # MIT ddt>=1.0.1 # MIT
gabbi>=1.26.1 # Apache-2.0 gabbi>=1.26.1 # Apache-2.0
testscenarios>=0.4 # Apache-2.0/BSD testscenarios>=0.4 # Apache-2.0/BSD
stestr>=2.0.0 # Apache-2.0 stestr>=2.0.0 # Apache-2.0
mock>=1.2 # BSD mock>=1.2 # BSD
sphinx>=1.6.2 # BSD sphinx>=1.6.2,!=1.6.6,!=1.6.7 # BSD
openstackdocstheme>=1.20.0 # Apache-2.0 openstackdocstheme>=1.20.0 # Apache-2.0
oslotest>=1.10.0 # Apache-2.0 oslotest>=1.10.0 # Apache-2.0
sphinxcontrib-httpdomain # BSD sphinxcontrib-httpdomain>=1.6.0 # BSD
sphinxcontrib-pecanwsme>=0.8 # Apache-2.0 sphinxcontrib-pecanwsme>=0.8 # Apache-2.0
reno>=1.8.0 # Apache2 reno>=1.8.0 # Apache-2.0