Uplift promenade
Also fix a python dependency failure [0]. [0]: https://review.opendev.org/c/skyline/skyline-apiserver/+/808195 Depends-On: https://review.opendev.org/c/airship/promenade/+/812039 Change-Id: I5aa508bce18de011956ef1b649c2ed17e376be68
This commit is contained in:
parent
b2b780a4c0
commit
4cd2ee6dab
2
Pipfile
2
Pipfile
@ -28,7 +28,7 @@ pylibyaml = "~=0.1"
|
|||||||
PyYAML = "~=5.1"
|
PyYAML = "~=5.1"
|
||||||
deckhand = {git = "https://opendev.org/airship/deckhand.git",ref = "d7d3cbde2bd44eed0d574ec439d1f8194dbcf782"}
|
deckhand = {git = "https://opendev.org/airship/deckhand.git",ref = "d7d3cbde2bd44eed0d574ec439d1f8194dbcf782"}
|
||||||
shipyard-client = {git = "https://opendev.org/airship/shipyard.git",ref = "35e5a7f796a5341e02fb0d3f2d27b41e2fb39131",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 = "bc14e9bbb9857becedd7ce9d6b81d74de77b497b"}
|
promenade = {git = "https://opendev.org/airship/promenade.git",ref = "53d0ecb7f959050ebb75ab7420ca5bc07428aacb"}
|
||||||
"oslo.i18n" = "~=3.24.0"
|
"oslo.i18n" = "~=3.24.0"
|
||||||
"oslo.utils" = ">=3.42.1"
|
"oslo.utils" = ">=3.42.1"
|
||||||
six = ">=1.15.0"
|
six = ">=1.15.0"
|
||||||
|
2
Pipfile.lock
generated
2
Pipfile.lock
generated
@ -722,7 +722,7 @@
|
|||||||
},
|
},
|
||||||
"promenade": {
|
"promenade": {
|
||||||
"git": "https://opendev.org/airship/promenade.git",
|
"git": "https://opendev.org/airship/promenade.git",
|
||||||
"ref": "bc14e9bbb9857becedd7ce9d6b81d74de77b497b"
|
"ref": "53d0ecb7f959050ebb75ab7420ca5bc07428aacb"
|
||||||
},
|
},
|
||||||
"psycopg2-binary": {
|
"psycopg2-binary": {
|
||||||
"hashes": [
|
"hashes": [
|
||||||
|
@ -28,7 +28,7 @@ fixtures==3.0.0
|
|||||||
flake8==3.7.9
|
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@d7d3cbde2bd44eed0d574ec439d1f8194dbcf782#egg=deckhand
|
git+https://opendev.org/airship/deckhand.git@d7d3cbde2bd44eed0d574ec439d1f8194dbcf782#egg=deckhand
|
||||||
git+https://opendev.org/airship/promenade.git@bc14e9bbb9857becedd7ce9d6b81d74de77b497b#egg=promenade
|
git+https://opendev.org/airship/promenade.git@53d0ecb7f959050ebb75ab7420ca5bc07428aacb#egg=promenade
|
||||||
git+https://opendev.org/airship/shipyard.git@35e5a7f796a5341e02fb0d3f2d27b41e2fb39131#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
|
||||||
|
9
tox.ini
9
tox.ini
@ -13,6 +13,7 @@ setenv =
|
|||||||
PIPENV_IGNORE_PIPFILE=1
|
PIPENV_IGNORE_PIPFILE=1
|
||||||
deps =
|
deps =
|
||||||
pipenv
|
pipenv
|
||||||
|
setuptools < 58.0.0
|
||||||
passenv = http_proxy https_proxy HTTP_PROXY HTTPS_PROXY no_proxy NO_PROXY PBR_VERSION
|
passenv = http_proxy https_proxy HTTP_PROXY HTTPS_PROXY no_proxy NO_PROXY PBR_VERSION
|
||||||
whitelist_externals =
|
whitelist_externals =
|
||||||
bash
|
bash
|
||||||
@ -27,6 +28,7 @@ commands =
|
|||||||
basepython = python3
|
basepython = python3
|
||||||
deps =
|
deps =
|
||||||
pipenv
|
pipenv
|
||||||
|
setuptools < 58.0.0
|
||||||
commands =
|
commands =
|
||||||
pipenv install --dev
|
pipenv install --dev
|
||||||
yapf -ir {toxinidir}/pegleg {toxinidir}/tests
|
yapf -ir {toxinidir}/pegleg {toxinidir}/tests
|
||||||
@ -35,6 +37,7 @@ commands =
|
|||||||
basepython = python3
|
basepython = python3
|
||||||
deps =
|
deps =
|
||||||
pipenv
|
pipenv
|
||||||
|
setuptools < 58.0.0
|
||||||
safety
|
safety
|
||||||
commands =
|
commands =
|
||||||
pipenv install --dev
|
pipenv install --dev
|
||||||
@ -49,6 +52,7 @@ whitelist_externals =
|
|||||||
basepython = python3
|
basepython = python3
|
||||||
deps =
|
deps =
|
||||||
pipenv
|
pipenv
|
||||||
|
setuptools < 58.0.0
|
||||||
-r{toxinidir}/doc/requirements.txt
|
-r{toxinidir}/doc/requirements.txt
|
||||||
commands =
|
commands =
|
||||||
pipenv install --dev
|
pipenv install --dev
|
||||||
@ -64,6 +68,7 @@ commands = bandit -r pegleg -n 5
|
|||||||
basepython = python3
|
basepython = python3
|
||||||
deps =
|
deps =
|
||||||
pipenv
|
pipenv
|
||||||
|
setuptools < 58.0.0
|
||||||
safety
|
safety
|
||||||
commands =
|
commands =
|
||||||
pipenv check
|
pipenv check
|
||||||
@ -73,6 +78,7 @@ commands =
|
|||||||
basepython = python3
|
basepython = python3
|
||||||
deps =
|
deps =
|
||||||
pipenv
|
pipenv
|
||||||
|
setuptools < 58.0.0
|
||||||
commands =
|
commands =
|
||||||
pipenv install --dev
|
pipenv install --dev
|
||||||
{toxinidir}/tools/install-cfssl.sh
|
{toxinidir}/tools/install-cfssl.sh
|
||||||
@ -84,7 +90,8 @@ whitelist_externals =
|
|||||||
|
|
||||||
[testenv:update-requirements]
|
[testenv:update-requirements]
|
||||||
deps =
|
deps =
|
||||||
pipenv
|
pipenv
|
||||||
|
setuptools < 58.0.0
|
||||||
commands =
|
commands =
|
||||||
pipenv lock --clear
|
pipenv lock --clear
|
||||||
bash -c "pipenv lock -r > {toxinidir}/requirements.txt"
|
bash -c "pipenv lock -r > {toxinidir}/requirements.txt"
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
DECKHAND_VERSION=commit/d7d3cbde2bd44eed0d574ec439d1f8194dbcf782
|
DECKHAND_VERSION=commit/d7d3cbde2bd44eed0d574ec439d1f8194dbcf782
|
||||||
SHIPYARD_VERSION=commit/35e5a7f796a5341e02fb0d3f2d27b41e2fb39131
|
SHIPYARD_VERSION=commit/35e5a7f796a5341e02fb0d3f2d27b41e2fb39131
|
||||||
PROMENADE_VERSION=commit/bc14e9bbb9857becedd7ce9d6b81d74de77b497b
|
PROMENADE_VERSION=commit/53d0ecb7f959050ebb75ab7420ca5bc07428aacb
|
||||||
|
Loading…
x
Reference in New Issue
Block a user