airship
/
pegleg
Code Issues Proposed changes

Uplift pegleg dependencies 

Periodic uplift of Pegleg dependencies, notably:
1. deckhand, shipyard, promenade now on latest
2. uplift of other packages in attempt to resolve security scans
   identified on quay.io [0]

[0] https://quay.io/repository/airshipit/pegleg?tab=tags

Change-Id: Id4a2a61fe1748b865e6eca55ea7ce13686855497
This commit is contained in:
Alexander Hughes 2019-11-07 22:42:49 -06:00 committed by Alexander Hughes
parent 85fdcd497a
commit 980de8fd30
4 changed files with 98 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Pipfile
View File

@ -25,10 +25,11 @@ python-dateutil = "~=2.7.3"
GitPython = "~=2.1.11"
docker = ">=3.7.2"
PyYAML = "~=5.1"
deckhand = {git = "https://opendev.org/airship/deckhand.git",ref = "7d2092b100bddcab77fca0acadd9fc99ba59797b"}
shipyard-client = {git = "https://opendev.org/airship/shipyard.git",ref = "f42e85d7cedb0a22c2f90f53ad4902cc4a62d9a9",subdirectory = "src/bin/shipyard_client"}
promenade = {git = "https://opendev.org/airship/promenade.git",ref = "1f502d84ad9058a0856bad59a5c6827ada8b23eb"}
deckhand = {git = "https://opendev.org/airship/deckhand.git",ref = "51dcea4fa12b0bcce65c381c286e61378a0826e2"}
shipyard-client = {git = "https://opendev.org/airship/shipyard.git",ref = "72ca47e5c9ae8b7b1dcccd7742be6499f0411650",subdirectory = "src/bin/shipyard_client"}
promenade = {git = "https://opendev.org/airship/promenade.git",ref = "46dffa8b1292202758ebc2a91cfae70362d852fb"}
oslo-utils = "~=3.41.0"
six = "<=1.12.0"
[requires]
python_version = "3.6"

163
Pipfile.lock generated
View File

@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
"sha256": "167e15972c1d40eb46841c972276c43533c618b85ec4685469da822b904a1502"
"sha256": "3eefd016fc6b7c7c9960de514cc65c823e55b108594ded5f09a335e66f9cbe97"
},
"pipfile-spec": 6,
"requires": {
@ -18,10 +18,10 @@
"default": {
"asn1crypto": {
"hashes": [
"sha256:2f1adbb7546ed199e3c90ef23ec95c5cf3585bac7d11fb7eb562a3fe89c64e87",
"sha256:9d5c20441baf0cb60a4ac34cc447c6c189024b6b4c6cd7877034f4965c464e49"
"sha256:7bb1cc02a5620b3d72da4ba070bda2f44f0e61b44dee910a302eddff802b6fb5",
"sha256:87620880a477123e01177a1f73d0f327210b43a3cdbd714efcd2fa49a8d7b384"
],
"version": "==0.24.0"
"version": "==1.2.0"
},
"babel": {
"hashes": [
@ -39,36 +39,41 @@
},
"cffi": {
"hashes": [
"sha256:041c81822e9f84b1d9c401182e174996f0bae9991f33725d059b771744290774",
"sha256:046ef9a22f5d3eed06334d01b1e836977eeef500d9b78e9ef693f9380ad0b83d",
"sha256:066bc4c7895c91812eff46f4b1c285220947d4aa46fa0a2651ff85f2afae9c90",
"sha256:066c7ff148ae33040c01058662d6752fd73fbc8e64787229ea8498c7d7f4041b",
"sha256:2444d0c61f03dcd26dbf7600cf64354376ee579acad77aef459e34efcb438c63",
"sha256:300832850b8f7967e278870c5d51e3819b9aad8f0a2c8dbe39ab11f119237f45",
"sha256:34c77afe85b6b9e967bd8154e3855e847b70ca42043db6ad17f26899a3df1b25",
"sha256:46de5fa00f7ac09f020729148ff632819649b3e05a007d286242c4882f7b1dc3",
"sha256:4aa8ee7ba27c472d429b980c51e714a24f47ca296d53f4d7868075b175866f4b",
"sha256:4d0004eb4351e35ed950c14c11e734182591465a33e960a4ab5e8d4f04d72647",
"sha256:4e3d3f31a1e202b0f5a35ba3bc4eb41e2fc2b11c1eff38b362de710bcffb5016",
"sha256:50bec6d35e6b1aaeb17f7c4e2b9374ebf95a8975d57863546fa83e8d31bdb8c4",
"sha256:55cad9a6df1e2a1d62063f79d0881a414a906a6962bc160ac968cc03ed3efcfb",
"sha256:5662ad4e4e84f1eaa8efce5da695c5d2e229c563f9d5ce5b0113f71321bcf753",
"sha256:59b4dc008f98fc6ee2bb4fd7fc786a8d70000d058c2bbe2698275bc53a8d3fa7",
"sha256:73e1ffefe05e4ccd7bcea61af76f36077b914f92b76f95ccf00b0c1b9186f3f9",
"sha256:a1f0fd46eba2d71ce1589f7e50a9e2ffaeb739fb2c11e8192aa2b45d5f6cc41f",
"sha256:a2e85dc204556657661051ff4bab75a84e968669765c8a2cd425918699c3d0e8",
"sha256:a5457d47dfff24882a21492e5815f891c0ca35fefae8aa742c6c263dac16ef1f",
"sha256:a8dccd61d52a8dae4a825cdbb7735da530179fea472903eb871a5513b5abbfdc",
"sha256:ae61af521ed676cf16ae94f30fe202781a38d7178b6b4ab622e4eec8cefaff42",
"sha256:b012a5edb48288f77a63dba0840c92d0504aa215612da4541b7b42d849bc83a3",
"sha256:d2c5cfa536227f57f97c92ac30c8109688ace8fa4ac086d19d0af47d134e2909",
"sha256:d42b5796e20aacc9d15e66befb7a345454eef794fdb0737d1af593447c6c8f45",
"sha256:dee54f5d30d775f525894d67b1495625dd9322945e7fee00731952e0368ff42d",
"sha256:e070535507bd6aa07124258171be2ee8dfc19119c28ca94c9dfb7efd23564512",
"sha256:e1ff2748c84d97b065cc95429814cdba39bcbd77c9c85c89344b317dc0d9cbff",
"sha256:ed851c75d1e0e043cbf5ca9a8e1b13c4c90f3fbd863dacb01c0808e2b5204201"
"sha256:0b49274afc941c626b605fb59b59c3485c17dc776dc3cc7cc14aca74cc19cc42",
"sha256:0e3ea92942cb1168e38c05c1d56b0527ce31f1a370f6117f1d490b8dcd6b3a04",
"sha256:135f69aecbf4517d5b3d6429207b2dff49c876be724ac0c8bf8e1ea99df3d7e5",
"sha256:19db0cdd6e516f13329cba4903368bff9bb5a9331d3410b1b448daaadc495e54",
"sha256:2781e9ad0e9d47173c0093321bb5435a9dfae0ed6a762aabafa13108f5f7b2ba",
"sha256:291f7c42e21d72144bb1c1b2e825ec60f46d0a7468f5346841860454c7aa8f57",
"sha256:2c5e309ec482556397cb21ede0350c5e82f0eb2621de04b2633588d118da4396",
"sha256:2e9c80a8c3344a92cb04661115898a9129c074f7ab82011ef4b612f645939f12",
"sha256:32a262e2b90ffcfdd97c7a5e24a6012a43c61f1f5a57789ad80af1d26c6acd97",
"sha256:3c9fff570f13480b201e9ab69453108f6d98244a7f495e91b6c654a47486ba43",
"sha256:415bdc7ca8c1c634a6d7163d43fb0ea885a07e9618a64bda407e04b04333b7db",
"sha256:42194f54c11abc8583417a7cf4eaff544ce0de8187abaf5d29029c91b1725ad3",
"sha256:4424e42199e86b21fc4db83bd76909a6fc2a2aefb352cb5414833c030f6ed71b",
"sha256:4a43c91840bda5f55249413037b7a9b79c90b1184ed504883b72c4df70778579",
"sha256:599a1e8ff057ac530c9ad1778293c665cb81a791421f46922d80a86473c13346",
"sha256:5c4fae4e9cdd18c82ba3a134be256e98dc0596af1e7285a3d2602c97dcfa5159",
"sha256:5ecfa867dea6fabe2a58f03ac9186ea64da1386af2159196da51c4904e11d652",
"sha256:62f2578358d3a92e4ab2d830cd1c2049c9c0d0e6d3c58322993cc341bdeac22e",
"sha256:6471a82d5abea994e38d2c2abc77164b4f7fbaaf80261cb98394d5793f11b12a",
"sha256:6d4f18483d040e18546108eb13b1dfa1000a089bcf8529e30346116ea6240506",
"sha256:71a608532ab3bd26223c8d841dde43f3516aa5d2bf37b50ac410bb5e99053e8f",
"sha256:74a1d8c85fb6ff0b30fbfa8ad0ac23cd601a138f7509dc617ebc65ef305bb98d",
"sha256:7b93a885bb13073afb0aa73ad82059a4c41f4b7d8eb8368980448b52d4c7dc2c",
"sha256:7d4751da932caaec419d514eaa4215eaf14b612cff66398dd51129ac22680b20",
"sha256:7f627141a26b551bdebbc4855c1157feeef18241b4b8366ed22a5c7d672ef858",
"sha256:8169cf44dd8f9071b2b9248c35fc35e8677451c52f795daa2bb4643f32a540bc",
"sha256:aa00d66c0fab27373ae44ae26a66a9e43ff2a678bf63a9c7c1a9a4d61172827a",
"sha256:ccb032fda0873254380aa2bfad2582aedc2959186cce61e3a17abc1a55ff89c3",
"sha256:d754f39e0d1603b5b24a7f8484b22d2904fa551fe865fd0d4c3332f078d20d4e",
"sha256:d75c461e20e29afc0aee7172a0950157c704ff0dd51613506bd7d82b718e7410",
"sha256:dcd65317dd15bc0451f3e01c80da2216a31916bdcffd6221ca1202d96584aa25",
"sha256:e570d3ab32e2c2861c4ebe6ffcad6a8abf9347432a37608fe1fbd157b3f0036b",
"sha256:fd43a88e045cf992ed09fa724b5315b790525f2676883a6ea64e3263bae6549d"
],
"version": "==1.12.3"
"version": "==1.13.2"
},
"chardet": {
"hashes": [
@ -119,15 +124,15 @@
},
"deckhand": {
"git": "https://opendev.org/airship/deckhand.git",
"ref": "7d2092b100bddcab77fca0acadd9fc99ba59797b"
"ref": "51dcea4fa12b0bcce65c381c286e61378a0826e2"
},
"docker": {
"hashes": [
"sha256:acf51b5e3e0d056925c3b780067a6f753c915fffaa46c5f2d79eb0fc1cbe6a01",
"sha256:cc5b2e94af6a2b1e1ed9d7dcbdc77eff56c36081757baf9ada6e878ea0213164"
"sha256:6e06c5e70ba4fad73e35f00c55a895a448398f3ada7faae072e2bb01348bafc1",
"sha256:8f93775b8bdae3a2df6bc9a5312cce564cade58d6555f2c2570165a1270cd8a7"
],
"index": "pypi",
"version": "==4.0.2"
"version": "==4.1.0"
},
"gitdb2": {
"hashes": [
@ -203,10 +208,10 @@
},
"oslo-utils": {
"hashes": [
"sha256:31043ddd96963de2eeb628d35417a5f3d490c5eeacced0024b9b1ff7bf8d29e8"
"sha256:976a989fe377e074ab60ca9453b0d15fcf469d19fa723809849898c692b3219e"
],
"index": "pypi",
"version": "==3.41.1"
"version": "==3.41.2"
},
"oslo.i18n": {
"hashes": [
@ -224,7 +229,7 @@
},
"promenade": {
"git": "https://opendev.org/airship/promenade.git",
"ref": "1f502d84ad9058a0856bad59a5c6827ada8b23eb"
"ref": "46dffa8b1292202758ebc2a91cfae70362d852fb"
},
"pycparser": {
"hashes": [
@ -234,10 +239,10 @@
},
"pyparsing": {
"hashes": [
"sha256:6f98a7b9397e206d78cc01df10131398f1c8b8510a2f4d97d9abd82e1aacdd80",
"sha256:d9338df12903bbf5d65a0e4e87c2161968b10d2e489652bb47001d82a9b028b4"
"sha256:20f995ecd72f2a1f4bf6b072b63b22e2eb457836601e76d6e5dfcd75436acc1f",
"sha256:4ca62001be367f01bd3e92ecbb79070272a9d4964dce6a48a82ff0b8bc7e683a"
],
"version": "==2.4.2"
"version": "==2.4.5"
},
"python-dateutil": {
"hashes": [
@ -249,10 +254,10 @@
},
"pytz": {
"hashes": [
"sha256:26c0b32e437e54a18161324a2fca3c4b9846b74a8dccddd843113109e1116b32",
"sha256:c894d57500a4cd2d5c71114aaab77dbab5eabd9022308ce5ac9bb93a60a6f0c7"
"sha256:1c557d7d0e871de1f5ccd5833f60fb2550652da6be2693c1e02300743d21500d",
"sha256:b02c06db6cf09c12dd25137e563b31700d3b80fcc4ad23abb7a315f2789819be"
],
"version": "==2019.2"
"version": "==2019.3"
},
"pyyaml": {
"hashes": [
@ -282,7 +287,7 @@
},
"shipyard-client": {
"git": "https://opendev.org/airship/shipyard.git",
"ref": "f42e85d7cedb0a22c2f90f53ad4902cc4a62d9a9",
"ref": "72ca47e5c9ae8b7b1dcccd7742be6499f0411650",
"subdirectory": "src/bin/shipyard_client"
},
"six": {
@ -290,6 +295,7 @@
"sha256:3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c",
"sha256:d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73"
],
"index": "pypi",
"version": "==1.12.0"
},
"smmap2": {
@ -301,10 +307,10 @@
},
"urllib3": {
"hashes": [
"sha256:3de946ffbed6e6746608990594d08faac602528ac7015ac28d33cee6a45b7398",
"sha256:9a107b99a5393caf59c7aa3c1249c16e6879447533d0887f4336dde834c7be86"
"sha256:a8a318824cc77d1fd4b2bec2ded92646630d7fe8619497b142c84a9e6f5a7293",
"sha256:f3c5fd51747d450d4dcf6f923c81f78f811aab8205fda64b0aba34a4e48b0745"
],
"version": "==1.25.6"
"version": "==1.25.7"
},
"websocket-client": {
"hashes": [
@ -337,10 +343,10 @@
},
"attrs": {
"hashes": [
"sha256:69c0dbf2ed392de1cb5ec704444b08a5ef81680a61cb899dc08127123af36a79",
"sha256:f0b870f674851ecbfbbbd364d6b5cbdff9dcedbc7f3f5e18a6891057f21fe399"
"sha256:08a96c641c3a74e44eb59afb61a24f2cb9f4d7188748e76ba4bb5edfa3cb7d1c",
"sha256:f7b7ce16570fe9965acd6d30101a28f62fb4a7f9e926b3bbc9b61f8b04247e72"
],
"version": "==19.1.0"
"version": "==19.3.0"
},
"bandit": {
"hashes": [
@ -483,14 +489,6 @@
],
"version": "==19.2"
},
"pathlib2": {
"hashes": [
"sha256:0ec8205a157c80d7acc301c0b18fbd5d44fe655968f5d947b6ecef5290fc35db",
"sha256:6cd9a47b597b37cc57de1c05e56fb1a1c9cc9fab04fe78c29acd090418529868"
],
"markers": "python_version < '3.6'",
"version": "==2.3.5"
},
"pbr": {
"hashes": [
"sha256:2c8e420cd4ed4cec4e7999ee47409e876af575d4c35a45840d59e8b5f3155ab8",
@ -528,41 +526,41 @@
},
"pyparsing": {
"hashes": [
"sha256:6f98a7b9397e206d78cc01df10131398f1c8b8510a2f4d97d9abd82e1aacdd80",
"sha256:d9338df12903bbf5d65a0e4e87c2161968b10d2e489652bb47001d82a9b028b4"
"sha256:20f995ecd72f2a1f4bf6b072b63b22e2eb457836601e76d6e5dfcd75436acc1f",
"sha256:4ca62001be367f01bd3e92ecbb79070272a9d4964dce6a48a82ff0b8bc7e683a"
],
"version": "==2.4.2"
"version": "==2.4.5"
},
"pytest": {
"hashes": [
"sha256:13c1c9b22127a77fc684eee24791efafcef343335d855e3573791c68588fe1a5",
"sha256:d8ba7be9466f55ef96ba203fc0f90d0cf212f2f927e69186e1353e30bc7f62e5"
"sha256:27abc3fef618a01bebb1f0d6d303d2816a99aa87a5968ebc32fe971be91eb1e6",
"sha256:58cee9e09242937e136dbb3dab466116ba20d6b7828c7620f23947f37eb4dae4"
],
"index": "pypi",
"version": "==5.2.0"
"version": "==5.2.2"
},
"pytest-cov": {
"hashes": [
"sha256:2b097cde81a302e1047331b48cadacf23577e431b61e9c6f49a1170bbe3d3da6",
"sha256:e00ea4fdde970725482f1f35630d12f074e121a23801aabf2ae154ec6bdd343a"
"sha256:cc6742d8bac45070217169f5f72ceee1e0e55b0221f54bcf24845972d3a47f2b",
"sha256:cdbdef4f870408ebdbfeb44e63e07eb18bb4619fae852f6e760645fa36172626"
],
"index": "pypi",
"version": "==2.7.1"
"version": "==2.8.1"
},
"pytest-forked": {
"hashes": [
"sha256:5fe33fbd07d7b1302c95310803a5e5726a4ff7f19d5a542b7ce57c76fed8135f",
"sha256:d352aaced2ebd54d42a65825722cb433004b4446ab5d2044851d9cc7a00c9e38"
"sha256:1805699ed9c9e60cb7a8179b8d4fa2b8898098e82d229b0825d8095f0f261100",
"sha256:1ae25dba8ee2e56fb47311c9638f9e58552691da87e82d25b0ce0e4bf52b7d87"
],
"version": "==1.0.2"
"version": "==1.1.3"
},
"pytest-xdist": {
"hashes": [
"sha256:3489d91516d7847db5eaecff7a2e623dba68984835dbe6cedb05ae126c4fb17f",
"sha256:501795cb99e567746f30fe78850533d4cd500c93794128e6ab9988e92a17b1f8"
"sha256:5d1b1d4461518a6023d56dab62fb63670d6f7537f23e2708459a557329accf48",
"sha256:a8569b027db70112b290911ce2ed732121876632fb3f40b1d39cd2f72f58b147"
],
"index": "pypi",
"version": "==1.29.0"
"version": "==1.30.0"
},
"pyyaml": {
"hashes": [
@ -595,6 +593,7 @@
"sha256:3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c",
"sha256:d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73"
],
"index": "pypi",
"version": "==1.12.0"
},
"smmap2": {
@ -613,18 +612,18 @@
},
"testfixtures": {
"hashes": [
"sha256:665a298976c8d77f311b65c46f16b7cda7229a47dff5ad7c822e5b3371a439e2",
"sha256:9d230c5c80746f9f86a16a1f751a5cf5d8e317d4cc48243a19fb180d22303bce"
"sha256:18f5ea13a40a3b3a9184b785d2abfbaabd2a24dace9158962cd6334bf08b7e70",
"sha256:abbca7ed381d34a77699c6cb68be67919a1e7f5cf8728b57396145417fa34110"
],
"index": "pypi",
"version": "==6.10.0"
"version": "==6.10.1"
},
"urllib3": {
"hashes": [
"sha256:3de946ffbed6e6746608990594d08faac602528ac7015ac28d33cee6a45b7398",
"sha256:9a107b99a5393caf59c7aa3c1249c16e6879447533d0887f4336dde834c7be86"
"sha256:a8a318824cc77d1fd4b2bec2ded92646630d7fe8619497b142c84a9e6f5a7293",
"sha256:f3c5fd51747d450d4dcf6f923c81f78f811aab8205fda64b0aba34a4e48b0745"
],
"version": "==1.25.6"
"version": "==1.25.7"
},
"wcwidth": {
"hashes": [

20
requirements.txt
View File

@ -1,16 +1,16 @@
-i https://pypi.org/simple
asn1crypto==0.24.0
asn1crypto==1.2.0
babel==2.7.0
certifi==2019.9.11
cffi==1.12.3
cffi==1.13.2
chardet==3.0.4
click==7.0
cryptography==2.3.1
debtcollector==1.22.0
docker==4.0.2
git+https://opendev.org/airship/deckhand.git@7d2092b100bddcab77fca0acadd9fc99ba59797b#egg=deckhand
git+https://opendev.org/airship/promenade.git@1f502d84ad9058a0856bad59a5c6827ada8b23eb#egg=promenade
git+https://opendev.org/airship/shipyard.git@f42e85d7cedb0a22c2f90f53ad4902cc4a62d9a9#egg=shipyard-client&subdirectory=src/bin/shipyard_client
docker==4.1.0
git+https://opendev.org/airship/deckhand.git@51dcea4fa12b0bcce65c381c286e61378a0826e2#egg=deckhand
git+https://opendev.org/airship/promenade.git@46dffa8b1292202758ebc2a91cfae70362d852fb#egg=promenade
git+https://opendev.org/airship/shipyard.git@72ca47e5c9ae8b7b1dcccd7742be6499f0411650#egg=shipyard-client&subdirectory=src/bin/shipyard_client
gitdb2==2.0.6
gitpython==2.1.14
idna==2.8
@ -18,17 +18,17 @@ iso8601==0.1.12
jsonschema==2.6.0
netaddr==0.7.19
netifaces==0.10.9
oslo-utils==3.41.1
oslo-utils==3.41.2
oslo.i18n==3.24.0
pbr==5.4.3
pycparser==2.19
pyparsing==2.4.2
pyparsing==2.4.5
python-dateutil==2.7.5
pytz==2019.2
pytz==2019.3
pyyaml==5.1.2
requests==2.22.0
six==1.12.0
smmap2==2.0.5
urllib3==1.25.6
urllib3==1.25.7
websocket-client==0.56.0
wrapt==1.11.2

6
vcs-requirements.env
View File

@ -1,3 +1,3 @@
DECKHAND_VERSION=commit/ecc7b834edf0278c935379e1ef54b9a2fe6a40ff
SHIPYARD_VERSION=commit/9c5f68cf97585a86c9edfc3b24545b36bdd90e14
PROMENADE_VERSION=commit/89f9842b2ec428709a05fd0a8d4cd1796043375d
DECKHAND_VERSION=commit/51dcea4fa12b0bcce65c381c286e61378a0826e2
SHIPYARD_VERSION=commit/72ca47e5c9ae8b7b1dcccd7742be6499f0411650
PROMENADE_VERSION=commit/46dffa8b1292202758ebc2a91cfae70362d852fb