airship
/
pegleg
Code Issues Proposed changes

Update pip package versions in preparation of pip 20.3 

When pip is upgraded to 20.3, the pip dependency resolver is much more
strict and will no longer install a combination of packages that is mutually
inconsistent[0].

These changes account for the fact that Pegleg imports Shipyard, Promenade,
and Deckhand. Having said that, with pip 20.3, the pip packages amongst
those projects cannot conflict. A follow-up change may be needed if more
conflicts are found.

[0] https://pip.pypa.io/en/latest/user_guide/#changes-to-the-pip-dependency-resolver-in-20-2-2020

Change-Id: Iedf7227c468d678430a5525a2d71d22ce210c557
This commit is contained in:
Rick Bartra 2020-10-15 18:21:11 -04:00
parent 2600b16694
commit 0b2ac8f953
4 changed files with 449 additions and 370 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Pipfile
View File

@ -19,19 +19,19 @@ bandit = ">=1.6.0"
[packages] [packages]
click = ">=6.7" click = ">=6.7"
jsonschema = "~=2.6.0" jsonschema = ">=3.0.1<4"
cryptography = "~=2.3.1" cryptography = ">=2.7"
python-dateutil = "~=2.7.3" python-dateutil = ">=2.8.1"
GitPython = "~=2.1.11" GitPython = "~=2.1.11"
docker = ">=3.7.2" docker = ">=3.7.2"
pylibyaml = "~=0.1" pylibyaml = "~=0.1"
PyYAML = "~=5.1" PyYAML = "~=5.1"
deckhand = {git = "https://opendev.org/airship/deckhand.git",ref = "e7ba6828a0a1ca27fae596f6e0ee5a857f28001d"} deckhand = {git = "https://opendev.org/airship/deckhand.git",ref = "1f0c011a1708c1235a2be65edada7d386cd55d2a"}
shipyard-client = {git = "https://opendev.org/airship/shipyard.git",ref = "70410cc478e6aec4abad88c84d68684edfedb376",subdirectory = "src/bin/shipyard_client"} shipyard-client = {git = "https://opendev.org/airship/shipyard.git",ref = "35e5a7f796a5341e02fb0d3f2d27b41e2fb39131",subdirectory = "src/bin/shipyard_client"}
promenade = {git = "https://opendev.org/airship/promenade.git",ref = "d603386d491e1df52f9d1ee05d60e4263692b9b3"} promenade = {git = "https://opendev.org/airship/promenade.git",ref = "eb748a75f3b4e183c106acc429778676c3e06f51"}
"oslo.i18n" = "~=3.24.0" "oslo.i18n" = "~=3.24.0"
"oslo.utils" = "~=3.40.2" "oslo.utils" = ">=3.42.1"
six = "~=1.11.0" six = ">=1.15.0"
debtcollector = "~=1.22.0" debtcollector = "~=1.22.0"
zipp = "~=1.2.0" zipp = "~=1.2.0"

746
Pipfile.lock generated
View File

File diff suppressed because it is too large Load Diff

51
requirements.txt
View File

@ -12,7 +12,7 @@ chardet==3.0.4
click==6.7 click==6.7
cliff==3.1.0; python_version >= '3.5' cliff==3.1.0; python_version >= '3.5'
cmd2==0.8.9 cmd2==0.8.9
cryptography==2.3.1 cryptography>=2.7
debtcollector==1.22.0 debtcollector==1.22.0
decorator==4.4.2 decorator==4.4.2
deepdiff==3.3.0 deepdiff==3.3.0
@ -25,16 +25,17 @@ extras==1.0.0
falcon==1.4.1 falcon==1.4.1
fasteners==0.15 fasteners==0.15
fixtures==3.0.0 fixtures==3.0.0
flake8==2.6.2 flake8==3.7.9
futurist==2.2.0; python_version >= '3.6' futurist==2.2.0; python_version >= '3.6'
git+https://opendev.org/airship/deckhand.git@e7ba6828a0a1ca27fae596f6e0ee5a857f28001d#egg=deckhand git+https://opendev.org/airship/deckhand.git@1f0c011a1708c1235a2be65edada7d386cd55d2a#egg=deckhand
git+https://opendev.org/airship/promenade.git@d603386d491e1df52f9d1ee05d60e4263692b9b3 git+https://opendev.org/airship/promenade.git@eb748a75f3b4e183c106acc429778676c3e06f51
git+https://opendev.org/airship/shipyard.git@70410cc478e6aec4abad88c84d68684edfedb376#egg=shipyard-client&subdirectory=src/bin/shipyard_client git+https://opendev.org/airship/shipyard.git@35e5a7f796a5341e02fb0d3f2d27b41e2fb39131#egg=shipyard-client&subdirectory=src/bin/shipyard_client
gitdb2==2.0.6; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' 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 gitpython==2.1.15
setuptools==40.4.3
google-auth==1.16.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' 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 greenlet==0.4.16
hacking==1.1.0 hacking>=3.0.1,<3.1.0
idna==2.8 idna==2.8
importlib-metadata==1.6.1; python_version < '3.8' importlib-metadata==1.6.1; python_version < '3.8'
ipaddress==1.0.23 ipaddress==1.0.23
@ -42,64 +43,64 @@ iso8601==0.1.12
jinja2==2.10 jinja2==2.10
jsonpath-ng==1.4.3 jsonpath-ng==1.4.3
jsonpickle==1.4.1; python_version >= '2.7' jsonpickle==1.4.1; python_version >= '2.7'
jsonschema==2.6.0 jsonschema>=3.0.1<4
keystoneauth1==3.11.1 keystoneauth1>=3.18.0
keystonemiddleware==5.3.0 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' 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 kubernetes==11.0.0
linecache2==1.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' 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' 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 mccabe==0.6.1
monotonic==1.5 monotonic==1.5
msgpack==1.0.0 msgpack==1.0.0
netaddr==0.7.19 netaddr==0.7.19
netifaces==0.10.9 netifaces==0.10.9
networkx==2.2 networkx==2.2
os-service-types==1.7.0 os-service-types==1.7.0
oslo.cache==1.31.1 oslo.cache==1.38.1
oslo.concurrency==3.28.1 oslo.concurrency==3.28.1
oslo.config==6.6.2 oslo.config==7.0.0
oslo.context==2.21.0 oslo.context==2.21.0
oslo.db==4.41.1 oslo.db==4.41.1
oslo.i18n==3.24.0 oslo.i18n==3.24.0
oslo.log==3.40.1 oslo.log==3.45.2
oslo.messaging==9.1.1 oslo.messaging==9.1.1
oslo.middleware==3.36.0 oslo.middleware==3.36.0
oslo.policy==1.40.1 oslo.policy==1.40.1
oslo.serialization==2.28.1 oslo.serialization==2.29.2
oslo.service==2.2.0; python_version >= '3.6' oslo.service==2.2.0; python_version >= '3.6'
oslo.utils==3.40.2 oslo.utils==3.42.1
paste==3.0.1 paste==3.0.1
pastedeploy==1.5.2 pastedeploy==1.5.2
pbr==5.1.0 pbr==5.4.5
ply==3.11 ply==3.11
prettytable==0.7.2 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' 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-modules==0.2.8
pyasn1==0.4.8 pyasn1==0.4.8
pycadf==3.0.0; python_version >= '3.6' pycadf==3.0.0; python_version >= '3.6'
pycodestyle==2.0.0 pycodestyle==2.5.0
pycparser==2.20; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' pycparser==2.20; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
pyflakes==1.2.3 pyflakes==2.1.0
pyinotify==0.9.6; sys_platform != 'win32' and sys_platform != 'darwin' and sys_platform != 'sunos5' pyinotify==0.9.6; sys_platform != 'win32' and sys_platform != 'darwin' and sys_platform != 'sunos5'
pylibyaml==0.1.0 pylibyaml==0.1.0
pyparsing==2.4.7; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3' 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 pyperclip==1.8.0
python-barbicanclient==4.7.0 python-barbicanclient==4.7.0
python-dateutil==2.7.5 python-dateutil>=2.8.1
python-editor==1.0.4 python-editor==1.0.4
python-keystoneclient==3.18.0 python-keystoneclient==3.22.0
python-memcached==1.59 python-memcached==1.59
python-mimeparse==1.6.0 python-mimeparse==1.6.0
pytz==2020.1 pytz==2020.1
pyyaml==5.3.1 pyyaml==5.1
repoze.lru==0.7 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' 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 rfc3986==1.4.0
routes==2.4.1 routes==2.4.1
rsa==4.0 rsa==4.0
six==1.11.0 six>=1.15.0
smmap2==3.0.1 smmap2==3.0.1
smmap==3.0.4; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' 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-migrate==0.13.0
@ -114,12 +115,12 @@ testscenarios==0.5.0
testtools==2.4.0 testtools==2.4.0
traceback2==1.4.0 traceback2==1.4.0
unittest2==1.1.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' urllib3==1.25.9; 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 uwsgi~=2.0.19.1
vine==1.3.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' 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' 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' 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 websocket-client==0.57.0
werkzeug==0.16.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' 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 wrapt==1.12.1
yappi==1.2.5 yappi==1.2.5

6
vcs-requirements.env
View File

@ -1,3 +1,3 @@
DECKHAND_VERSION=commit/e7ba6828a0a1ca27fae596f6e0ee5a857f28001d DECKHAND_VERSION=commit/1f0c011a1708c1235a2be65edada7d386cd55d2a
SHIPYARD_VERSION=commit/70410cc478e6aec4abad88c84d68684edfedb376 SHIPYARD_VERSION=commit/35e5a7f796a5341e02fb0d3f2d27b41e2fb39131
PROMENADE_VERSION=commit/d603386d491e1df52f9d1ee05d60e4263692b9b3 PROMENADE_VERSION=commit/eb748a75f3b4e183c106acc429778676c3e06f51