From 166483d6ad8787942fa7e894d6d6a63795f2e7a5 Mon Sep 17 00:00:00 2001 From: Ian H Pittwood Date: Mon, 12 Aug 2019 12:41:35 -0500 Subject: [PATCH] Fix Spyglass gates Zuul gates broke for Spyglass due to an update made to either Zuul or Openstack's Zuul jobs (I wasn't able to pin it down). The update caused Zuul to attempt to install Spyglass's requirements.txt file instead of referring to the method given in the tox configuration that utilizes Pipenv. To bypass this issue, the requirements.txt will be removed and Spyglass will be fully moved over to using Pipenv. Removes requirements.txt Updates Pipfile and Pipfile.lock for new package releases Updates Dockerfile to install requirements from Pipfile.lock Change-Id: I347ef6db18a44e1b88c811aa071ba8c60bccbd53 --- .zuul.yaml | 2 + Pipfile | 4 +- Pipfile.lock | 185 ++++++++++++----------- images/spyglass/Dockerfile.opensuse_15 | 7 +- images/spyglass/Dockerfile.ubuntu_bionic | 5 +- images/spyglass/Dockerfile.ubuntu_xenial | 6 +- requirements.txt | 13 -- 7 files changed, 113 insertions(+), 109 deletions(-) delete mode 100644 requirements.txt diff --git a/.zuul.yaml b/.zuul.yaml index 32cb24e..bd4ae91 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -81,6 +81,7 @@ - job: name: spyglass-docker-build-gate-opensuse timeout: 1800 + voting: false run: tools/gate/playbooks/docker-image-build.yaml nodeset: spyglass-single-node vars: @@ -127,6 +128,7 @@ - job: name: spyglass-docker-publish-opensuse timeout: 1800 + voting: false run: tools/gate/playbooks/docker-image-build.yaml nodeset: spyglass-single-node secrets: diff --git a/Pipfile b/Pipfile index b796636..0ad47d6 100644 --- a/Pipfile +++ b/Pipfile @@ -8,7 +8,7 @@ pbr = ">=2.0.0" pytest = "*" pytest-xdist = "*" pytest-cov = "*" -yapf = ">=0.27.0" +yapf = "~=0.27.0" hacking = ">=1.1.0" bandit = ">=1.6.0" tox = "*" @@ -20,7 +20,7 @@ jsonschema = "~=3.0.1" netaddr = "~=0.7.19" spyglass-plugin-xls = {git = "https://opendev.org/airship/spyglass-plugin-xls.git"} Jinja2 = "~=2.10.1" -PyYAML = "~=5.1.1" +PyYAML = "==5.1.1" [requires] python_version = "3.6" diff --git a/Pipfile.lock b/Pipfile.lock index 6867b8f..e0fdc37 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "9e398a7498f8c18959419b8049377dcba2c217307a7795b72e0fd111f37f5c5a" + "sha256": "d1c864960a43573d69498819934a7926b20dea9fa67d41ec1daa2a9e8f06bbb9" }, "pipfile-spec": 6, "requires": { @@ -49,11 +49,11 @@ }, "jsonschema": { "hashes": [ - "sha256:0c0a81564f181de3212efa2d17de1910f8732fa1b71c42266d983cd74304e20d", - "sha256:a5f6559964a3851f59040d3b961de5e68e70971afb88ba519d27e6a039efff1a" + "sha256:5f9c0a719ca2ce14c5de2fd350a64fd2d13e8539db29836a86adc990bb1a068f", + "sha256:8d4a2b7b6c2237e0199c8ea1a6d3e05bf118e289ae2b9d7ba444182a2959560d" ], "index": "pypi", - "version": "==3.0.1" + "version": "==3.0.2" }, "markupsafe": { "hashes": [ @@ -98,9 +98,9 @@ }, "pyrsistent": { "hashes": [ - "sha256:16692ee739d42cf5e39cef8d27649a8c1fdb7aa99887098f1460057c5eb75c3a" + "sha256:34b47fa169d6006b32e99d4b3c4031f155e6e68ebcc107d6454852e8e0ee6533" ], - "version": "==0.15.2" + "version": "==0.15.4" }, "pyyaml": { "hashes": [ @@ -127,7 +127,8 @@ "version": "==1.12.0" }, "spyglass-plugin-xls": { - "git": "https://opendev.org/airship/spyglass-plugin-xls.git" + "git": "https://opendev.org/airship/spyglass-plugin-xls.git", + "ref": "269ce7154f88a51e5dd9b883e2f7f15d5326a905" } }, "develop": { @@ -154,64 +155,62 @@ }, "bandit": { "hashes": [ - "sha256:f89adaff792d1f9b72859784c5f7964c6b5a5f32ca0ca458c9643e02d4fdceac", - "sha256:fa1fee3cb60a3dca89b7a86c0be82af0e830def961728aba9290854fe18c1f90" + "sha256:336620e220cf2d3115877685e264477ff9d9abaeb0afe3dc7264f55fa17a3952", + "sha256:41e75315853507aa145d62a78a2a6c5e3240fe14ee7c601459d0df9418196065" ], "index": "pypi", - "version": "==1.6.1" + "version": "==1.6.2" }, "coverage": { "hashes": [ - "sha256:0c5fe441b9cfdab64719f24e9684502a59432df7570521563d7b1aff27ac755f", - "sha256:2b412abc4c7d6e019ce7c27cbc229783035eef6d5401695dccba80f481be4eb3", - "sha256:3684fabf6b87a369017756b551cef29e505cb155ddb892a7a29277b978da88b9", - "sha256:39e088da9b284f1bd17c750ac672103779f7954ce6125fd4382134ac8d152d74", - "sha256:3c205bc11cc4fcc57b761c2da73b9b72a59f8d5ca89979afb0c1c6f9e53c7390", - "sha256:42692db854d13c6c5e9541b6ffe0fe921fe16c9c446358d642ccae1462582d3b", - "sha256:465ce53a8c0f3a7950dfb836438442f833cf6663d407f37d8c52fe7b6e56d7e8", - "sha256:48020e343fc40f72a442c8a1334284620f81295256a6b6ca6d8aa1350c763bbe", - "sha256:4ec30ade438d1711562f3786bea33a9da6107414aed60a5daa974d50a8c2c351", - "sha256:5296fc86ab612ec12394565c500b412a43b328b3907c0d14358950d06fd83baf", - "sha256:5f61bed2f7d9b6a9ab935150a6b23d7f84b8055524e7be7715b6513f3328138e", - "sha256:6899797ac384b239ce1926f3cb86ffc19996f6fa3a1efbb23cb49e0c12d8c18c", - "sha256:68a43a9f9f83693ce0414d17e019daee7ab3f7113a70c79a3dd4c2f704e4d741", - "sha256:6b8033d47fe22506856fe450470ccb1d8ba1ffb8463494a15cfc96392a288c09", - "sha256:7ad7536066b28863e5835e8cfeaa794b7fe352d99a8cded9f43d1161be8e9fbd", - "sha256:7bacb89ccf4bedb30b277e96e4cc68cd1369ca6841bde7b005191b54d3dd1034", - "sha256:839dc7c36501254e14331bcb98b27002aa415e4af7ea039d9009409b9d2d5420", - "sha256:8e679d1bde5e2de4a909efb071f14b472a678b788904440779d2c449c0355b27", - "sha256:8f9a95b66969cdea53ec992ecea5406c5bd99c9221f539bca1e8406b200ae98c", - "sha256:932c03d2d565f75961ba1d3cec41ddde00e162c5b46d03f7423edcb807734eab", - "sha256:93f965415cc51604f571e491f280cff0f5be35895b4eb5e55b47ae90c02a497b", - "sha256:988529edadc49039d205e0aa6ce049c5ccda4acb2d6c3c5c550c17e8c02c05ba", - "sha256:998d7e73548fe395eeb294495a04d38942edb66d1fa61eb70418871bc621227e", - "sha256:9de60893fb447d1e797f6bf08fdf0dbcda0c1e34c1b06c92bd3a363c0ea8c609", - "sha256:9e80d45d0c7fcee54e22771db7f1b0b126fb4a6c0a2e5afa72f66827207ff2f2", - "sha256:a545a3dfe5082dc8e8c3eb7f8a2cf4f2870902ff1860bd99b6198cfd1f9d1f49", - "sha256:a5d8f29e5ec661143621a8f4de51adfb300d7a476224156a39a392254f70687b", - "sha256:a9abc8c480e103dc05d9b332c6cc9fb1586330356fc14f1aa9c0ca5745097d19", - "sha256:aca06bfba4759bbdb09bf52ebb15ae20268ee1f6747417837926fae990ebc41d", - "sha256:bb23b7a6fd666e551a3094ab896a57809e010059540ad20acbeec03a154224ce", - "sha256:bfd1d0ae7e292105f29d7deaa9d8f2916ed8553ab9d5f39ec65bcf5deadff3f9", - "sha256:c22ab9f96cbaff05c6a84e20ec856383d27eae09e511d3e6ac4479489195861d", - "sha256:c62ca0a38958f541a73cf86acdab020c2091631c137bd359c4f5bddde7b75fd4", - "sha256:c709d8bda72cf4cd348ccec2a4881f2c5848fd72903c185f363d361b2737f773", - "sha256:c968a6aa7e0b56ecbd28531ddf439c2ec103610d3e2bf3b75b813304f8cb7723", - "sha256:ca58eba39c68010d7e87a823f22a081b5290e3e3c64714aac3c91481d8b34d22", - "sha256:df785d8cb80539d0b55fd47183264b7002077859028dfe3070cf6359bf8b2d9c", - "sha256:f406628ca51e0ae90ae76ea8398677a921b36f0bd71aab2099dfed08abd0322f", - "sha256:f46087bbd95ebae244a0eda01a618aff11ec7a069b15a3ef8f6b520db523dcf1", - "sha256:f8019c5279eb32360ca03e9fac40a12667715546eed5c5eb59eb381f2f501260", - "sha256:fc5f4d209733750afd2714e9109816a29500718b32dd9a5db01c0cb3a019b96a" + "sha256:08907593569fe59baca0bf152c43f3863201efb6113ecb38ce7e97ce339805a6", + "sha256:0be0f1ed45fc0c185cfd4ecc19a1d6532d72f86a2bac9de7e24541febad72650", + "sha256:141f08ed3c4b1847015e2cd62ec06d35e67a3ac185c26f7635f4406b90afa9c5", + "sha256:19e4df788a0581238e9390c85a7a09af39c7b539b29f25c89209e6c3e371270d", + "sha256:23cc09ed395b03424d1ae30dcc292615c1372bfba7141eb85e11e50efaa6b351", + "sha256:245388cda02af78276b479f299bbf3783ef0a6a6273037d7c60dc73b8d8d7755", + "sha256:331cb5115673a20fb131dadd22f5bcaf7677ef758741312bee4937d71a14b2ef", + "sha256:386e2e4090f0bc5df274e720105c342263423e77ee8826002dcffe0c9533dbca", + "sha256:3a794ce50daee01c74a494919d5ebdc23d58873747fa0e288318728533a3e1ca", + "sha256:60851187677b24c6085248f0a0b9b98d49cba7ecc7ec60ba6b9d2e5574ac1ee9", + "sha256:63a9a5fc43b58735f65ed63d2cf43508f462dc49857da70b8980ad78d41d52fc", + "sha256:6b62544bb68106e3f00b21c8930e83e584fdca005d4fffd29bb39fb3ffa03cb5", + "sha256:6ba744056423ef8d450cf627289166da65903885272055fb4b5e113137cfa14f", + "sha256:7494b0b0274c5072bddbfd5b4a6c6f18fbbe1ab1d22a41e99cd2d00c8f96ecfe", + "sha256:826f32b9547c8091679ff292a82aca9c7b9650f9fda3e2ca6bf2ac905b7ce888", + "sha256:93715dffbcd0678057f947f496484e906bf9509f5c1c38fc9ba3922893cda5f5", + "sha256:9a334d6c83dfeadae576b4d633a71620d40d1c379129d587faa42ee3e2a85cce", + "sha256:af7ed8a8aa6957aac47b4268631fa1df984643f07ef00acd374e456364b373f5", + "sha256:bf0a7aed7f5521c7ca67febd57db473af4762b9622254291fbcbb8cd0ba5e33e", + "sha256:bf1ef9eb901113a9805287e090452c05547578eaab1b62e4ad456fcc049a9b7e", + "sha256:c0afd27bc0e307a1ffc04ca5ec010a290e49e3afbe841c5cafc5c5a80ecd81c9", + "sha256:dd579709a87092c6dbee09d1b7cfa81831040705ffa12a1b248935274aee0437", + "sha256:df6712284b2e44a065097846488f66840445eb987eb81b3cc6e4149e7b6982e1", + "sha256:e07d9f1a23e9e93ab5c62902833bf3e4b1f65502927379148b6622686223125c", + "sha256:e2ede7c1d45e65e209d6093b762e98e8318ddeff95317d07a27a2140b80cfd24", + "sha256:e4ef9c164eb55123c62411f5936b5c2e521b12356037b6e1c2617cef45523d47", + "sha256:eca2b7343524e7ba246cab8ff00cab47a2d6d54ada3b02772e908a45675722e2", + "sha256:eee64c616adeff7db37cc37da4180a3a5b6177f5c46b187894e633f088fb5b28", + "sha256:ef824cad1f980d27f26166f86856efe11eff9912c4fed97d3804820d43fa550c", + "sha256:efc89291bd5a08855829a3c522df16d856455297cf35ae827a37edac45f466a7", + "sha256:fa964bae817babece5aa2e8c1af841bebb6d0b9add8e637548809d040443fee0", + "sha256:ff37757e068ae606659c28c3bd0d923f9d29a85de79bf25b2b34b148473b5025" ], - "version": "==4.5.3" + "version": "==4.5.4" + }, + "ddt": { + "hashes": [ + "sha256:474546b4020ce8a2f9550ba8899c28aa2c284c7bbf175bddede98be949d1ca7c", + "sha256:d13e6af8f36238e89d00f4ebccf2bda4f6d1878be560a6600689e42077e164e3" + ], + "version": "==1.2.1" }, "execnet": { "hashes": [ - "sha256:027ee5d961afa01e97b90d6ccc34b4ed976702bc58e7f092b3c513ea288cb6d2", - "sha256:752a3786f17416d491f833a29217dda3ea4a471fc5269c492eebcee8cc4772d3" + "sha256:0dd40ad3b960aae93bdad7fe1c3f049bbcc8fba47094655a4301f5b33e906816", + "sha256:3839f3c1e9270926e7b3d9b0a52a57be89c302a3826a2b19c8d6e6c3d2b506d2" ], - "version": "==1.6.0" + "version": "==1.7.0" }, "filelock": { "hashes": [ @@ -227,6 +226,12 @@ ], "version": "==2.6.2" }, + "gitdb": { + "hashes": [ + "sha256:a3ebbc27be035a2e874ed904df516e35f4a29a778a764385de09de9e0f139658" + ], + "version": "==0.6.4" + }, "gitdb2": { "hashes": [ "sha256:83361131a1836661a155172932a13c08bda2db3674e4caa32368aa6eb02f38c2", @@ -236,10 +241,10 @@ }, "gitpython": { "hashes": [ - "sha256:563221e5a44369c6b79172f455584c9ebbb122a13368cc82cb4b5addff788f82", - "sha256:8237dc5bfd6f1366abeee5624111b9d6879393d84745a507de0fda86043b65a8" + "sha256:556b64796c5e268b35e3b431a429e813ad54aa178e1baaec2a9ba82e8575a89e", + "sha256:629867ebf609cef21bb9d849039e281e25963fb7d714a2f6bacc1ecce4800293" ], - "version": "==2.1.11" + "version": "==3.0.0" }, "hacking": { "hashes": [ @@ -251,10 +256,10 @@ }, "importlib-metadata": { "hashes": [ - "sha256:6dfd58dfe281e8d240937776065dd3624ad5469c835248219bd16cf2e12dbeb7", - "sha256:cb6ee23b46173539939964df59d3d72c3e0c1b5d54b84f1d8a7e912fe43612db" + "sha256:23d3d873e008a513952355379d93cbcab874c58f4f034ff657c7a87422fa64e8", + "sha256:80d2de76188eabfbfcf27e6a37342c2827801e59c4cc14b0371c56fed43820e3" ], - "version": "==0.18" + "version": "==0.19" }, "mccabe": { "hashes": [ @@ -265,26 +270,25 @@ }, "more-itertools": { "hashes": [ - "sha256:2112d2ca570bb7c3e53ea1a35cd5df42bb0fd10c45f0fb97178679c3c03d64c7", - "sha256:c3e4748ba1aad8dba30a4886b0b1a2004f9a863837b8654e7059eebf727afa5a" + "sha256:409cd48d4db7052af495b09dec721011634af3753ae1ef92d2b32f73a745f832", + "sha256:92b8c4b06dac4f0611c0729b2f2ede52b2e1bac1ab48f089c7ddc12e26bb60c4" ], - "markers": "python_version > '2.7'", - "version": "==7.0.0" + "version": "==7.2.0" }, "packaging": { "hashes": [ - "sha256:0c98a5d0be38ed775798ece1b9727178c4469d9c3b4ada66e8e6b7849f8732af", - "sha256:9e1cbf8c12b1f1ce0bb5344b8d7ecf66a6f8a6e91bcb0c84593ed6d3ab5c4ab3" + "sha256:a7ac867b97fdc07ee80a8058fe4435ccd274ecc3b0ed61d852d7d53055528cf9", + "sha256:c491ca87294da7cc01902edbe30a5bc6c4c28172b5138ab4e4aa1b9d7bfaeafe" ], - "version": "==19.0" + "version": "==19.1" }, "pbr": { "hashes": [ - "sha256:9181e2a34d80f07a359ff1d0504fad3a47e00e1cf2c475b0aa7dcb030af54c40", - "sha256:94bdc84da376b3dd5061aa0c3b6faffe943ee2e56fa4ff9bd63e1643932f34fc" + "sha256:56e52299170b9492513c64be44736d27a512fa7e606f21942160b68ce510b4bc", + "sha256:9b321c204a88d8ab5082699469f52cc94c5da45c51f114113d01b3d993c24cdf" ], "index": "pypi", - "version": "==5.3.1" + "version": "==5.4.2" }, "pluggy": { "hashes": [ @@ -316,18 +320,18 @@ }, "pyparsing": { "hashes": [ - "sha256:1873c03321fc118f4e9746baf201ff990ceb915f433f23b395f5580d1840cb2a", - "sha256:9b6323ef4ab914af344ba97510e966d64ba91055d6b9afa6b30799340e89cc03" + "sha256:6f98a7b9397e206d78cc01df10131398f1c8b8510a2f4d97d9abd82e1aacdd80", + "sha256:d9338df12903bbf5d65a0e4e87c2161968b10d2e489652bb47001d82a9b028b4" ], - "version": "==2.4.0" + "version": "==2.4.2" }, "pytest": { "hashes": [ - "sha256:4a784f1d4f2ef198fe9b7aef793e9fa1a3b2f84e822d9b3a64a181293a572d45", - "sha256:926855726d8ae8371803f7b2e6ec0a69953d9c6311fa7c3b6c1b929ff92d27da" + "sha256:6ef6d06de77ce2961156013e9dff62f1b2688aa04d0dc244299fe7d67e09370d", + "sha256:a736fed91c12681a7b34617c8fcefe39ea04599ca72c608751c31d89579a3f77" ], "index": "pypi", - "version": "==4.6.3" + "version": "==5.0.1" }, "pytest-cov": { "hashes": [ @@ -376,6 +380,12 @@ ], "version": "==1.12.0" }, + "smmap": { + "hashes": [ + "sha256:0e2b62b497bd5f0afebc002eda4d90df9d209c30ef257e8673c90a6b5c119d62" + ], + "version": "==0.9.0" + }, "smmap2": { "hashes": [ "sha256:0555a7bf4df71d1ef4218e4807bbf9b201f910174e6e08af2e138d4e517b4dde", @@ -393,25 +403,24 @@ "toml": { "hashes": [ "sha256:229f81c57791a41d65e399fc06bf0848bab550a9dfd5ed66df18ce5f05e73d5c", - "sha256:235682dd292d5899d361a811df37e04a8828a5b1da3115886b73cf81ebc9100e", - "sha256:f1db651f9657708513243e61e6cc67d101a39bad662eaa9b5546f789338e07a3" + "sha256:235682dd292d5899d361a811df37e04a8828a5b1da3115886b73cf81ebc9100e" ], "version": "==0.10.0" }, "tox": { "hashes": [ - "sha256:f5c8e446b51edd2ea97df31d4ded8c8b72e7d6c619519da6bb6084b9dd5770f9", - "sha256:f87fd33892a2df0950e5e034def9468988b8d008c7e9416be665fcc0dd45b14f" + "sha256:dab0b0160dd187b654fc33d690ee1d7bf328bd5b8dc6ef3bb3cc468969c659ba", + "sha256:ee35ffce74933a6c6ac10c9a0182e41763140a5a5070e21b114feca56eaccdcd" ], "index": "pypi", - "version": "==3.12.1" + "version": "==3.13.2" }, "virtualenv": { "hashes": [ - "sha256:b7335cddd9260a3dd214b73a2521ffc09647bde3e9457fcca31dc3be3999d04a", - "sha256:d28ca64c0f3f125f59cabf13e0a150e1c68e5eea60983cc4395d88c584495783" + "sha256:6cb2e4c18d22dbbe283d0a0c31bb7d90771a606b2cb3415323eea008eaee6a9d", + "sha256:909fe0d3f7c9151b2df0a2cb53e55bdb7b0d61469353ff7a49fd47b0f0ab9285" ], - "version": "==16.6.1" + "version": "==16.7.2" }, "wcwidth": { "hashes": [ @@ -430,10 +439,10 @@ }, "zipp": { "hashes": [ - "sha256:8c1019c6aad13642199fbe458275ad6a84907634cc9f0989877ccc4a2840139d", - "sha256:ca943a7e809cc12257001ccfb99e3563da9af99d52f261725e96dfe0f9275bc3" + "sha256:4970c3758f4e89a7857a973b1e2a5d75bcdc47794442f2e2dd4fe8e0466e809a", + "sha256:8a5712cfd3bb4248015eb3b0b3c54a5f6ee3f2425963ef2a0125b8bc40aafaec" ], - "version": "==0.5.1" + "version": "==0.5.2" } } } diff --git a/images/spyglass/Dockerfile.opensuse_15 b/images/spyglass/Dockerfile.opensuse_15 index 8a713b2..1689421 100644 --- a/images/spyglass/Dockerfile.opensuse_15 +++ b/images/spyglass/Dockerfile.opensuse_15 @@ -22,6 +22,8 @@ RUN set -x \ python3-pip \ python3-setuptools \ which \ + && zypper --non-interactive --no-gpg-checks ar -f https://download.opensuse.org/repositories/devel:languages:python/openSUSE_Leap_15.1/devel:languages:python.repo \ + && zypper --non-interactive --no-gpg-checks install python3-six-1.12.0-lp151.80.1.noarch \ && python3 -m pip install -U pip \ && zypper clean -a \ && rm -rf \ @@ -35,8 +37,9 @@ RUN set -x \ VOLUME /var/spyglass WORKDIR /var/spyglass -COPY requirements.txt /opt/spyglass/requirements.txt -RUN pip3 install --no-cache-dir -r /opt/spyglass/requirements.txt --user +COPY Pipfile /var/spyglass/Pipfile +COPY Pipfile.lock /var/spyglass/Pipfile.lock +RUN pip3 install pipenv && pipenv install --system --deploy --ignore-pipfile COPY . /opt/spyglass RUN pip3 install -e /opt/spyglass diff --git a/images/spyglass/Dockerfile.ubuntu_bionic b/images/spyglass/Dockerfile.ubuntu_bionic index af788ea..cf9e617 100644 --- a/images/spyglass/Dockerfile.ubuntu_bionic +++ b/images/spyglass/Dockerfile.ubuntu_bionic @@ -37,8 +37,9 @@ RUN set -ex \ VOLUME /var/spyglass WORKDIR /var/spyglass -COPY requirements.txt /opt/spyglass/requirements.txt -RUN pip3 install --no-cache-dir -r /opt/spyglass/requirements.txt +COPY Pipfile /var/spyglass/Pipfile +COPY Pipfile.lock /var/spyglass/Pipfile.lock +RUN pip3 install pipenv && pipenv install --system --deploy --ignore-pipfile COPY . /opt/spyglass RUN pip3 install -e /opt/spyglass diff --git a/images/spyglass/Dockerfile.ubuntu_xenial b/images/spyglass/Dockerfile.ubuntu_xenial index de3464c..f0c306c 100644 --- a/images/spyglass/Dockerfile.ubuntu_xenial +++ b/images/spyglass/Dockerfile.ubuntu_xenial @@ -37,8 +37,10 @@ RUN set -ex \ VOLUME /var/spyglass WORKDIR /var/spyglass -COPY requirements.txt /opt/spyglass/requirements.txt -RUN pip3 install --no-cache-dir -r /opt/spyglass/requirements.txt +COPY Pipfile /var/spyglass/Pipfile +COPY Pipfile.lock /var/spyglass/Pipfile.lock +RUN pip3 install pipenv \ + && pipenv install --system --deploy --ignore-pipfile COPY . /opt/spyglass RUN pip3 install -e /opt/spyglass diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 02d44d7..0000000 --- a/requirements.txt +++ /dev/null @@ -1,13 +0,0 @@ -attrs==19.1.0 -click-plugins==1.1.1 -click==7.0 -git+https://opendev.org/airship/spyglass-plugin-xls.git#egg=spyglass-plugin-xls -jinja2==2.10.1 -jsonschema==3.0.1 -markupsafe==1.1.1 -netaddr==0.7.19 -pyrsistent==0.15.2 -pyyaml==5.1.1 -six==1.12.0 -yapf==0.27.0 -flake8-import-order==0.18.1