Fix requirements and lower constraints
We were using the lower-constraints.txt file from nova, but this was masking problems. The check job doesn't seem to work properly when the lower-constraints.txt file is in a different project, not running at least some of its tests. This was seen when copying the same file into nova-powervm cause the job to start complaining. This copies nova's lower-constraints.txt file into nova-powervm and then addresses the aforementioned issues by: 1) removing amqp from requirements.txt. We do not appear to really require this. 2) adding bashate to lower-constraints.txt. Nova does not require this but we do. 3) adding python-swiftclient to lower-constraints.txt. Nova does not require this but we do. Also moved python-swiftclient from test-requirements.txt to requirements.txt since our usage is not limited to tests. 4) removing python-subunit from test-requirements.txt. We do not appear to really require this. Change-Id: I100181821ed4ffe622ed5ebeff403093e9cc32b8
This commit is contained in:
parent
4db7cda136
commit
4134cec6f6
|
@ -0,0 +1,174 @@
|
||||||
|
alembic==0.9.8
|
||||||
|
amqp==2.2.2
|
||||||
|
appdirs==1.4.3
|
||||||
|
asn1crypto==0.24.0
|
||||||
|
attrs==17.4.0
|
||||||
|
automaton==1.14.0
|
||||||
|
Babel==2.3.4
|
||||||
|
bashate==0.5.1
|
||||||
|
enum34==1.0.4
|
||||||
|
bandit==1.1.0
|
||||||
|
bcrypt==3.1.4
|
||||||
|
cachetools==2.0.1
|
||||||
|
castellan==0.16.0
|
||||||
|
certifi==2018.1.18
|
||||||
|
cffi==1.11.5
|
||||||
|
chardet==3.0.4
|
||||||
|
cliff==2.11.0
|
||||||
|
cmd2==0.8.1
|
||||||
|
colorama==0.3.9
|
||||||
|
contextlib2==0.5.5
|
||||||
|
coverage==4.0
|
||||||
|
cryptography==2.1
|
||||||
|
cursive==0.2.1
|
||||||
|
ddt==1.0.1
|
||||||
|
debtcollector==1.19.0
|
||||||
|
decorator==3.4.0
|
||||||
|
deprecation==2.0
|
||||||
|
dogpile.cache==0.6.5
|
||||||
|
enum-compat==0.0.2
|
||||||
|
eventlet==0.18.2
|
||||||
|
extras==1.0.0
|
||||||
|
fasteners==0.14.1
|
||||||
|
fixtures==3.0.0
|
||||||
|
flake8==2.5.5
|
||||||
|
future==0.16.0
|
||||||
|
futurist==1.6.0
|
||||||
|
gabbi==1.35.0
|
||||||
|
gitdb2==2.0.3
|
||||||
|
GitPython==2.1.8
|
||||||
|
greenlet==0.4.10
|
||||||
|
hacking==0.12.0
|
||||||
|
idna==2.6
|
||||||
|
iso8601==0.1.11
|
||||||
|
Jinja2==2.10
|
||||||
|
jmespath==0.9.3
|
||||||
|
jsonpatch==1.21
|
||||||
|
jsonpath-rw-ext==1.1.3
|
||||||
|
jsonpath-rw==1.4.0
|
||||||
|
jsonpointer==2.0
|
||||||
|
jsonschema==2.6.0
|
||||||
|
keystoneauth1==3.9.0
|
||||||
|
keystonemiddleware==4.17.0
|
||||||
|
kombu==4.1.0
|
||||||
|
linecache2==1.0.0
|
||||||
|
lxml==3.4.1
|
||||||
|
Mako==1.0.7
|
||||||
|
MarkupSafe==1.0
|
||||||
|
mccabe==0.2.1
|
||||||
|
microversion-parse==0.2.1
|
||||||
|
mock==2.0.0
|
||||||
|
monotonic==1.4
|
||||||
|
mox3==0.20.0
|
||||||
|
msgpack==0.5.6
|
||||||
|
munch==2.2.0
|
||||||
|
netaddr==0.7.18
|
||||||
|
netifaces==0.10.4
|
||||||
|
networkx==1.11
|
||||||
|
numpy==1.14.2
|
||||||
|
openstacksdk==0.12.0
|
||||||
|
os-brick==2.5.0
|
||||||
|
os-client-config==1.29.0
|
||||||
|
os-service-types==1.2.0
|
||||||
|
os-traits==0.4.0
|
||||||
|
os-vif==1.7.0
|
||||||
|
os-win==3.0.0
|
||||||
|
os-xenapi==0.3.3
|
||||||
|
osc-lib==1.10.0
|
||||||
|
oslo.cache==1.26.0
|
||||||
|
oslo.concurrency==3.26.0
|
||||||
|
oslo.config==5.2.0
|
||||||
|
oslo.context==2.19.2
|
||||||
|
oslo.db==4.27.0
|
||||||
|
oslo.i18n==3.15.3
|
||||||
|
oslo.log==3.36.0
|
||||||
|
oslo.messaging==6.3.0
|
||||||
|
oslo.middleware==3.31.0
|
||||||
|
oslo.policy==1.35.0
|
||||||
|
oslo.privsep==1.23.0
|
||||||
|
oslo.reports==1.18.0
|
||||||
|
oslo.rootwrap==5.8.0
|
||||||
|
oslo.serialization==2.18.0
|
||||||
|
oslo.service==1.24.0
|
||||||
|
oslo.utils==3.33.0
|
||||||
|
oslo.versionedobjects==1.31.2
|
||||||
|
oslo.vmware==2.17.0
|
||||||
|
oslotest==3.2.0
|
||||||
|
osprofiler==1.4.0
|
||||||
|
packaging==17.1
|
||||||
|
paramiko==2.0.0
|
||||||
|
Paste==2.0.2
|
||||||
|
PasteDeploy==1.5.0
|
||||||
|
pbr==2.0.0
|
||||||
|
pep8==1.5.7
|
||||||
|
pika-pool==0.1.3
|
||||||
|
pika==0.10.0
|
||||||
|
pluggy==0.6.0
|
||||||
|
ply==3.11
|
||||||
|
prettytable==0.7.1
|
||||||
|
psutil==3.2.2
|
||||||
|
psycopg2==2.6.2
|
||||||
|
py==1.5.2
|
||||||
|
pyasn1-modules==0.2.1
|
||||||
|
pyasn1==0.4.2
|
||||||
|
pycadf==2.7.0
|
||||||
|
pycparser==2.18
|
||||||
|
pyflakes==0.8.1
|
||||||
|
pyinotify==0.9.6
|
||||||
|
PyMySQL==0.7.6
|
||||||
|
PyNaCl==1.2.1
|
||||||
|
pyOpenSSL==17.5.0
|
||||||
|
pyparsing==2.2.0
|
||||||
|
pyperclip==1.6.0
|
||||||
|
pypowervm==1.1.15
|
||||||
|
pyroute2==0.4.21
|
||||||
|
pytest==3.4.2
|
||||||
|
python-barbicanclient==4.5.2
|
||||||
|
python-cinderclient==3.3.0
|
||||||
|
python-dateutil==2.5.3
|
||||||
|
python-editor==1.0.3
|
||||||
|
python-glanceclient==2.8.0
|
||||||
|
python-ironicclient==2.3.0
|
||||||
|
python-keystoneclient==3.15.0
|
||||||
|
python-mimeparse==1.6.0
|
||||||
|
python-neutronclient==6.7.0
|
||||||
|
python-subunit==1.2.0
|
||||||
|
python-swiftclient==3.2.0
|
||||||
|
pytz==2018.3
|
||||||
|
PyYAML==3.12
|
||||||
|
repoze.lru==0.7
|
||||||
|
requests-mock==1.2.0
|
||||||
|
requests==2.14.2
|
||||||
|
requestsexceptions==1.4.0
|
||||||
|
retrying==1.3.3
|
||||||
|
rfc3986==0.3.1
|
||||||
|
Routes==2.3.1
|
||||||
|
simplejson==3.13.2
|
||||||
|
six==1.10.0
|
||||||
|
smmap2==2.0.3
|
||||||
|
sqlalchemy-migrate==0.11.0
|
||||||
|
SQLAlchemy==1.0.10
|
||||||
|
sqlparse==0.2.4
|
||||||
|
statsd==3.2.2
|
||||||
|
stestr==1.0.0
|
||||||
|
stevedore==1.20.0
|
||||||
|
setuptools==21.0.0
|
||||||
|
suds-jurko==0.6
|
||||||
|
taskflow==2.16.0
|
||||||
|
Tempita==0.5.2
|
||||||
|
tenacity==4.9.0
|
||||||
|
testrepository==0.0.20
|
||||||
|
testresources==2.0.0
|
||||||
|
testscenarios==0.4
|
||||||
|
testtools==2.2.0
|
||||||
|
tooz==1.58.0
|
||||||
|
traceback2==1.4.0
|
||||||
|
unittest2==1.1.0
|
||||||
|
urllib3==1.22
|
||||||
|
vine==1.1.4
|
||||||
|
voluptuous==0.11.1
|
||||||
|
warlock==1.3.0
|
||||||
|
WebOb==1.8.2
|
||||||
|
websockify==0.8.0
|
||||||
|
wrapt==1.10.11
|
||||||
|
wsgi-intercept==1.7.0
|
|
@ -1,7 +1,6 @@
|
||||||
# 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.
|
||||||
amqp!=2.1.4,>=2.1.1 # BSD
|
|
||||||
pbr!=2.1.0,>=2.0.0 # Apache-2.0
|
pbr!=2.1.0,>=2.0.0 # Apache-2.0
|
||||||
Babel!=2.4.0,>=2.3.4 # BSD
|
Babel!=2.4.0,>=2.3.4 # BSD
|
||||||
six>=1.10.0 # MIT
|
six>=1.10.0 # MIT
|
||||||
|
@ -10,5 +9,6 @@ oslo.log>=3.36.0 # Apache-2.0
|
||||||
oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
|
oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
|
||||||
oslo.utils>=3.33.0 # Apache-2.0
|
oslo.utils>=3.33.0 # Apache-2.0
|
||||||
pypowervm>=1.1.15 # Apache-2.0
|
pypowervm>=1.1.15 # Apache-2.0
|
||||||
|
python-swiftclient>=3.2.0 # Apache-2.0
|
||||||
taskflow>=2.16.0 # Apache-2.0
|
taskflow>=2.16.0 # Apache-2.0
|
||||||
setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,!=36.2.0,>=21.0.0 # PSF/ZPL
|
setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,!=36.2.0,>=21.0.0 # PSF/ZPL
|
||||||
|
|
|
@ -5,8 +5,6 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
|
||||||
bashate>=0.5.1 # Apache-2.0
|
bashate>=0.5.1 # Apache-2.0
|
||||||
coverage!=4.4,>=4.0 # Apache-2.0
|
coverage!=4.4,>=4.0 # Apache-2.0
|
||||||
fixtures>=3.0.0 # Apache-2.0/BSD
|
fixtures>=3.0.0 # Apache-2.0/BSD
|
||||||
python-subunit>=1.0.0 # Apache-2.0/BSD
|
|
||||||
python-swiftclient>=3.2.0 # Apache-2.0
|
|
||||||
oslotest>=3.2.0 # Apache-2.0
|
oslotest>=3.2.0 # Apache-2.0
|
||||||
stestr>=1.0.0 # Apache-2.0
|
stestr>=1.0.0 # Apache-2.0
|
||||||
testscenarios>=0.4 # Apache-2.0/BSD
|
testscenarios>=0.4 # Apache-2.0/BSD
|
||||||
|
|
3
tox.ini
3
tox.ini
|
@ -89,8 +89,7 @@ local-check-factory = nova_powervm.hacking.checks.factory
|
||||||
[testenv:lower-constraints]
|
[testenv:lower-constraints]
|
||||||
basepython = python3
|
basepython = python3
|
||||||
deps =
|
deps =
|
||||||
# We just use nova's lower-constraints.
|
-c{toxinidir}/lower-constraints.txt
|
||||||
-chttps://git.openstack.org/cgit/openstack/nova/plain/lower-constraints.txt
|
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
-r{toxinidir}/requirements.txt
|
-r{toxinidir}/requirements.txt
|
||||||
-egit+https://git.openstack.org/openstack/nova#egg=nova
|
-egit+https://git.openstack.org/openstack/nova#egg=nova
|
||||||
|
|
Loading…
Reference in New Issue