From 75e77c5e54a88286522c96b0b7e823fb57d5ff1f Mon Sep 17 00:00:00 2001 From: Trenton Holmes Date: Wed, 8 Jun 2022 12:04:30 -0700 Subject: [PATCH] Re-locks all dependencies and manually downgrades reportlab to 3.6.9 until piwheels issue is fixed --- Pipfile.lock | 106 ++++++++++++++++++++++++----------------------- requirements.txt | 25 +++++------ 2 files changed, 67 insertions(+), 64 deletions(-) diff --git a/Pipfile.lock b/Pipfile.lock index 45dd915d2..272c44be8 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -230,29 +230,31 @@ }, "cryptography": { "hashes": [ - "sha256:0a3bf09bb0b7a2c93ce7b98cb107e9170a90c51a0162a20af1c61c765b90e60b", - "sha256:1f64a62b3b75e4005df19d3b5235abd43fa6358d5516cfc43d87aeba8d08dd51", - "sha256:32db5cc49c73f39aac27574522cecd0a4bb7384e71198bc65a0d23f901e89bb7", - "sha256:4881d09298cd0b669bb15b9cfe6166f16fc1277b4ed0d04a22f3d6430cb30f1d", - "sha256:4e2dddd38a5ba733be6a025a1475a9f45e4e41139d1321f412c6b360b19070b6", - "sha256:53e0285b49fd0ab6e604f4c5d9c5ddd98de77018542e88366923f152dbeb3c29", - "sha256:70f8f4f7bb2ac9f340655cbac89d68c527af5bb4387522a8413e841e3e6628c9", - "sha256:7b2d54e787a884ffc6e187262823b6feb06c338084bbe80d45166a1cb1c6c5bf", - "sha256:7be666cc4599b415f320839e36367b273db8501127b38316f3b9f22f17a0b815", - "sha256:8241cac0aae90b82d6b5c443b853723bcc66963970c67e56e71a2609dc4b5eaf", - "sha256:82740818f2f240a5da8dfb8943b360e4f24022b093207160c77cadade47d7c85", - "sha256:8897b7b7ec077c819187a123174b645eb680c13df68354ed99f9b40a50898f77", - "sha256:c2c5250ff0d36fd58550252f54915776940e4e866f38f3a7866d92b32a654b86", - "sha256:ca9f686517ec2c4a4ce930207f75c00bf03d94e5063cbc00a1dc42531511b7eb", - "sha256:d2b3d199647468d410994dbeb8cec5816fb74feb9368aedf300af709ef507e3e", - "sha256:da73d095f8590ad437cd5e9faf6628a218aa7c387e1fdf67b888b47ba56a17f0", - "sha256:e167b6b710c7f7bc54e67ef593f8731e1f45aa35f8a8a7b72d6e42ec76afd4b3", - "sha256:ea634401ca02367c1567f012317502ef3437522e2fc44a3ea1844de028fa4b84", - "sha256:ec6597aa85ce03f3e507566b8bcdf9da2227ec86c4266bd5e6ab4d9e0cc8dab2", - "sha256:f64b232348ee82f13aac22856515ce0195837f6968aeaa94a3d0353ea2ec06a6" + "sha256:093cb351031656d3ee2f4fa1be579a8c69c754cf874206be1d4cf3b542042804", + "sha256:0cc20f655157d4cfc7bada909dc5cc228211b075ba8407c46467f63597c78178", + "sha256:1b9362d34363f2c71b7853f6251219298124aa4cc2075ae2932e64c91a3e2717", + "sha256:1f3bfbd611db5cb58ca82f3deb35e83af34bb8cf06043fa61500157d50a70982", + "sha256:2bd1096476aaac820426239ab534b636c77d71af66c547b9ddcd76eb9c79e004", + "sha256:31fe38d14d2e5f787e0aecef831457da6cec68e0bb09a35835b0b44ae8b988fe", + "sha256:3b8398b3d0efc420e777c40c16764d6870bcef2eb383df9c6dbb9ffe12c64452", + "sha256:3c81599befb4d4f3d7648ed3217e00d21a9341a9a688ecdd615ff72ffbed7336", + "sha256:419c57d7b63f5ec38b1199a9521d77d7d1754eb97827bbb773162073ccd8c8d4", + "sha256:46f4c544f6557a2fefa7ac8ac7d1b17bf9b647bd20b16decc8fbcab7117fbc15", + "sha256:471e0d70201c069f74c837983189949aa0d24bb2d751b57e26e3761f2f782b8d", + "sha256:59b281eab51e1b6b6afa525af2bd93c16d49358404f814fe2c2410058623928c", + "sha256:731c8abd27693323b348518ed0e0705713a36d79fdbd969ad968fbef0979a7e0", + "sha256:95e590dd70642eb2079d280420a888190aa040ad20f19ec8c6e097e38aa29e06", + "sha256:a68254dd88021f24a68b613d8c51d5c5e74d735878b9e32cc0adf19d1f10aaf9", + "sha256:a7d5137e556cc0ea418dca6186deabe9129cee318618eb1ffecbd35bee55ddc1", + "sha256:aeaba7b5e756ea52c8861c133c596afe93dd716cbcacae23b80bc238202dc023", + "sha256:dc26bb134452081859aa21d4990474ddb7e863aa39e60d1592800a8865a702de", + "sha256:e53258e69874a306fcecb88b7534d61820db8a98655662a3dd2ec7f1afd9132f", + "sha256:ef15c2df7656763b4ff20a9bc4381d8352e6640cfeb95c2972c38ef508e75181", + "sha256:f224ad253cc9cea7568f49077007d2263efa57396a2f2f78114066fd54b5c68e", + "sha256:f8ec91983e638a9bcd75b39f1396e5c0dc2330cbd9ce4accefe68717e6779e0a" ], "markers": "python_version >= '3.6'", - "version": "==36.0.2" + "version": "==37.0.2" }, "daphne": { "hashes": [ @@ -272,19 +274,19 @@ }, "django": { "hashes": [ - "sha256:07c8638e7a7f548dc0acaaa7825d84b7bd42b10e8d22268b3d572946f1e9b687", - "sha256:4e8177858524417563cc0430f29ea249946d831eacb0068a1455686587df40b5" + "sha256:502ae42b6ab1b612c933fb50d5ff850facf858a4c212f76946ecd8ea5b3bf2d9", + "sha256:f7431a5de7277966f3785557c3928433347d998c1e6459324501378a291e5aab" ], "index": "pypi", - "version": "==4.0.4" + "version": "==4.0.5" }, "django-cors-headers": { "hashes": [ - "sha256:39d1d5acb872c1860ecfd88b8572bfbb3a1f201b5685ede951d71fc57c7dfae5", - "sha256:5f07e2ff8a95c887698e748588a4a0b2ad0ad1b5a292e2d33132f1253e2a97cb" + "sha256:37e42883b5f1f2295df6b4bba96eb2417a14a03270cb24b2a07f021cd4487cf4", + "sha256:f9dc6b4e3f611c3199700b3e5f3398c28757dcd559c2f82932687f3d0443cfdf" ], "index": "pypi", - "version": "==3.12.0" + "version": "==3.13.0" }, "django-extensions": { "hashes": [ @@ -328,11 +330,11 @@ }, "filelock": { "hashes": [ - "sha256:b795f1b42a61bbf8ec7113c341dad679d772567b936fbd1bf43c9a238e673e20", - "sha256:c7b5fdb219b398a5b28c8e4c1893ef5f98ece6a38c6ab2c22e26ec161556fed6" + "sha256:37def7b658813cda163b56fc564cdc75e86d338246458c4c28ae84cabefa2404", + "sha256:3a0fd85166ad9dbab54c9aec96737b744106dc5f15c0b09a6744a445299fcf04" ], "index": "pypi", - "version": "==3.7.0" + "version": "==3.7.1" }, "fuzzywuzzy": { "extras": [ @@ -467,7 +469,7 @@ "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff", "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d" ], - "markers": "python_version >= '3.5'", + "markers": "python_version >= '3'", "version": "==3.3" }, "imap-tools": { @@ -686,11 +688,11 @@ }, "ocrmypdf": { "hashes": [ - "sha256:1169e7acee4cb12d0d61ca1c2cf1f78250ed5d2d0e33fd68f58defbaf3770af7", - "sha256:d132a9e5dcd73a477f8bd89f15de2c4ae64b394ca296644971fcd004168ace9d" + "sha256:7bf9a20bcc8d0c01712d8413a0a7275c32a95accc2de75e7bc6f6e69af468e3f", + "sha256:8a0a2fa07cf0aac4dea11990d27a15b552afa7ff2dfffdb322bfd8bd0b77751d" ], "index": "pypi", - "version": "==13.4.4" + "version": "==13.4.7" }, "packaging": { "hashes": [ @@ -718,11 +720,11 @@ }, "pdfminer.six": { "hashes": [ - "sha256:0960be95fe8724a4847f83d53d0331b890871f6035ba706841568caa2b541bf5", - "sha256:3d65c1a0f4a0465c709e191550ec77a684ebe0bcb562337ccbfb7aa228c52076" + "sha256:5a64c924410ac48501d6060b21638bf401db69f5b1bd57207df7fbc070ac8ae2", + "sha256:7e19b857ec76bcbd35665909ad8965a481ad48d9bdff6c45f8522ee66f8a7aab" ], "index": "pypi", - "version": "==20220506" + "version": "==20220524" }, "pikepdf": { "hashes": [ @@ -925,11 +927,11 @@ }, "python-magic": { "hashes": [ - "sha256:8262c13001f904ad5b724d38b5e5b5f17ec0450ae249def398a62e4e33108a50", - "sha256:b978c4b69a20510d133a7f488910c2f07e7796f1f31703e61c241973f2bbf5fb" + "sha256:c1ba14b08e4a5f5c31a302b7721239695b2f0f058d125bd5ce1ee36b9d9d3c3b", + "sha256:c212960ad306f700aa0d01e5d7a325d20548ff97eb9920dcd29513174f0294d3" ], "index": "pypi", - "version": "==0.4.26" + "version": "==0.4.27" }, "pytz": { "hashes": [ @@ -1207,11 +1209,11 @@ }, "setuptools": { "hashes": [ - "sha256:68e45d17c9281ba25dc0104eadd2647172b3472d9e01f911efa57965e8d51a36", - "sha256:a43bdedf853c670e5fed28e5623403bad2f73cf02f9a2774e91def6bda8265a7" + "sha256:d1746e7fd520e83bbe210d02fff1aa1a425ad671c7a9da7d246ec2401a087198", + "sha256:e7d11f3db616cda0751372244c2ba798e8e56a28e096ec4529010b803485f3fe" ], "markers": "python_version >= '3.7'", - "version": "==62.3.2" + "version": "==62.3.3" }, "six": { "hashes": [ @@ -1722,11 +1724,11 @@ }, "filelock": { "hashes": [ - "sha256:b795f1b42a61bbf8ec7113c341dad679d772567b936fbd1bf43c9a238e673e20", - "sha256:c7b5fdb219b398a5b28c8e4c1893ef5f98ece6a38c6ab2c22e26ec161556fed6" + "sha256:37def7b658813cda163b56fc564cdc75e86d338246458c4c28ae84cabefa2404", + "sha256:3a0fd85166ad9dbab54c9aec96737b744106dc5f15c0b09a6744a445299fcf04" ], "index": "pypi", - "version": "==3.7.0" + "version": "==3.7.1" }, "identify": { "hashes": [ @@ -1741,7 +1743,7 @@ "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff", "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d" ], - "markers": "python_version >= '3.5'", + "markers": "python_version >= '3'", "version": "==3.3" }, "imagesize": { @@ -1852,11 +1854,11 @@ }, "myst-parser": { "hashes": [ - "sha256:1635ce3c18965a528d6de980f989ff64d6a1effb482e1f611b1bfb79e38f3d98", - "sha256:4c076d649e066f9f5c7c661bae2658be1ca06e76b002bb97f02a09398707686c" + "sha256:4965e51918837c13bf1c6f6fe2c6bddddf193148360fbdaefe743a4981358f6a", + "sha256:739a4d96773a8e55a2cacd3941ce46a446ee23dcd6b37e06f73f551ad7821d86" ], "index": "pypi", - "version": "==0.17.2" + "version": "==0.18.0" }, "nodeenv": { "hashes": [ @@ -2157,7 +2159,7 @@ "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc", "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f" ], - "markers": "python_version >= '3.7'", + "markers": "python_version < '3.11'", "version": "==2.0.1" }, "tornado": { @@ -2204,7 +2206,7 @@ "sha256:fa2ba70284fa42c2a5ecb35e322e68823288a4251f9ba9cc77be04ae15eada68", "sha256:fba85b6cd9c39be262fcd23865652920832b61583de2a2ca907dbd8e8a8c81e5" ], - "markers": "python_version >= '3.5'", + "markers": "python_version > '2.7'", "version": "==6.1" }, "tox": { diff --git a/requirements.txt b/requirements.txt index ebb4f2b11..339ce8070 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,8 +5,8 @@ # pipenv lock --requirements # --i https://pypi.python.org/simple/ ---extra-index-url https://www.piwheels.org/simple/ +-i https://pypi.python.org/simple +--extra-index-url https://www.piwheels.org/simple aioredis==1.3.1 anyio==3.6.1; python_full_version >= '3.6.2' arrow==1.2.2; python_version >= '3.6' @@ -26,17 +26,17 @@ click==8.1.3; python_version >= '3.7' coloredlogs==15.0.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' concurrent-log-handler==0.9.20 constantly==15.1.0 -cryptography==36.0.2; python_version >= '3.6' +cryptography==37.0.2; python_version >= '3.6' daphne==3.0.2; python_version >= '3.6' dateparser==1.1.1 -django-cors-headers==3.12.0 +django-cors-headers==3.13.0 django-extensions==3.1.5 django-filter==21.1 django-picklefield==3.0.1; python_version >= '3' django-q==1.3.9 -django==4.0.4 +django==4.0.5 djangorestframework==3.13.1 -filelock==3.7.0 +filelock==3.7.1 fuzzywuzzy[speedup]==0.18.0 gunicorn==20.1.0 h11==0.13.0; python_version >= '3.6' @@ -44,7 +44,7 @@ hiredis==2.0.0; python_version >= '3.6' httptools==0.4.0 humanfriendly==10.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' hyperlink==21.0.0 -idna==3.3; python_version >= '3.5' +idna==3.3; python_version >= '3' imap-tools==0.55.0 img2pdf==0.4.4 importlib-resources==5.7.1; python_version < '3.9' @@ -56,11 +56,11 @@ langdetect==1.0.9 lxml==4.9.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' msgpack==1.0.4 numpy==1.22.4; python_version >= '3.8' -ocrmypdf==13.4.4 +ocrmypdf==13.4.7 packaging==21.3; python_version >= '3.6' pathvalidate==2.5.0 pdf2image==1.16.0 -pdfminer.six==20220506 +pdfminer.six==20220524 pikepdf==5.1.3 pillow==9.1.1 pluggy==1.0.0; python_version >= '3.6' @@ -75,19 +75,20 @@ python-dateutil==2.8.2 python-dotenv==0.20.0 python-gnupg==0.4.9 python-levenshtein==0.12.2 -python-magic==0.4.26 +python-magic==0.4.27 pytz-deprecation-shim==0.1.0.post0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' pytz==2022.1 pyyaml==6.0 pyzbar==0.1.9 redis==3.5.3 regex==2022.3.2; python_version >= '3.6' -reportlab==3.6.10; python_version >= '3.7' and python_version < '4' +# WARNING: Temporary manual change as piwheels build failed for 3.6.10 +reportlab==3.6.9; python_version >= '3.7' and python_version < '4' requests==2.27.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' scikit-learn==1.0.2 scipy==1.8.1; python_version < '3.11' and python_version >= '3.8' service-identity==21.1.0 -setuptools==62.3.2; python_version >= '3.7' +setuptools==62.3.3; python_version >= '3.7' six==1.16.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' sniffio==1.2.0; python_version >= '3.5' sqlparse==0.4.2; python_version >= '3.5'