Skip to content

Commit 61d3092

Browse files
bhearsumbhearsum
authored
Fix up local tests in fresh environments (#2810)
* Update maintenance script to run pip-compile-multi in a way that's compatible with local dev environments Local dev environments need to have `setuptools` pinned (I honestly don't remember exactly why right now...but anything that uses Dockerfile.test complains about it if it's not at the moment. This means we need `--allow-unsafe` (which is actually going to become default pip behaviour in the future anyways....) I also added `--backtracking` because when I tried to repin I got a complaint about dependency resolution with `pyjwt` /shrug. * s/whitelist_externals/allowlist_externals/ in tox.ini & update requirements Both of these are necessary to get plain `tox` invocations of tests working again AFAICT. (If you have a much older docker image they may still be working, but it certainly doesn't with a fresh one.)
1 parent 4c25439 commit 61d3092

File tree

11 files changed

+393
-372
lines changed

11 files changed

+393
-372
lines changed

‎agent/requirements/base.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -274,13 +274,13 @@ multidict==6.0.4 \
274274
# via
275275
# aiohttp
276276
# yarl
277-
sentry-sdk==1.12.1 \
278-
--hash=sha256:5bbe4b72de22f9ac1e67f2a4e6efe8fbd595bb59b7b223443f50fe5802a5551c \
279-
--hash=sha256:9f0b960694e2d8bb04db4ba6ac2a645040caef4e762c65937998ff06064f10d6
277+
sentry-sdk==1.14.0 \
278+
--hash=sha256:273fe05adf052b40fd19f6d4b9a5556316807246bd817e5e3482930730726bb0 \
279+
--hash=sha256:72c00322217d813cf493fe76590b23a757e063ff62fec59299f4af7201dd4448
280280
# via -r requirements/base.in
281-
urllib3==1.26.13 \
282-
--hash=sha256:47cc05d99aaa09c9e72ed5809b60e7ba354e64b59c9c173ac3018642d8bb41fc \
283-
--hash=sha256:c083dd0dce68dbfbe1129d5271cb90f9447dea7d52097c6e0126120c521ddea8
281+
urllib3==1.26.14 \
282+
--hash=sha256:076907bf8fd355cde77728471316625a4d2f7e713c125f51953bb5b3eecf4f72 \
283+
--hash=sha256:75edcdc2f7d85b137124a6c3c9fc3933cdeaa12ecb9a6a959f22797a0feca7e1
284284
# via sentry-sdk
285285
yarl==1.8.2 \
286286
--hash=sha256:009a028127e0a1755c38b03244c0bea9d5565630db9c4cf9572496e947137a87 \

‎agent/requirements/local.txt

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
# pip-compile-multi
77
#
88
-r test.txt
9-
cachetools==5.2.0 \
10-
--hash=sha256:6a94c6402995a99c3970cc7e4884bb60b4a8639938157eeed436098bf9831757 \
11-
--hash=sha256:f9f17d2aec496a9aa6b76f53e3b614c965223c061982d434d160f930c698a9db
9+
cachetools==5.3.0 \
10+
--hash=sha256:13dfddc7b8df938c21a940dfa6557ce6e94a2f1cdfa58eb90c805721d58f2c14 \
11+
--hash=sha256:429e1a1e845c008ea6c85aa35d4b98b65d6a9763eeef3e37e92728a12d1de9d4
1212
# via tox
1313
chardet==5.1.0 \
1414
--hash=sha256:0d62712b956bc154f85fb0a266e2a3c5913c2967e00348701b32411d6def31e5 \
@@ -28,20 +28,15 @@ filelock==3.9.0 \
2828
# via
2929
# tox
3030
# virtualenv
31-
pyproject-api==1.2.1 \
32-
--hash=sha256:093c047d192ceadcab7afd6b501276bf2ce44adf41cb9c313234518cddd20818 \
33-
--hash=sha256:155d5623453173b7b4e9379a3146ccef2d52335234eb2d03d6ba730e7dad179c
31+
pyproject-api==1.5.0 \
32+
--hash=sha256:0962df21f3e633b8ddb9567c011e6c1b3dcdfc31b7860c0ede7e24c5a1200fbe \
33+
--hash=sha256:4c111277dfb96bcd562c6245428f27250b794bfe3e210b8714c4f893952f2c17
3434
# via tox
35-
tox==4.1.3 \
36-
--hash=sha256:9976b41def48a5a2dce477de2c90c8231a5166829aaca916d0952ec4d7429f43 \
37-
--hash=sha256:f1840b1698e5187d4c3bae4fe41332c2f3fedde3b6773474899f9e0b329a41dd
35+
tox==4.3.5 \
36+
--hash=sha256:307993257d792a12a63ff86a0b67a71a5ab2d4a2cc12bbae947115224d4ac3fb \
37+
--hash=sha256:6dddc4c69718b65aacbef0921ffa8af065b0f63ff0b24ffc403477975853c918
3838
# via -r requirements/local.in
3939
virtualenv==20.17.1 \
4040
--hash=sha256:ce3b1684d6e1a20a3e5ed36795a97dfc6af29bc3970ca8dab93e11ac6094b3c4 \
4141
--hash=sha256:f8b927684efc6f1cc206c9db297a570ab9ad0e51c16fa9e45487d36d1905c058
4242
# via tox
43-
44-
# WARNING: The following packages were not pinned, but pip requires them to be
45-
# pinned when the requirements file includes hashes. Consider using the --allow-unsafe flag.
46-
# pip
47-
# setuptools

‎agent/requirements/test.txt

Lines changed: 82 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ black==22.12.0 \
2424
--hash=sha256:c116eed0efb9ff870ded8b62fe9f28dd61ef6e9ddd28d83d7d264a38417dcee2 \
2525
--hash=sha256:d30b212bffeb1e252b31dd269dfae69dd17e06d92b87ad26e23890f3efea366f
2626
# via -r requirements/test.in
27-
build==0.9.0 \
28-
--hash=sha256:1a07724e891cbd898923145eb7752ee7653674c511378eb9c7691aab1612bc3c \
29-
--hash=sha256:38a7a2b7a0bdc61a42a0a67509d88c71ecfc37b393baba770fae34e20929ff69
27+
build==0.10.0 \
28+
--hash=sha256:af266720050a66c893a6096a2f410989eeac74ff9a68ba194b3f6473e8e26171 \
29+
--hash=sha256:d5b71264afdb5951d6704482aac78de887c80691c52b88a9ad195983ca2c9269
3030
# via
3131
# check-manifest
3232
# pip-tools
@@ -41,58 +41,58 @@ click==8.1.3 \
4141
# black
4242
# pip-compile-multi
4343
# pip-tools
44-
coverage[toml]==7.0.2 \
45-
--hash=sha256:04691b8e832a900ed15f5bcccc2008fc2d1c8e7411251fd7d1422a84e1d72841 \
46-
--hash=sha256:1a613d60be1a02c7a5184ea5c4227f48c08e0635608b9c17ae2b17efef8f2501 \
47-
--hash=sha256:1d732b5dcafed67d81c5b5a0c404c31a61e13148946a3b910a340f72fdd1ec95 \
48-
--hash=sha256:2b31f7f246dbff339b3b76ee81329e3eca5022ce270c831c65e841dbbb40115f \
49-
--hash=sha256:312fd77258bf1044ef4faa82091f2e88216e4b62dcf1a461d3e917144c8b09b7 \
50-
--hash=sha256:321316a7b979892a13c148a9d37852b5a76f26717e4b911b606a649394629532 \
51-
--hash=sha256:36c1a1b6d38ebf8a4335f65226ec36b5d6fd67743fdcbad5c52bdcd46c4f5842 \
52-
--hash=sha256:38f281bb9bdd4269c451fed9451203512dadefd64676f14ed1e82c77eb5644fc \
53-
--hash=sha256:3a2d81c95d3b02638ee6ae647edc79769fd29bf5e9e5b6b0c29040579f33c260 \
54-
--hash=sha256:3d40ad86a348c79c614e2b90566267dd6d45f2e6b4d2bfb794d78ea4a4b60b63 \
55-
--hash=sha256:3d72e3d20b03e63bd27b1c4d6b754cd93eca82ecc5dd77b99262d5f64862ca35 \
56-
--hash=sha256:3fbb59f84c8549113dcdce7c6d16c5731fe53651d0b46c0a25a5ebc7bb655869 \
57-
--hash=sha256:405d8528a0ea07ca516d9007ecad4e1bd10e2eeef27411c6188d78c4e2dfcddc \
58-
--hash=sha256:420f10c852b9a489cf5a764534669a19f49732a0576c76d9489ebf287f81af6d \
59-
--hash=sha256:426895ac9f2938bec193aa998e7a77a3e65d3e46903f348e794b4192b9a5b61e \
60-
--hash=sha256:4438ba539bef21e288092b30ea2fc30e883d9af5b66ebeaf2fd7c25e2f074e39 \
61-
--hash=sha256:46db409fc0c3ee5c859b84c7de9cb507166287d588390889fdf06a1afe452e16 \
62-
--hash=sha256:483e120ea324c7fced6126bb9bf0535c71e9233d29cbc7e2fc4560311a5f8a32 \
63-
--hash=sha256:4d7be755d7544dac2b9814e98366a065d15a16e13847eb1f5473bb714483391e \
64-
--hash=sha256:4e97b21482aa5c21e049e4755c95955ad71fb54c9488969e2f17cf30922aa5f6 \
65-
--hash=sha256:5f44ba7c07e0aa4a7a2723b426c254e952da82a33d65b4a52afae4bef74a4203 \
66-
--hash=sha256:62e5b942378d5f0b87caace567a70dc634ddd4d219a236fa221dc97d2fc412c8 \
67-
--hash=sha256:7c669be1b01e4b2bf23aa49e987d9bedde0234a7da374a9b77ca5416d7c57002 \
68-
--hash=sha256:7d47d666e17e57ef65fefc87229fde262bd5c9039ae8424bc53aa2d8f07dc178 \
69-
--hash=sha256:7e184aa18f921b612ea08666c25dd92a71241c8ed40917f2824219c92289b8c7 \
70-
--hash=sha256:80583c536e7e010e301002088919d4ea90566d1789ee02551574fdf3faa275ae \
71-
--hash=sha256:8217f73faf08623acb25fb2affd5d20cbcd8185213db308e46a37e6fd6a56a49 \
72-
--hash=sha256:87d95eea58fb71f69b4f1c761099a19e0e9cb27d45dc1cc7042523128ee56337 \
73-
--hash=sha256:8bd466135fb07f693dbdd999a5569ffbc0590e9c64df859243162f0ebee950c8 \
74-
--hash=sha256:8e133ca2f8141b415ff396ba789bdeffdea8ff9a5c7fc9996ccf591d7d40ee93 \
75-
--hash=sha256:8e6c0ca447b557a32642f22d0987be37950eda51c4f19fc788cebc99426284b6 \
76-
--hash=sha256:9de96025ce25b9f4e744fbe558a003e673004af255da9b1f6ec243720ac5deeb \
77-
--hash=sha256:a27a8dca0dc6f0944ed9fd83c556d862e227a5cd4220e62af5d4c750389938f0 \
78-
--hash=sha256:a2d4f68e4fa286fb6b00d58a1e87c79840e289d3f6e5dcb912ad7b0fbd9629fb \
79-
--hash=sha256:a6e1c77ff6f10eab496fbbcdaa7dfae84968928a0aadc43ce3c3453cec29bd79 \
80-
--hash=sha256:a7b018811a0e1d3869d8d0600849953acd355a3a29c6bee0fbd24d7772bcc0a2 \
81-
--hash=sha256:a99b2f2dd1236e8d9dc35974a3dc298a408cdfd512b0bb2451798cff1ce63408 \
82-
--hash=sha256:ac1033942851bf01f28c76318155ea92d6648aecb924cab81fa23781d095e9ab \
83-
--hash=sha256:b6936cd38757dd323fefc157823e46436610328f0feb1419a412316f24b77f36 \
84-
--hash=sha256:b6eab230b18458707b5c501548e997e42934b1c189fb4d1b78bf5aacc1c6a137 \
85-
--hash=sha256:bcb57d175ff0cb4ff97fc547c74c1cb8d4c9612003f6d267ee78dad8f23d8b30 \
86-
--hash=sha256:c1f02d016b9b6b5ad21949a21646714bfa7b32d6041a30f97674f05d6d6996e3 \
87-
--hash=sha256:c40aaf7930680e0e5f3bd6d3d3dc97a7897f53bdce925545c4b241e0c5c3ca6a \
88-
--hash=sha256:c5e1874c601128cf54c1d4b471e915658a334fbc56d7b3c324ddc7511597ea82 \
89-
--hash=sha256:c8805673b1953313adfc487d5323b4c87864e77057944a0888c98dd2f7a6052f \
90-
--hash=sha256:da458bdc9b0bcd9b8ca85bc73148631b18cc8ba03c47f29f4c017809990351aa \
91-
--hash=sha256:dcb708ab06f3f4dfc99e9f84821c9120e5f12113b90fad132311a2cb97525379 \
92-
--hash=sha256:dfafc350f43fd7dc67df18c940c3b7ed208ebb797abe9fb3047f0c65be8e4c0f \
93-
--hash=sha256:e8931af864bd599c6af626575a02103ae626f57b34e3af5537d40b040d33d2ad \
94-
--hash=sha256:efa9d943189321f67f71070c309aa6f6130fa1ec35c9dfd0da0ed238938ce573 \
95-
--hash=sha256:fd22ee7bff4b5c37bb6385efee1c501b75e29ca40286f037cb91c2182d1348ce
44+
coverage[toml]==7.0.5 \
45+
--hash=sha256:051afcbd6d2ac39298d62d340f94dbb6a1f31de06dfaf6fcef7b759dd3860c45 \
46+
--hash=sha256:0a1890fca2962c4f1ad16551d660b46ea77291fba2cc21c024cd527b9d9c8809 \
47+
--hash=sha256:0ee30375b409d9a7ea0f30c50645d436b6f5dfee254edffd27e45a980ad2c7f4 \
48+
--hash=sha256:13250b1f0bd023e0c9f11838bdeb60214dd5b6aaf8e8d2f110c7e232a1bff83b \
49+
--hash=sha256:17e01dd8666c445025c29684d4aabf5a90dc6ef1ab25328aa52bedaa95b65ad7 \
50+
--hash=sha256:19245c249aa711d954623d94f23cc94c0fd65865661f20b7781210cb97c471c0 \
51+
--hash=sha256:1caed2367b32cc80a2b7f58a9f46658218a19c6cfe5bc234021966dc3daa01f0 \
52+
--hash=sha256:1f66862d3a41674ebd8d1a7b6f5387fe5ce353f8719040a986551a545d7d83ea \
53+
--hash=sha256:220e3fa77d14c8a507b2d951e463b57a1f7810a6443a26f9b7591ef39047b1b2 \
54+
--hash=sha256:276f4cd0001cd83b00817c8db76730938b1ee40f4993b6a905f40a7278103b3a \
55+
--hash=sha256:29de916ba1099ba2aab76aca101580006adfac5646de9b7c010a0f13867cba45 \
56+
--hash=sha256:2a7f23bbaeb2a87f90f607730b45564076d870f1fb07b9318d0c21f36871932b \
57+
--hash=sha256:2c407b1950b2d2ffa091f4e225ca19a66a9bd81222f27c56bd12658fc5ca1209 \
58+
--hash=sha256:30b5fec1d34cc932c1bc04017b538ce16bf84e239378b8f75220478645d11fca \
59+
--hash=sha256:3c2155943896ac78b9b0fd910fb381186d0c345911f5333ee46ac44c8f0e43ab \
60+
--hash=sha256:411d4ff9d041be08fdfc02adf62e89c735b9468f6d8f6427f8a14b6bb0a85095 \
61+
--hash=sha256:436e103950d05b7d7f55e39beeb4d5be298ca3e119e0589c0227e6d0b01ee8c7 \
62+
--hash=sha256:49640bda9bda35b057b0e65b7c43ba706fa2335c9a9896652aebe0fa399e80e6 \
63+
--hash=sha256:4a950f83fd3f9bca23b77442f3a2b2ea4ac900944d8af9993743774c4fdc57af \
64+
--hash=sha256:50a6adc2be8edd7ee67d1abc3cd20678987c7b9d79cd265de55941e3d0d56499 \
65+
--hash=sha256:52ab14b9e09ce052237dfe12d6892dd39b0401690856bcfe75d5baba4bfe2831 \
66+
--hash=sha256:54f7e9705e14b2c9f6abdeb127c390f679f6dbe64ba732788d3015f7f76ef637 \
67+
--hash=sha256:66e50680e888840c0995f2ad766e726ce71ca682e3c5f4eee82272c7671d38a2 \
68+
--hash=sha256:790e4433962c9f454e213b21b0fd4b42310ade9c077e8edcb5113db0818450cb \
69+
--hash=sha256:7a38362528a9115a4e276e65eeabf67dcfaf57698e17ae388599568a78dcb029 \
70+
--hash=sha256:7b05ed4b35bf6ee790832f68932baf1f00caa32283d66cc4d455c9e9d115aafc \
71+
--hash=sha256:7e109f1c9a3ece676597831874126555997c48f62bddbcace6ed17be3e372de8 \
72+
--hash=sha256:949844af60ee96a376aac1ded2a27e134b8c8d35cc006a52903fc06c24a3296f \
73+
--hash=sha256:95304068686545aa368b35dfda1cdfbbdbe2f6fe43de4a2e9baa8ebd71be46e2 \
74+
--hash=sha256:9e662e6fc4f513b79da5d10a23edd2b87685815b337b1a30cd11307a6679148d \
75+
--hash=sha256:a9fed35ca8c6e946e877893bbac022e8563b94404a605af1d1e6accc7eb73289 \
76+
--hash=sha256:b69522b168a6b64edf0c33ba53eac491c0a8f5cc94fa4337f9c6f4c8f2f5296c \
77+
--hash=sha256:b78729038abea6a5df0d2708dce21e82073463b2d79d10884d7d591e0f385ded \
78+
--hash=sha256:b8c56bec53d6e3154eaff6ea941226e7bd7cc0d99f9b3756c2520fc7a94e6d96 \
79+
--hash=sha256:b9727ac4f5cf2cbf87880a63870b5b9730a8ae3a4a360241a0fdaa2f71240ff0 \
80+
--hash=sha256:ba3027deb7abf02859aca49c865ece538aee56dcb4871b4cced23ba4d5088904 \
81+
--hash=sha256:be9fcf32c010da0ba40bf4ee01889d6c737658f4ddff160bd7eb9cac8f094b21 \
82+
--hash=sha256:c18d47f314b950dbf24a41787ced1474e01ca816011925976d90a88b27c22b89 \
83+
--hash=sha256:c76a3075e96b9c9ff00df8b5f7f560f5634dffd1658bafb79eb2682867e94f78 \
84+
--hash=sha256:cbfcba14a3225b055a28b3199c3d81cd0ab37d2353ffd7f6fd64844cebab31ad \
85+
--hash=sha256:d254666d29540a72d17cc0175746cfb03d5123db33e67d1020e42dae611dc196 \
86+
--hash=sha256:d66187792bfe56f8c18ba986a0e4ae44856b1c645336bd2c776e3386da91e1dd \
87+
--hash=sha256:d8d04e755934195bdc1db45ba9e040b8d20d046d04d6d77e71b3b34a8cc002d0 \
88+
--hash=sha256:d8f3e2e0a1d6777e58e834fd5a04657f66affa615dae61dd67c35d1568c38882 \
89+
--hash=sha256:e057e74e53db78122a3979f908973e171909a58ac20df05c33998d52e6d35757 \
90+
--hash=sha256:e4ce984133b888cc3a46867c8b4372c7dee9cee300335e2925e197bcd45b9e16 \
91+
--hash=sha256:ea76dbcad0b7b0deb265d8c36e0801abcddf6cc1395940a24e3595288b405ca0 \
92+
--hash=sha256:ecb0f73954892f98611e183f50acdc9e21a4653f294dfbe079da73c6378a6f47 \
93+
--hash=sha256:ef14d75d86f104f03dea66c13188487151760ef25dd6b2dbd541885185f05f40 \
94+
--hash=sha256:f26648e1b3b03b6022b48a9b910d0ae209e2d51f50441db5dce5b530fad6d9b1 \
95+
--hash=sha256:f67472c09a0c7486e27f3275f617c964d25e35727af952869dd496b9b5b7f6a3
9696
# via
9797
# -r requirements/test.in
9898
# pytest-cov
@@ -108,9 +108,9 @@ flake8==6.0.0 \
108108
--hash=sha256:3833794e27ff64ea4e9cf5d410082a8b97ff1a06c16aa3d2027339cd0f1195c7 \
109109
--hash=sha256:c61007e76655af75e6785a931f452915b371dc48f56efd765247c8fe68f2b181
110110
# via -r requirements/test.in
111-
iniconfig==1.1.1 \
112-
--hash=sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3 \
113-
--hash=sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32
111+
iniconfig==2.0.0 \
112+
--hash=sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3 \
113+
--hash=sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374
114114
# via pytest
115115
isort==5.11.4 \
116116
--hash=sha256:6db30c5ded9815d813932c04c2f85a360bcdd35fed496f4d8f35495ef0a261b6 \
@@ -124,20 +124,20 @@ mypy-extensions==0.4.3 \
124124
--hash=sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d \
125125
--hash=sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8
126126
# via black
127-
packaging==22.0 \
128-
--hash=sha256:2198ec20bd4c017b8f9717e00f0c8714076fc2fd93816750ab48e2c41de2cfd3 \
129-
--hash=sha256:957e2148ba0e1a3b282772e791ef1d8083648bc131c8ab0c1feba110ce1146c3
127+
packaging==23.0 \
128+
--hash=sha256:714ac14496c3e68c99c29b00845f7a2b85f3bb6f1078fd9f72fd20f0570002b2 \
129+
--hash=sha256:b6ad297f8907de0fa2fe1ccbd26fdaf387f5f47c7275fedf8cce89f99446cf97
130130
# via
131131
# build
132132
# pytest
133133
pathspec==0.10.3 \
134134
--hash=sha256:3c95343af8b756205e2aba76e843ba9520a24dd84f68c22b9f93251507509dd6 \
135135
--hash=sha256:56200de4077d9d0791465aa9095a01d421861e405b5096955051deefd697d6f6
136136
# via black
137-
pep517==0.13.0 \
138-
--hash=sha256:4ba4446d80aed5b5eac6509ade100bff3e7943a8489de249654a5ae9b33ee35b \
139-
--hash=sha256:ae69927c5c172be1add9203726d4b84cf3ebad1edcd5f71fcdc746e66e829f59
140-
# via build
137+
pip==22.3.1 \
138+
--hash=sha256:65fd48317359f3af8e593943e6ae1506b66325085ea64b706a998c6e83eeaf38 \
139+
--hash=sha256:908c78e6bc29b676ede1c4d57981d490cb892eb45cd8c214ab6298125119e077
140+
# via pip-tools
141141
pip-compile-multi==2.6.1 \
142142
--hash=sha256:902d2a3534ba6eb848010087cebbf823491cbcef20fd9924dc526c97aaec53a6 \
143143
--hash=sha256:e4408087c47c170b0812eaf7eaea12a526751eb3cd0acad2b00e199120060b44
@@ -162,9 +162,13 @@ pyflakes==3.0.1 \
162162
--hash=sha256:ec55bf7fe21fff7f1ad2f7da62363d749e2a470500eab1b555334b67aa1ef8cf \
163163
--hash=sha256:ec8b276a6b60bd80defed25add7e439881c19e64850afd9b346283d4165fd0fd
164164
# via flake8
165-
pytest==7.2.0 \
166-
--hash=sha256:892f933d339f068883b6fd5a459f03d85bfcb355e4981e146d2c7616c21fef71 \
167-
--hash=sha256:c4014eb40e10f11f355ad4e3c2fb2c6c6d1919c73f3b5a433de4708202cade59
165+
pyproject-hooks==1.0.0 \
166+
--hash=sha256:283c11acd6b928d2f6a7c73fa0d01cb2bdc5f07c57a2eeb6e83d5e56b97976f8 \
167+
--hash=sha256:f271b298b97f5955d53fb12b72c1fb1948c22c1a6b70b315c54cedaca0264ef5
168+
# via build
169+
pytest==7.2.1 \
170+
--hash=sha256:c7c6ca206e93355074ae32f7403e8ea12163b1163c976fee7d4d84027c162be5 \
171+
--hash=sha256:d45e0952f3727241918b8fd0f376f5ff6b301cc0777c6f9a556935c92d8a7d42
168172
# via
169173
# -r requirements/test.in
170174
# pytest-asyncio
@@ -182,6 +186,12 @@ pytest-xdist==3.1.0 \
182186
--hash=sha256:40fdb8f3544921c5dfcd486ac080ce22870e71d82ced6d2e78fa97c2addd480c \
183187
--hash=sha256:70a76f191d8a1d2d6be69fc440cdf85f3e4c03c08b520fd5dc5d338d6cf07d89
184188
# via -r requirements/test.in
189+
setuptools==66.1.1 \
190+
--hash=sha256:6f590d76b713d5de4e49fe4fbca24474469f53c83632d5d0fd056f7ff7e8112b \
191+
--hash=sha256:ac4008d396bc9cd983ea483cb7139c0240a07bbc74ffb6232fceffedc6cf03a8
192+
# via
193+
# check-manifest
194+
# pip-tools
185195
tomli==2.0.1 \
186196
--hash=sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc \
187197
--hash=sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f
@@ -190,10 +200,11 @@ tomli==2.0.1 \
190200
# build
191201
# check-manifest
192202
# coverage
203+
# pyproject-hooks
193204
# pytest
194-
toposort==1.7 \
195-
--hash=sha256:8ed8e109e96ae30bf66da2d2155e4eb9989d9c5c743c837e37d9774a4eddd804 \
196-
--hash=sha256:ddc2182c42912a440511bd7ff5d3e6a1cabc3accbc674a3258c8c41cbfbb2125
205+
toposort==1.9 \
206+
--hash=sha256:9f434c815e1bd2f9ad05152b6b0071b1f56e288c107869708f2463ec932e2637 \
207+
--hash=sha256:f41a34490d44934b533a7bdaff979ee8a47203fd2d8a746db83f2d5ab12458b9
197208
# via pip-compile-multi
198209
typing-extensions==4.4.0 \
199210
--hash=sha256:1511434bb92bf8dd198c12b1cc812e800d4181cfcb867674e0f8279cc93087aa \
@@ -203,8 +214,3 @@ wheel==0.38.4 \
203214
--hash=sha256:965f5259b566725405b05e7cf774052044b1ed30119b5d586b2703aafe8719ac \
204215
--hash=sha256:b60533f3f5d530e971d6737ca6d58681ee434818fab630c83a734bb10c083ce8
205216
# via pip-tools
206-
207-
# WARNING: The following packages were not pinned, but pip requires them to be
208-
# pinned when the requirements file includes hashes. Consider using the --allow-unsafe flag.
209-
# pip
210-
# setuptools

‎agent/tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
envlist = docker
33

44
[testenv:docker]
5-
whitelist_externals=docker
5+
allowlist_externals=docker
66
passenv =
77
PYTHON_VERSION
88
TOXENV

‎client/tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
envlist = docker
33

44
[testenv:docker]
5-
whitelist_externals=docker
5+
allowlist_externals=docker
66
deps =
77
usedevelop = false
88
depends =

‎maintenance/pin-helper.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,16 @@ pip install pip-compile-multi
1212

1313
apt-get update
1414

15-
ARGS="-g base -g docs -g test -g local"
15+
# --backtracing is required to work around issues with pyjwt, eg:
16+
# Using legacy resolver. Consider using backtracking resolver with `--resolver=backtracking`.
17+
# Could not find a version that matches pyjwt[crypto]==2.4.0,>=2.6.0 from https://files.pythonhosted.org/packages/1c/fb/b82e9601b00d88cf8bbee1f39b855ae773f9d5bcbcedb3801b2f72460696/PyJWT-2.4.0-py3-none-any.whl (from -r requirements/base.in (line 29))
18+
# --allow-unsafe is required because local dev environments need all deps hashed to install properly
19+
ARGS="-g base -g docs -g test -g local --backtracking --allow-unsafe"
1620
pip-compile-multi -o "$SUFFIX" $ARGS $EXTRA_PCM_ARGS
1721
sed -i 's/^repoze-lru/repoze.lru/' requirements/*.txt
1822
chmod 644 requirements/*.txt
1923

2024
cd agent
21-
ARGS="-g base -g test -g local"
25+
ARGS="-g base -g test -g local --backtracking --allow-unsafe"
2226
pip-compile-multi -o "$SUFFIX" $ARGS $EXTRA_PCM_ARGS
2327
chmod 644 requirements/*.txt

0 commit comments

Comments
 (0)