Uplift Promenade version in Pegleg requirements

Gates are currently failing due to some python requirement conflicts
in Deckhand and Promenade.  Promenade was updated in [0] to address
these.  Uplifting Pegleg's version of Promenade to resolve gate
errors.

Additional minor fixes:
- Some formatting addressed in Pipfile to remove duplicated entries
  ex: oslo.utils and oslo-utils
- Update the commits of Deckhand Promenade and Shipyard used in
  building the Docker image

[0] https://review.opendev.org/#/c/734122/

Change-Id: I370e89f9bdd23eaf2ecddec25ace5cc82f2046d7
Signed-off-by: Alexander Hughes <Alexander.Hughes@pm.me>
This commit is contained in:
Alexander Hughes 2020-06-09 12:54:09 -04:00
parent 6dbaa4e6e0
commit c8c419bf90
4 changed files with 1074 additions and 192 deletions

View File

@ -27,9 +27,9 @@ docker = ">=3.7.2"
PyYAML = "~=5.1"
deckhand = {git = "https://opendev.org/airship/deckhand.git",ref = "e7ba6828a0a1ca27fae596f6e0ee5a857f28001d"}
shipyard-client = {git = "https://opendev.org/airship/shipyard.git",ref = "70410cc478e6aec4abad88c84d68684edfedb376",subdirectory = "src/bin/shipyard_client"}
promenade = {git = "https://opendev.org/airship/promenade.git",ref = "b65930f205b77f28507dee9296aead00e24f2a18"}
promenade = {git = "https://opendev.org/airship/promenade.git",ref = "b1f00852e3630612cd9279a1ff84fe9b4edda830"}
"oslo.i18n" = "~=3.24.0"
oslo-utils = "~=3.41.0"
"oslo.utils" = "~=3.40.2"
six = "~=1.11.0"
debtcollector = "~=1.22.0"
zipp = "~=1.2.0"

1133
Pipfile.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -1,36 +1,125 @@
-i https://pypi.org/simple
alembic==1.0.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
amqp==2.6.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
argparse==1.4.0
asn1crypto==1.3.0
babel==2.8.0
certifi==2019.11.28
babel==2.8.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
beaker==1.10.0
cachetools==4.1.0; python_version ~= '3.5'
certifi==2020.4.5.2
cffi==1.14.0
chardet==3.0.4
click==7.1.1
click==6.7
cliff==3.1.0; python_version >= '3.5'
cmd2==0.8.9
cryptography==2.3.1
debtcollector==1.22.0
docker==4.2.0
decorator==4.4.2
deepdiff==3.3.0
dnspython==1.16.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
docker-pycreds==0.4.0
docker==3.7.2
dogpile.cache==0.9.2
eventlet==0.25.2
extras==1.0.0
falcon==1.4.1
fasteners==0.15
fixtures==3.0.0
flake8==2.6.2
futurist==2.2.0; python_version >= '3.6'
git+https://opendev.org/airship/deckhand.git@e7ba6828a0a1ca27fae596f6e0ee5a857f28001d#egg=deckhand
git+https://opendev.org/airship/promenade.git@b65930f205b77f28507dee9296aead00e24f2a18#egg=promenade
git+https://opendev.org/airship/promenade.git@b1f00852e3630612cd9279a1ff84fe9b4edda830#egg=promenade
git+https://opendev.org/airship/shipyard.git@70410cc478e6aec4abad88c84d68684edfedb376#egg=shipyard-client&subdirectory=src/bin/shipyard_client
gitdb2==2.0.6
gitdb2==2.0.6; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
gitpython==2.1.15
idna==2.9
google-auth==1.16.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
greenlet==0.4.16
hacking==1.1.0
idna==2.8
importlib-metadata==1.6.1; python_version < '3.8'
ipaddress==1.0.23
iso8601==0.1.12
jinja2==2.10
jsonpath-ng==1.4.3
jsonpickle==1.4.1; python_version >= '2.7'
jsonschema==2.6.0
keystoneauth1==3.11.1
keystonemiddleware==5.3.0
kombu==4.6.10; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
kubernetes==3.0.0
linecache2==1.0.0
mako==1.1.3; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
markupsafe==1.1.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
mccabe==0.5.3
monotonic==1.5
msgpack==1.0.0
netaddr==0.7.19
netifaces==0.10.9
oslo-utils==3.41.5
networkx==2.2
os-service-types==1.7.0
oslo.cache==1.31.1
oslo.concurrency==3.28.1
oslo.config==6.6.2
oslo.context==2.21.0
oslo.db==4.41.1
oslo.i18n==3.24.0
pbr==5.4.4
pycparser==2.20
pyparsing==2.4.6
oslo.log==3.40.1
oslo.messaging==9.1.1
oslo.middleware==3.36.0
oslo.policy==1.40.1
oslo.serialization==2.28.1
oslo.service==2.2.0; python_version >= '3.6'
oslo.utils==3.40.2
paste==3.0.1
pastedeploy==1.5.2
pbr==5.1.0
ply==3.11
prettytable==0.7.2
psycopg2-binary==2.8.4; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
pyasn1-modules==0.2.8
pyasn1==0.4.8
pycadf==3.0.0; python_version >= '3.6'
pycodestyle==2.0.0
pycparser==2.20; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
pyflakes==1.2.3
pyinotify==0.9.6; sys_platform != 'win32' and sys_platform != 'darwin' and sys_platform != 'sunos5'
pyparsing==2.4.7; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'
pyperclip==1.8.0
python-barbicanclient==4.7.0
python-dateutil==2.7.5
pytz==2019.3
pyyaml==5.3
requests==2.23.0
python-editor==1.0.4
python-keystoneclient==3.18.0
python-memcached==1.59
python-mimeparse==1.6.0
pytz==2020.1
pyyaml==5.3.1
repoze.lru==0.7
requests==2.22.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
rfc3986==1.4.0
routes==2.4.1
rsa==4.0
six==1.11.0
smmap2==3.0.1
smmap==3.0.1
urllib3==1.25.8
websocket-client==0.57.0
smmap==3.0.4; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
sqlalchemy-migrate==0.13.0
sqlalchemy==1.3.17; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
sqlparse==0.3.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
statsd==3.3.0
stevedore==1.30.0
tempita==0.5.2
termcolor==1.1.0
testresources==2.0.1
testscenarios==0.5.0
testtools==2.4.0
traceback2==1.4.0
unittest2==1.1.0
urllib3==1.24.3; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' and python_version < '4'
uwsgi==2.0.17.1
vine==1.3.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
wcwidth==0.2.4; sys_platform != 'win32'
webob==1.8.6; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
websocket-client==0.40.0
werkzeug==0.16.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
wrapt==1.12.1
yappi==1.2.5
zipp==1.2.0

View File

@ -1,3 +1,3 @@
DECKHAND_VERSION=commit/51dcea4fa12b0bcce65c381c286e61378a0826e2
SHIPYARD_VERSION=commit/72ca47e5c9ae8b7b1dcccd7742be6499f0411650
PROMENADE_VERSION=commit/b65930f205b77f28507dee9296aead00e24f2a18
DECKHAND_VERSION=commit/e7ba6828a0a1ca27fae596f6e0ee5a857f28001d
SHIPYARD_VERSION=commit/70410cc478e6aec4abad88c84d68684edfedb376
PROMENADE_VERSION=commit/b1f00852e3630612cd9279a1ff84fe9b4edda830