From f1bedbea943279d9e3b5ba999972145eaa20376a Mon Sep 17 00:00:00 2001 From: Simon Fraser Date: Tue, 25 Feb 2020 16:03:16 +0000 Subject: [PATCH] Bug 1617642 Remove pip version restriction & force Python 3.8 for funsize r=jlorenzo backports.lzma couldn't cleanly be installed because we were now using Python3.8 but hadn't specified that in the Pipfile. Also took the opportunity to remove the pip version restriction which is no longer needed. Differential Revision: https://phabricator.services.mozilla.com/D63892 --HG-- extra : moz-landing-system : lando --- .../funsize-update-generator/Dockerfile | 6 +- .../docker/funsize-update-generator/Pipfile | 2 +- .../funsize-update-generator/Pipfile.lock | 123 ++++++++++-------- .../scripts/update_pipfiles.sh | 3 - 4 files changed, 71 insertions(+), 63 deletions(-) diff --git a/taskcluster/docker/funsize-update-generator/Dockerfile b/taskcluster/docker/funsize-update-generator/Dockerfile index eeb6dde34a5d..49bf00c0b338 100644 --- a/taskcluster/docker/funsize-update-generator/Dockerfile +++ b/taskcluster/docker/funsize-update-generator/Dockerfile @@ -7,7 +7,7 @@ ENV DEBIAN_FRONTEND noninteractive # to make sure that files are removed within a single docker layer RUN apt-get update -q && \ apt-get install -yyq --no-install-recommends \ - python3.8 python3-setuptools python3-cryptography libgetopt-simple-perl \ + python3.8 libpython3.8-dev python3-setuptools python3-cryptography libgetopt-simple-perl \ bzip2 python3-requests python3-sh curl \ python3-dev gcc liblzma-dev xz-utils jq libdpkg-perl locales && \ apt-get clean @@ -22,8 +22,8 @@ ENV LC_ALL en_CA.UTF-8 # python-pip installs a lot of dependencies increasing the size of an image # drastically. Install it like this saves us almost 200M. -RUN bash -c "curl -L https://bootstrap.pypa.io/get-pip.py | python3" -RUN ["pip", "install", "pipenv<2018.10.9", "pip==18.0"] +RUN bash -c "curl -L https://bootstrap.pypa.io/get-pip.py | python3.8" +RUN ["pip", "install", "pipenv"] # scripts RUN mkdir /home/worker/bin diff --git a/taskcluster/docker/funsize-update-generator/Pipfile b/taskcluster/docker/funsize-update-generator/Pipfile index a5677e08c3df..9d401ba83b26 100644 --- a/taskcluster/docker/funsize-update-generator/Pipfile +++ b/taskcluster/docker/funsize-update-generator/Pipfile @@ -1,5 +1,5 @@ [requires] -python_version = '3.6' +python_version = '3.8' [packages] aiohttp = "*" diff --git a/taskcluster/docker/funsize-update-generator/Pipfile.lock b/taskcluster/docker/funsize-update-generator/Pipfile.lock index 84d029462656..94a81cb0df2d 100644 --- a/taskcluster/docker/funsize-update-generator/Pipfile.lock +++ b/taskcluster/docker/funsize-update-generator/Pipfile.lock @@ -1,11 +1,11 @@ { "_meta": { "hash": { - "sha256": "99aadbfad074e19038b66e1ac7d268cdf10db18212b3e02fe497b8cc60d8bfec" + "sha256": "802e28cd433f875179e9eca053675705f18f76f8b5b8a78b99bfbd15bcb62f86" }, "pipfile-spec": 6, "requires": { - "python_version": "3.6" + "python_version": "3.8" }, "sources": [ { @@ -71,11 +71,11 @@ }, "awscli": { "hashes": [ - "sha256:4c445c6853c137dbddb547242d05294f892d84a5fc6b8ee5077a50c85751b039", - "sha256:c42fc35d4e9f82ce72b2a8b8d54df3a57fe363b0763a473e72d0006b0d1e06ff" + "sha256:a6c1e569533708ab7d45c716bb508b40112b4de99fe3ecc3e79df7998992cba9", + "sha256:f5f9fd7801ed1d232651788e6c36dc5c465302baea9e20944015e4a45d4d875c" ], "index": "pypi", - "version": "==1.17.13" + "version": "==1.18.6" }, "backports.lzma": { "hashes": [ @@ -85,10 +85,10 @@ }, "botocore": { "hashes": [ - "sha256:6478d9207db6dbcb5106fd4db2cdd5194d0b2dc0b73776019d56877ab802fe87", - "sha256:6ffb78b331b0954cfe5c51958cb51522ab0e2999442422949b080a3e1bc76ee1" + "sha256:3319562f183f760f18f186914fc753f6a9c76c5783ba902fe75a934dd140bad8", + "sha256:cfb27bdf426b272d2bb336785eacb4860d8ba936ea9cc19f35fdab37f1eaa71e" ], - "version": "==1.14.13" + "version": "==1.15.6" }, "certifi": { "hashes": [ @@ -199,12 +199,6 @@ ], "version": "==0.15.2" }, - "frozendict": { - "hashes": [ - "sha256:774179f22db2ef8a106e9c38d4d1f8503864603db08de2e33be5b778230f6e45" - ], - "version": "==1.2" - }, "github3.py": { "hashes": [ "sha256:15a115c18f7bfcf934dfef7ab103844eb9f620c586bad65967708926da47cbda", @@ -214,10 +208,10 @@ }, "idna": { "hashes": [ - "sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407", - "sha256:ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c" + "sha256:7588d1c14ae4c77d74036e8c22ff447b26d0fde8f007354fd48a7814db15b7cb", + "sha256:a068a21ceac8a4d63dbfd964670474107f541babbd2250d61922f029858365fa" ], - "version": "==2.8" + "version": "==2.9" }, "idna-ssl": { "hashes": [ @@ -226,6 +220,13 @@ "markers": "python_version < '3.7'", "version": "==1.1.0" }, + "immutabledict": { + "hashes": [ + "sha256:43dde3e55dcb539537ae6189fb6b09a1d01e94db304e4506e94ca2d45ec14c47", + "sha256:7881e44098f13dd12d6fec00551d564433cb46776e8b2f3453128f715df4376a" + ], + "version": "==0.2.0" + }, "importlib-metadata": { "hashes": [ "sha256:06f5b3a99029c7134207dd882428a66992a9de2bef7c2b699b5641f9886c3302", @@ -236,10 +237,10 @@ }, "jmespath": { "hashes": [ - "sha256:3720a4b1bd659dd2eecad0666459b9788813e032b83e7ba58578e48254e0a0e6", - "sha256:bde2aef6f44302dfb30320115b17d030798de8c4110e28d5cf6cf91a7a31074c" + "sha256:695cb76fa78a10663425d5b73ddc5714eb711157e52704d69be03b1a02ba4fec", + "sha256:cca55c8d153173e21baa59983015ad0daf603f9cb799904ff057bfb8ff8dc2d9" ], - "version": "==0.9.4" + "version": "==0.9.5" }, "json-e": { "hashes": [ @@ -256,10 +257,10 @@ }, "jwcrypto": { "hashes": [ - "sha256:a87ac0922d09d9a65011f76d99849f1fbad3d95439c7452cebf4ab0871c2b665", - "sha256:e6c517d8998956e531f0a1c158b2f324c29a532a9c4b677bc30b3be14d60ad4d" + "sha256:618ded1d25d3f806a1ab05cee42633a5a2787af33fca8d8f539b0aa1478b3728", + "sha256:adbe1f6266cde35d40d5de6d1419612b3bd4c869b9332c88c9d7a9163d305100" ], - "version": "==0.6.0" + "version": "==0.7" }, "mar": { "hashes": [ @@ -278,30 +279,41 @@ }, "multidict": { "hashes": [ - "sha256:13f3ebdb5693944f52faa7b2065b751cb7e578b8dd0a5bb8e4ab05ad0188b85e", - "sha256:26502cefa86d79b86752e96639352c7247846515c864d7c2eb85d036752b643c", - "sha256:4fba5204d32d5c52439f88437d33ad14b5f228e25072a192453f658bddfe45a7", - "sha256:527124ef435f39a37b279653ad0238ff606b58328ca7989a6df372fd75d7fe26", - "sha256:5414f388ffd78c57e77bd253cf829373721f450613de53dc85a08e34d806e8eb", - "sha256:5eee66f882ab35674944dfa0d28b57fa51e160b4dce0ce19e47f495fdae70703", - "sha256:63810343ea07f5cd86ba66ab66706243a6f5af075eea50c01e39b4ad6bc3c57a", - "sha256:6bd10adf9f0d6a98ccc792ab6f83d18674775986ba9bacd376b643fe35633357", - "sha256:83c6ddf0add57c6b8a7de0bc7e2d656be3eefeff7c922af9a9aae7e49f225625", - "sha256:93166e0f5379cf6cd29746989f8a594fa7204dcae2e9335ddba39c870a287e1c", - "sha256:9a7b115ee0b9b92d10ebc246811d8f55d0c57e82dbb6a26b23c9a9a6ad40ce0c", - "sha256:a38baa3046cce174a07a59952c9f876ae8875ef3559709639c17fdf21f7b30dd", - "sha256:a6d219f49821f4b2c85c6d426346a5d84dab6daa6f85ca3da6c00ed05b54022d", - "sha256:a8ed33e8f9b67e3b592c56567135bb42e7e0e97417a4b6a771e60898dfd5182b", - "sha256:d7d428488c67b09b26928950a395e41cc72bb9c3d5abfe9f0521940ee4f796d4", - "sha256:dcfed56aa085b89d644af17442cdc2debaa73388feba4b8026446d168ca8dad7", - "sha256:f29b885e4903bd57a7789f09fe9d60b6475a6c1a4c0eca874d8558f00f9d4b51" + "sha256:317f96bc0950d249e96d8d29ab556d01dd38888fbe68324f46fd834b430169f1", + "sha256:42f56542166040b4474c0c608ed051732033cd821126493cf25b6c276df7dd35", + "sha256:4b7df040fb5fe826d689204f9b544af469593fb3ff3a069a6ad3409f742f5928", + "sha256:544fae9261232a97102e27a926019100a9db75bec7b37feedd74b3aa82f29969", + "sha256:620b37c3fea181dab09267cd5a84b0f23fa043beb8bc50d8474dd9694de1fa6e", + "sha256:6e6fef114741c4d7ca46da8449038ec8b1e880bbe68674c01ceeb1ac8a648e78", + "sha256:7774e9f6c9af3f12f296131453f7b81dabb7ebdb948483362f5afcaac8a826f1", + "sha256:85cb26c38c96f76b7ff38b86c9d560dea10cf3459bb5f4caf72fc1bb932c7136", + "sha256:a326f4240123a2ac66bb163eeba99578e9d63a8654a59f4688a79198f9aa10f8", + "sha256:ae402f43604e3b2bc41e8ea8b8526c7fa7139ed76b0d64fc48e28125925275b2", + "sha256:aee283c49601fa4c13adc64c09c978838a7e812f85377ae130a24d7198c0331e", + "sha256:b51249fdd2923739cd3efc95a3d6c363b67bbf779208e9f37fd5e68540d1a4d4", + "sha256:bb519becc46275c594410c6c28a8a0adc66fe24fef154a9addea54c1adb006f5", + "sha256:c2c37185fb0af79d5c117b8d2764f4321eeb12ba8c141a95d0aa8c2c1d0a11dd", + "sha256:dc561313279f9d05a3d0ffa89cd15ae477528ea37aa9795c4654588a3287a9ab", + "sha256:e439c9a10a95cb32abd708bb8be83b2134fa93790a4fb0535ca36db3dda94d20", + "sha256:fc3b4adc2ee8474cb3cd2a155305d5f8eda0a9c91320f83e55748e1fcb68f8e3" ], - "version": "==4.7.4" + "version": "==4.7.5" }, "pyasn1": { "hashes": [ + "sha256:014c0e9976956a08139dc0712ae195324a75e142284d5f87f1a87ee1b068a359", + "sha256:03840c999ba71680a131cfaee6fab142e1ed9bbd9c693e285cc6aca0d555e576", + "sha256:0458773cfe65b153891ac249bcf1b5f8f320b7c2ce462151f8fa74de8934becf", + "sha256:08c3c53b75eaa48d71cf8c710312316392ed40899cb34710d092e96745a358b7", "sha256:39c7e2ec30515947ff4e87fb6f456dfc6e84857d34be479c9d4a4ba4bf46aa5d", - "sha256:aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba" + "sha256:5c9414dcfede6e441f7e8f81b43b34e834731003427e5b09e4e00e3172a10f00", + "sha256:6e7545f1a61025a4e58bb336952c5061697da694db1cae97b116e9c46abcf7c8", + "sha256:78fa6da68ed2727915c4767bb386ab32cdba863caa7dbe473eaae45f9959da86", + "sha256:7ab8a544af125fb704feadb008c99a88805126fb525280b2270bb25cc1d78a12", + "sha256:99fcc3c8d804d1bc6d9a099921e39d827026409a58f2a720dcdb89374ea0c776", + "sha256:aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba", + "sha256:e89bf84b5437b532b0803ba5c9a5e054d21fec423a89952a74f87fa2c9b7bce2", + "sha256:fec3e9d8e36808a28efb59b489e4528c10ad0f480e57dcc32b4de5c9d8c9fdf3" ], "version": "==0.4.8" }, @@ -350,11 +362,11 @@ }, "requests": { "hashes": [ - "sha256:11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4", - "sha256:9cf5292fcd0f598c671cfc1e0d7d1a7f13bb8085e9a590f48c010551dc6c4b31" + "sha256:43999036bfa82904b6af1d99e4882b560e5e2c68e5c4b0aa03b655f3d7d73fee", + "sha256:b3f43d496c6daba4493e7c431722aeb7dbc6288f52a6e04e7b6023b0247817e6" ], "index": "pypi", - "version": "==2.22.0" + "version": "==2.23.0" }, "rsa": { "hashes": [ @@ -372,11 +384,11 @@ }, "scriptworker": { "hashes": [ - "sha256:7cea585e105645372635b133f26663a84d90c2454f2e1a710fb41edeb7b8a4f3", - "sha256:d4f22d98684db12333bb03b9157848fbf33c216be5fca62b050252537c18e6d9" + "sha256:49f8da6b554f648d12cb5074fc5398325a7cf750e8de8ca054b5a44bac45fb12", + "sha256:7aa07c3ba4da4b11e303ec73e10a7bcbef41b9c73d227adeafea181177fb1973" ], "index": "pypi", - "version": "==30.0.1" + "version": "==32.0.1" }, "sh": { "hashes": [ @@ -402,11 +414,11 @@ }, "taskcluster": { "hashes": [ - "sha256:8ba68ed6d0e227c4e9149c2cea47ca47fc074d90bb7639f161985427d79c6ab8", - "sha256:b7af65930516cbb8549bebb4197d36326c381eb3c09203cd34a4d541ca83c170", - "sha256:efa8e036bc4388dabb4e6fcf66c4c91f770113ba6376ef1c6bab51fb8aecff8f" + "sha256:7ed49431c68a562cd421dfdb2aa3e3a99e759bffbc208fcfe8eee27e219014e0", + "sha256:9f7ad8de338c894a5b916523b4e1150fb210b821dcd93c1fadf1016cc737844b", + "sha256:c1108a9611c540529f08c9c2a15d104fe8853e0fa6b2d97f030e69c0f3460925" ], - "version": "==24.3.0" + "version": "==25.3.0" }, "taskcluster-urls": { "hashes": [ @@ -436,7 +448,6 @@ "sha256:2f3db8b19923a873b3e5256dc9c2dedfa883e33d87c690d9c7913e1f40673cdc", "sha256:87716c2d2a7121198ebcb7ce7cccf6ce5e9ba539041cfbaeecfb641dc0bf6acc" ], - "markers": "python_version != '3.4'", "version": "==1.25.8" }, "yarl": { @@ -463,10 +474,10 @@ }, "zipp": { "hashes": [ - "sha256:5c56e330306215cd3553342cfafc73dda2c60792384117893f3a83f8a1209f50", - "sha256:d65287feb793213ffe11c0f31b81602be31448f38aeb8ffc2eb286c4f6f6657e" + "sha256:12248a63bbdf7548f89cb4c7cda4681e537031eda29c02ea29674bc6854460c2", + "sha256:7c0f8e91abc0dc07a5068f315c52cb30c66bfbc581e5b50704c8a2f6ebae794a" ], - "version": "==2.2.0" + "version": "==3.0.0" } }, "develop": {} diff --git a/taskcluster/docker/pipfile-updates/scripts/update_pipfiles.sh b/taskcluster/docker/pipfile-updates/scripts/update_pipfiles.sh index 4e1be303c2c5..44f87f69ce43 100755 --- a/taskcluster/docker/pipfile-updates/scripts/update_pipfiles.sh +++ b/taskcluster/docker/pipfile-updates/scripts/update_pipfiles.sh @@ -116,9 +116,6 @@ fi clone_repo ${PIP} install pipenv -# Bug 1497162 -# Can be removed when https://github.com/pypa/pipenv/issues/2924 is released -${PIP} install --user pip==18.0 update_pipfile "${PIPFILE_DIRECTORY}" echo "INFO: diffing old/new Pipfile.lock into ${DIFF_ARTIFACT}"