Merge "Update requirements"
This commit is contained in:
Zuul
Gerrit Code Review
commit
c7d77eb73d
@ -9,45 +9,45 @@ Jinja2>=2.8,!=2.9.0,!=2.9.1,!=2.9.2,!=2.9.3,!=2.9.4 # BSD
|
||||
jsonschema>=2.6.0,<3.0.0 # MIT
|
||||
morph # GPLv3+
|
||||
netaddr>=0.7.18 # BSD
|
||||
oslo.config>=4.6.0 # Apache Software License
|
||||
oslo.config>=5.1.0 # Apache Software License
|
||||
oslo.db>=4.27.0 # Apache Software License
|
||||
oslo.log>=3.30.0 # Apache Software License
|
||||
oslo.utils>=3.28.0 # Apache Software License
|
||||
oslo.log>=3.36.0 # Apache Software License
|
||||
oslo.utils>=3.33.0 # Apache Software License
|
||||
paramiko>=2.0.0 # LGPL
|
||||
pbr>=2.0.0,!=2.1.0 # Apache Software License
|
||||
PrettyTable>=0.7.1,<0.8 # BSD
|
||||
pyOpenSSL>=16.2.0 # Apache License, Version 2.0
|
||||
PyYAML>=3.10 # MIT
|
||||
python-subunit>=0.0.18 # UNKNOWN
|
||||
python-subunit>=1.0.0 # UNKNOWN
|
||||
requests>=2.14.2 # Apache License, Version 2.0
|
||||
SQLAlchemy>=1.0.10,!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8 # MIT
|
||||
six>=1.9.0 # MIT
|
||||
virtualenv>=13.1.0 # MIT
|
||||
six>=1.10.0 # MIT
|
||||
virtualenv>=14.0.6 # MIT
|
||||
|
||||
# OpenStack related
|
||||
boto>=2.32.1 # MIT
|
||||
gnocchiclient>=3.3.1 # Apache Software License
|
||||
keystoneauth1>=3.2.0 # Apache Software License
|
||||
keystoneauth1>=3.3.0 # Apache Software License
|
||||
os-faults>=0.1.15 # Apache Software License
|
||||
osprofiler>=1.4.0 # Apache Software License
|
||||
python-ceilometerclient>=2.5.0 # Apache Software License
|
||||
python-cinderclient>=3.2.0 # Apache Software License
|
||||
python-cinderclient>=3.3.0 # Apache Software License
|
||||
python-designateclient>=2.7.0 # Apache License, Version 2.0
|
||||
python-heatclient>=1.10.0 # Apache Software License
|
||||
python-glanceclient>=2.8.0 # Apache License, Version 2.0
|
||||
python-ironicclient>=1.14.0 # Apache Software License
|
||||
python-ironicclient>=2.2.0 # Apache Software License
|
||||
python-keystoneclient>=3.8.0 # Apache Software License
|
||||
python-magnumclient>=2.0.0 # Apache Software License
|
||||
python-magnumclient>=2.1.0 # Apache Software License
|
||||
python-manilaclient>=1.16.0 # Apache Software License
|
||||
python-mistralclient>=3.1.0 # Apache Software License
|
||||
python-muranoclient>=0.8.2 # Apache License, Version 2.0
|
||||
python-monascaclient>=1.7.0 # Apache Software License
|
||||
python-neutronclient>=6.3.0 # Apache Software License
|
||||
python-novaclient>=9.1.0 # Apache License, Version 2.0
|
||||
python-saharaclient>=1.2.0 # Apache License, Version 2.0
|
||||
python-saharaclient>=1.4.0 # Apache License, Version 2.0
|
||||
python-senlinclient>=1.1.0 # Apache Software License
|
||||
python-swiftclient>=3.2.0 # Apache Software License
|
||||
python-troveclient>=2.2.0 # Apache Software License
|
||||
python-watcherclient>=1.1.0 # Apache Software License
|
||||
python-zaqarclient>=1.0.0 # Apache Software License
|
||||
kubernetes>=1.0.0,<4.0.0 # Apache License Version 2.0
|
||||
kubernetes>1.0.0,<4.0.0 # Apache License Version 2.0
|
||||
|
||||
@ -16,11 +16,11 @@ coverage>=4.0,!=4.4 # Apache License, Version
|
||||
ddt>=1.0.1 # UNKNOWN
|
||||
mock>=2.0.0 # UNKNOWN
|
||||
python-dateutil>=2.4.2 # Simplified BSD
|
||||
testtools>=1.4.0 # UNKNOWN
|
||||
testtools>=2.2.0 # UNKNOWN
|
||||
|
||||
sphinx>=1.6.2 # BSD
|
||||
sphinx>=1.6.2,!=1.6.6 # BSD
|
||||
oslosphinx>=4.7.0 # Apache Software License
|
||||
oslotest>=1.10.0 # Apache Software License
|
||||
oslotest>=3.2.0 # Apache Software License
|
||||
|
||||
testresources>=2.0.0 # UNKNOWN
|
||||
testscenarios>=0.4 # UNKNOWN
|
||||
|
||||
@ -350,24 +350,24 @@ def update_upper_constraints():
|
||||
# NOTE(andreykurilin): global OpenStack upper-constraints file includes
|
||||
# comments which can be unrelated to Rally project, so let's just ignore
|
||||
# them.
|
||||
global_uc = parse_data(raw_g_uc, include_comments=False,
|
||||
global_uc = parse_data(raw_g_uc,
|
||||
include_comments=False,
|
||||
dependency_cls=UpperConstraint)
|
||||
with open("upper-constraints.txt") as f:
|
||||
our_uc = parse_data(f.read(), dependency_cls=UpperConstraint)
|
||||
our_uc = parse_data(f.read(),
|
||||
dependency_cls=UpperConstraint)
|
||||
with open("requirements.txt") as f:
|
||||
our_requirements = parse_data(f.read(), include_comments=False)
|
||||
|
||||
for name, req in our_requirements.items():
|
||||
if isinstance(req, Comment):
|
||||
print("continue")
|
||||
continue
|
||||
print(req)
|
||||
if name not in our_uc:
|
||||
our_uc[name] = UpperConstraint(name)
|
||||
|
||||
if name in global_uc:
|
||||
# we cannot use whatever we want versions in CI. OpenStack CI
|
||||
# installs ignores versions listed in requirements of
|
||||
# ignores versions listed in requirements of
|
||||
# particular project and use versions from global u-c file.
|
||||
# It means that we need to suggest to use the same versions
|
||||
our_uc[name].update(global_uc[name].version)
|
||||
|
||||
@ -1,50 +1,50 @@
|
||||
alembic===0.9.6
|
||||
alembic===0.9.7
|
||||
boto===2.48.0
|
||||
decorator===4.1.2
|
||||
gnocchiclient===4.0.0
|
||||
Jinja2===2.9.6
|
||||
decorator===4.2.1
|
||||
gnocchiclient===7.0.1
|
||||
Jinja2===2.10
|
||||
jsonschema===2.6.0
|
||||
keystoneauth1===3.2.0
|
||||
kubernetes===2.0.0
|
||||
keystoneauth1===3.4.0
|
||||
kubernetes===3.0.0
|
||||
morph===0.1.2
|
||||
netaddr===0.7.19
|
||||
os-faults===0.1.17
|
||||
oslo.config===5.0.0
|
||||
oslo.db===4.29.0
|
||||
oslo.log===3.32.0
|
||||
oslo.utils===3.30.0
|
||||
osprofiler===1.13.0
|
||||
paramiko===2.3.1
|
||||
oslo.config===5.2.0
|
||||
oslo.db===4.33.0
|
||||
oslo.log===3.36.0
|
||||
oslo.utils===3.35.0
|
||||
osprofiler===1.15.1
|
||||
paramiko===2.4.0
|
||||
pbr===3.1.1
|
||||
PrettyTable===0.7
|
||||
pyOpenSSL===17.5.0
|
||||
python-ceilometerclient===2.9.0
|
||||
python-cinderclient===3.2.0
|
||||
python-designateclient===2.7.0
|
||||
python-glanceclient===2.8.0
|
||||
python-heatclient===1.12.0
|
||||
python-ironicclient===1.17.1
|
||||
python-keystoneclient===3.13.0
|
||||
python-magnumclient===2.7.0
|
||||
python-manilaclient===1.17.2
|
||||
python-mistralclient===3.1.3
|
||||
python-monascaclient===1.8.0
|
||||
python-muranoclient===0.14.0
|
||||
python-neutronclient===6.5.0
|
||||
python-cinderclient===3.5.0
|
||||
python-designateclient===2.9.0
|
||||
python-glanceclient===2.9.1
|
||||
python-heatclient===1.14.0
|
||||
python-ironicclient===2.2.0
|
||||
python-keystoneclient===3.15.0
|
||||
python-magnumclient===2.8.0
|
||||
python-manilaclient===1.21.0
|
||||
python-mistralclient===3.2.0
|
||||
python-monascaclient===1.10.0
|
||||
python-muranoclient===1.0.1
|
||||
python-neutronclient===6.7.0
|
||||
python-novaclient===9.1.1
|
||||
python-saharaclient===1.3.0
|
||||
python-senlinclient===1.4.0
|
||||
python-saharaclient===1.5.0
|
||||
python-senlinclient===1.7.0
|
||||
python-subunit===1.2.0
|
||||
python-swiftclient===3.4.0
|
||||
python-troveclient===2.12.0
|
||||
python-watcherclient===1.4.0
|
||||
python-zaqarclient===1.7.0
|
||||
python-swiftclient===3.5.0
|
||||
python-troveclient===2.14.0
|
||||
python-watcherclient===1.6.0
|
||||
python-zaqarclient===1.9.0
|
||||
PyYAML===3.12
|
||||
requests===2.18.4
|
||||
six===1.11.0
|
||||
SQLAlchemy===1.1.14
|
||||
SQLAlchemy===1.2.1
|
||||
virtualenv===15.1.0
|
||||
|
||||
|
||||
# testing
|
||||
|
||||
pytest===3.3.0
|
||||
@ -53,3 +53,93 @@ pytest-forked===0.2
|
||||
pytest-html===1.16.0
|
||||
pytest-metadata===1.5.1
|
||||
pytest-xdist===1.20.1
|
||||
|
||||
# not direct dependencies
|
||||
|
||||
ansible===2.4.3.0
|
||||
appdirs===1.4.3
|
||||
asn1crypto===0.24.0
|
||||
Babel===2.5.3
|
||||
bcrypt===3.1.4
|
||||
certifi===2018.1.18
|
||||
cffi===1.11.4
|
||||
chardet===3.0.4
|
||||
click===6.7
|
||||
cliff===2.11.0
|
||||
cmd2===0.8.0
|
||||
contextlib2===0.5.5
|
||||
cryptography===2.1.4
|
||||
debtcollector===1.19.0
|
||||
deprecation===1.1
|
||||
dogpile.cache===0.6.4
|
||||
enum34===1.1.6
|
||||
extras===1.0.0
|
||||
fasteners===0.14.1
|
||||
fixtures===3.0.0
|
||||
funcsigs===1.0.2
|
||||
functools32===3.2.3.post2
|
||||
futures===3.2.0
|
||||
futurist===1.6.0
|
||||
httplib2===0.10.3
|
||||
idna===2.6
|
||||
ipaddress===1.0.19
|
||||
iso8601===0.1.12
|
||||
jmespath===0.9.3
|
||||
jsonpatch===1.21
|
||||
jsonpointer===2.0
|
||||
linecache2===1.0.0
|
||||
Mako===1.0.7
|
||||
MarkupSafe===1.0
|
||||
monotonic===1.4
|
||||
msgpack===0.5.4
|
||||
munch===2.2.0
|
||||
murano-pkg-check===0.3.0
|
||||
netifaces===0.10.6
|
||||
oauth2client===4.1.2
|
||||
openstacksdk===0.11.3
|
||||
os-client-config===1.29.0
|
||||
os-service-types===1.1.0
|
||||
osc-lib===1.9.0
|
||||
oslo.concurrency===3.25.0
|
||||
oslo.context===2.20.0
|
||||
oslo.i18n===3.19.0
|
||||
oslo.serialization===2.24.0
|
||||
packaging===16.8
|
||||
ply===3.10
|
||||
positional===1.2.1
|
||||
prettytable===0.7
|
||||
pyasn1===0.4.2
|
||||
pyasn1-modules===0.2.1
|
||||
pycparser===2.18
|
||||
pycrypto===2.6.1
|
||||
pyghmi===1.0.38
|
||||
pyinotify===0.9.6
|
||||
PyNaCl===1.2.1
|
||||
pyparsing===2.2.0
|
||||
pyperclip===1.6.0
|
||||
python-dateutil===2.6.1
|
||||
python-editor===1.0.3
|
||||
python-mimeparse===1.6.0
|
||||
python-openstackclient===3.14.0
|
||||
pytz===2018.3
|
||||
requestsexceptions===1.4.0
|
||||
rfc3986===1.1.0
|
||||
rsa===3.4.2
|
||||
semantic-version===2.6.0
|
||||
simplejson===3.13.2
|
||||
sqlalchemy-migrate===0.11.0
|
||||
sqlparse===0.2.4
|
||||
stevedore===1.28.0
|
||||
subprocess32===3.2.7
|
||||
Tempita===0.5.2
|
||||
testtools===2.3.0
|
||||
traceback2===1.4.0
|
||||
ujson===1.35
|
||||
unicodecsv===0.14.1
|
||||
unittest2===1.1.0
|
||||
urllib3===1.22
|
||||
warlock===1.2.0
|
||||
WebOb===1.7.4
|
||||
websocket-client===0.46.0
|
||||
wrapt===1.10.11
|
||||
yaql===1.1.3
|
||||
|
||||
Loading…
Reference in New Issue
Block a user