Skip to content

Commit ce56ca5

Browse files
committed
Fix tox for 4+
Update tox more
1 parent d1721cc commit ce56ca5

File tree

6 files changed

+27
-30
lines changed

6 files changed

+27
-30
lines changed

requirements/dev.txt

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1213,14 +1213,12 @@ six==1.16.0 \
12131213
# via
12141214
# -r requirements/prod.txt
12151215
# -r requirements/scripts.txt
1216-
# -r requirements/test.txt
12171216
# django-autocomplete-light
12181217
# html5lib
12191218
# l18n
12201219
# opensearch-py
12211220
# python-dateutil
12221221
# requests-aws4auth
1223-
# tox-pip-extensions
12241222
soupsieve==2.4.1 \
12251223
--hash=sha256:1c1bfee6819544a3447586c889157365a27e10d88cde3ad3da0cf0ddf646feb8 \
12261224
--hash=sha256:89d12b2d5dfcd2c9e8c22326da9d9aa9cb3dfab0a83a024f05704076ee8d35ea
@@ -1255,12 +1253,6 @@ tomli==2.0.1 \
12551253
tox==4.6.4 \
12561254
--hash=sha256:1b8f8ae08d6a5475cad9d508236c51ea060620126fd7c3c513d0f5c7f29cc776 \
12571255
--hash=sha256:5e2ad8845764706170d3dcaac171704513cc8a725655219acb62fe4380bdadda
1258-
# via
1259-
# -r requirements/test.txt
1260-
# tox-pip-extensions
1261-
tox-pip-extensions==1.6.0 \
1262-
--hash=sha256:38ab15ed5bcb1e1212e7a0a09e9def9d01ae5bb24073f6c6204e88456f970b49 \
1263-
--hash=sha256:58dffa74003988ce8fd4fa67db28d5749b7015d3f7923633143cdd392a1b4f1c
12641256
# via -r requirements/test.txt
12651257
tqdm==4.65.0 \
12661258
--hash=sha256:1871fb68a86b8fb3b59ca4cdd3dcccbc7e6d613eeed31f4c332531977b89beb5 \
@@ -1329,9 +1321,9 @@ wagtail-placeholder-images==0.1.1 \
13291321
--hash=sha256:44cbdb18e4123c8423758c21f9e25c399c3a1f8349791071786d62e1c6077c0f \
13301322
--hash=sha256:4f9070ce3ffaa2be02e0baf6c6b44c9f8d6d9302a60e384f85310c5e6b432bae
13311323
# via -r requirements/prod.txt
1332-
wagtail-sharing==2.9 \
1333-
--hash=sha256:2e285b709f08e3ae373a421ed2dd9fcf54df18f70e3182722d403dec644912c2 \
1334-
--hash=sha256:edd3376eb7260e05735b6b996ed63cfd0e01fbb4d43b3e11e247394f6615f595
1324+
wagtail-sharing==2.10 \
1325+
--hash=sha256:22347497e29db0d4bc9d59d0d0e4747684ae1ac9e183d49463e0efe0487b8ca2 \
1326+
--hash=sha256:868484f5346e78808e4da5288780aacab0f56714b7c611add1181f8b3f160850
13351327
# via -r requirements/prod.txt
13361328
wagtail-treemodeladmin==1.7.0 \
13371329
--hash=sha256:073eae6bf7c5e6954f12439485133467335bcdf7f3849b543cf16f81deb6a296 \

requirements/docs.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ mergedeep==1.3.4 \
8686
--hash=sha256:0096d52e9dad9939c3d975a774666af186eda617e6ca84df4c94dec30004f2a8 \
8787
--hash=sha256:70775750742b25c0d8f36c55aed03d24c3384d17c951b3175d898bd778ef0307
8888
# via mkdocs
89-
mkdocs==1.5.1 \
90-
--hash=sha256:67e889f8d8ba1fe5decdfc59f5f8f21d6a8925a129339e93dede303bdea03a98 \
91-
--hash=sha256:f2f323c62fffdf1b71b84849e39aef56d6852b3f0a5571552bca32cefc650209
89+
mkdocs==1.5.2 \
90+
--hash=sha256:60a62538519c2e96fe8426654a67ee177350451616118a41596ae7c876bb7eac \
91+
--hash=sha256:70d0da09c26cff288852471be03c23f0f521fc15cf16ac89c7a3bfb9ae8d24f9
9292
# via
9393
# -r requirements/docs.in
9494
# mkdocs-rtd-dropdown

requirements/prod.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -934,9 +934,9 @@ wagtail-placeholder-images==0.1.1 \
934934
--hash=sha256:44cbdb18e4123c8423758c21f9e25c399c3a1f8349791071786d62e1c6077c0f \
935935
--hash=sha256:4f9070ce3ffaa2be02e0baf6c6b44c9f8d6d9302a60e384f85310c5e6b432bae
936936
# via -r requirements/prod.in
937-
wagtail-sharing==2.9 \
938-
--hash=sha256:2e285b709f08e3ae373a421ed2dd9fcf54df18f70e3182722d403dec644912c2 \
939-
--hash=sha256:edd3376eb7260e05735b6b996ed63cfd0e01fbb4d43b3e11e247394f6615f595
937+
wagtail-sharing==2.10 \
938+
--hash=sha256:22347497e29db0d4bc9d59d0d0e4747684ae1ac9e183d49463e0efe0487b8ca2 \
939+
--hash=sha256:868484f5346e78808e4da5288780aacab0f56714b7c611add1181f8b3f160850
940940
# via -r requirements/prod.in
941941
wagtail-treemodeladmin==1.7.0 \
942942
--hash=sha256:073eae6bf7c5e6954f12439485133467335bcdf7f3849b543cf16f81deb6a296 \

requirements/test.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,3 @@ coverage==7.2.7
22
diff_cover==7.7.0
33
pluggy==1.2.0
44
tox==4.6.4
5-
tox-pip-extensions==1.6.0

requirements/test.txt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,6 @@ pyproject-api==1.5.3 \
177177
--hash=sha256:14cf09828670c7b08842249c1f28c8ee6581b872e893f81b62d5465bec41502f \
178178
--hash=sha256:ffb5b2d7cad43f5b2688ab490de7c4d3f6f15e0b819cb588c4b771567c9729eb
179179
# via tox
180-
six==1.16.0 \
181-
--hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \
182-
--hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
183-
# via tox-pip-extensions
184180
tomli==2.0.1 \
185181
--hash=sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc \
186182
--hash=sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f
@@ -190,12 +186,6 @@ tomli==2.0.1 \
190186
tox==4.6.4 \
191187
--hash=sha256:1b8f8ae08d6a5475cad9d508236c51ea060620126fd7c3c513d0f5c7f29cc776 \
192188
--hash=sha256:5e2ad8845764706170d3dcaac171704513cc8a725655219acb62fe4380bdadda
193-
# via
194-
# -r requirements/test.in
195-
# tox-pip-extensions
196-
tox-pip-extensions==1.6.0 \
197-
--hash=sha256:38ab15ed5bcb1e1212e7a0a09e9def9d01ae5bb24073f6c6204e88456f970b49 \
198-
--hash=sha256:58dffa74003988ce8fd4fa67db28d5749b7015d3f7923633143cdd392a1b4f1c
199189
# via -r requirements/test.in
200190
virtualenv==20.24.0 \
201191
--hash=sha256:18d1b37fc75cc2670625702d76849a91ebd383768b4e91382a8d51be3246049e \

tox.ini

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,16 @@ commands=
7676
changedir=
7777
{toxinidir}/cfgov
7878
passenv=
79-
PGUSER PGPASSWORD PGDATABASE PGHOST PGPORT ES_HOST ES_PORT GITHUB_ACTIONS SKIP_DJANGO_MIGRATIONS TEST_RUNNER
79+
PGUSER
80+
PGPASSWORD
81+
PGDATABASE
82+
PGHOST
83+
PGPORT
84+
ES_HOST
85+
ES_PORT
86+
GITHUB_ACTIONS
87+
SKIP_DJANGO_MIGRATIONS
88+
TEST_RUNNER
8089
setenv=
8190
GOVDELIVERY_ACCOUNT_CODE=fake_account_code
8291
DJANGO_ADMIN_USERNAME=admin
@@ -117,6 +126,9 @@ commands={[lint-config]commands}
117126
# Ensure all assets are generated without error.
118127
recreate=False
119128
changedir={toxinidir}
129+
allowlist_externals=
130+
{toxinidir}/frontend.sh
131+
{toxinidir}/cfgov/manage.py
120132
deps=
121133
{[unittest-config]deps}
122134
setenv=
@@ -137,7 +149,11 @@ changedir={[unittest-config]changedir}
137149
deps=
138150
{[unittest-config]deps}
139151
passenv=
140-
PGUSER PGPASSWORD PGDATABASE PGHOST PGPORT
152+
PGUSER
153+
PGPASSWORD
154+
PGDATABASE
155+
PGHOST
156+
PGPORT
141157
setenv=
142158
PGUSER={env:PGUSER:cfpb}
143159
PGPASSWORD={env:PGPASSWORD:cfpb}

0 commit comments

Comments
 (0)