Fix tox for 4+

Update tox more
cfpb · Aug 28, 2023 · ce56ca5 · ce56ca5
1 parent d1721cc
commit ce56ca5
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 30 deletions.
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -1213,14 +1213,12 @@ six==1.16.0 \
     # via
     #   -r requirements/prod.txt
     #   -r requirements/scripts.txt
-    #   -r requirements/test.txt
     #   django-autocomplete-light
     #   html5lib
     #   l18n
     #   opensearch-py
     #   python-dateutil
     #   requests-aws4auth
-    #   tox-pip-extensions
 soupsieve==2.4.1 \
     --hash=sha256:1c1bfee6819544a3447586c889157365a27e10d88cde3ad3da0cf0ddf646feb8 \
     --hash=sha256:89d12b2d5dfcd2c9e8c22326da9d9aa9cb3dfab0a83a024f05704076ee8d35ea
@@ -1255,12 +1253,6 @@ tomli==2.0.1 \
 tox==4.6.4 \
     --hash=sha256:1b8f8ae08d6a5475cad9d508236c51ea060620126fd7c3c513d0f5c7f29cc776 \
     --hash=sha256:5e2ad8845764706170d3dcaac171704513cc8a725655219acb62fe4380bdadda
-    # via
-    #   -r requirements/test.txt
-    #   tox-pip-extensions
-tox-pip-extensions==1.6.0 \
-    --hash=sha256:38ab15ed5bcb1e1212e7a0a09e9def9d01ae5bb24073f6c6204e88456f970b49 \
-    --hash=sha256:58dffa74003988ce8fd4fa67db28d5749b7015d3f7923633143cdd392a1b4f1c
     # via -r requirements/test.txt
 tqdm==4.65.0 \
     --hash=sha256:1871fb68a86b8fb3b59ca4cdd3dcccbc7e6d613eeed31f4c332531977b89beb5 \
@@ -1329,9 +1321,9 @@ wagtail-placeholder-images==0.1.1 \
     --hash=sha256:44cbdb18e4123c8423758c21f9e25c399c3a1f8349791071786d62e1c6077c0f \
     --hash=sha256:4f9070ce3ffaa2be02e0baf6c6b44c9f8d6d9302a60e384f85310c5e6b432bae
     # via -r requirements/prod.txt
-wagtail-sharing==2.9 \
-    --hash=sha256:2e285b709f08e3ae373a421ed2dd9fcf54df18f70e3182722d403dec644912c2 \
-    --hash=sha256:edd3376eb7260e05735b6b996ed63cfd0e01fbb4d43b3e11e247394f6615f595
+wagtail-sharing==2.10 \
+    --hash=sha256:22347497e29db0d4bc9d59d0d0e4747684ae1ac9e183d49463e0efe0487b8ca2 \
+    --hash=sha256:868484f5346e78808e4da5288780aacab0f56714b7c611add1181f8b3f160850
     # via -r requirements/prod.txt
 wagtail-treemodeladmin==1.7.0 \
     --hash=sha256:073eae6bf7c5e6954f12439485133467335bcdf7f3849b543cf16f81deb6a296 \

diff --git a/requirements/docs.txt b/requirements/docs.txt
@@ -86,9 +86,9 @@ mergedeep==1.3.4 \
     --hash=sha256:0096d52e9dad9939c3d975a774666af186eda617e6ca84df4c94dec30004f2a8 \
     --hash=sha256:70775750742b25c0d8f36c55aed03d24c3384d17c951b3175d898bd778ef0307
     # via mkdocs
-mkdocs==1.5.1 \
-    --hash=sha256:67e889f8d8ba1fe5decdfc59f5f8f21d6a8925a129339e93dede303bdea03a98 \
-    --hash=sha256:f2f323c62fffdf1b71b84849e39aef56d6852b3f0a5571552bca32cefc650209
+mkdocs==1.5.2 \
+    --hash=sha256:60a62538519c2e96fe8426654a67ee177350451616118a41596ae7c876bb7eac \
+    --hash=sha256:70d0da09c26cff288852471be03c23f0f521fc15cf16ac89c7a3bfb9ae8d24f9
     # via
     #   -r requirements/docs.in
     #   mkdocs-rtd-dropdown

diff --git a/requirements/prod.txt b/requirements/prod.txt
@@ -934,9 +934,9 @@ wagtail-placeholder-images==0.1.1 \
     --hash=sha256:44cbdb18e4123c8423758c21f9e25c399c3a1f8349791071786d62e1c6077c0f \
     --hash=sha256:4f9070ce3ffaa2be02e0baf6c6b44c9f8d6d9302a60e384f85310c5e6b432bae
     # via -r requirements/prod.in
-wagtail-sharing==2.9 \
-    --hash=sha256:2e285b709f08e3ae373a421ed2dd9fcf54df18f70e3182722d403dec644912c2 \
-    --hash=sha256:edd3376eb7260e05735b6b996ed63cfd0e01fbb4d43b3e11e247394f6615f595
+wagtail-sharing==2.10 \
+    --hash=sha256:22347497e29db0d4bc9d59d0d0e4747684ae1ac9e183d49463e0efe0487b8ca2 \
+    --hash=sha256:868484f5346e78808e4da5288780aacab0f56714b7c611add1181f8b3f160850
     # via -r requirements/prod.in
 wagtail-treemodeladmin==1.7.0 \
     --hash=sha256:073eae6bf7c5e6954f12439485133467335bcdf7f3849b543cf16f81deb6a296 \

diff --git a/requirements/test.in b/requirements/test.in
@@ -2,4 +2,3 @@ coverage==7.2.7
 diff_cover==7.7.0
 pluggy==1.2.0
 tox==4.6.4
-tox-pip-extensions==1.6.0
diff --git a/requirements/test.txt b/requirements/test.txt
@@ -177,10 +177,6 @@ pyproject-api==1.5.3 \
     --hash=sha256:14cf09828670c7b08842249c1f28c8ee6581b872e893f81b62d5465bec41502f \
     --hash=sha256:ffb5b2d7cad43f5b2688ab490de7c4d3f6f15e0b819cb588c4b771567c9729eb
     # via tox
-six==1.16.0 \
-    --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \
-    --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
-    # via tox-pip-extensions
 tomli==2.0.1 \
     --hash=sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc \
     --hash=sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f
@@ -190,12 +186,6 @@ tomli==2.0.1 \
 tox==4.6.4 \
     --hash=sha256:1b8f8ae08d6a5475cad9d508236c51ea060620126fd7c3c513d0f5c7f29cc776 \
     --hash=sha256:5e2ad8845764706170d3dcaac171704513cc8a725655219acb62fe4380bdadda
-    # via
-    #   -r requirements/test.in
-    #   tox-pip-extensions
-tox-pip-extensions==1.6.0 \
-    --hash=sha256:38ab15ed5bcb1e1212e7a0a09e9def9d01ae5bb24073f6c6204e88456f970b49 \
-    --hash=sha256:58dffa74003988ce8fd4fa67db28d5749b7015d3f7923633143cdd392a1b4f1c
     # via -r requirements/test.in
 virtualenv==20.24.0 \
     --hash=sha256:18d1b37fc75cc2670625702d76849a91ebd383768b4e91382a8d51be3246049e \

diff --git a/tox.ini b/tox.ini
@@ -76,7 +76,16 @@ commands=
 changedir=
     {toxinidir}/cfgov
 passenv=
-    PGUSER PGPASSWORD PGDATABASE PGHOST PGPORT ES_HOST ES_PORT GITHUB_ACTIONS SKIP_DJANGO_MIGRATIONS TEST_RUNNER
+    PGUSER
+    PGPASSWORD
+    PGDATABASE
+    PGHOST
+    PGPORT
+    ES_HOST
+    ES_PORT
+    GITHUB_ACTIONS
+    SKIP_DJANGO_MIGRATIONS
+    TEST_RUNNER
 setenv=
     GOVDELIVERY_ACCOUNT_CODE=fake_account_code
     DJANGO_ADMIN_USERNAME=admin
@@ -117,6 +126,9 @@ commands={[lint-config]commands}
 # Ensure all assets are generated without error.
 recreate=False
 changedir={toxinidir}
+allowlist_externals=
+    {toxinidir}/frontend.sh
+    {toxinidir}/cfgov/manage.py
 deps=
     {[unittest-config]deps}
 setenv=
@@ -137,7 +149,11 @@ changedir={[unittest-config]changedir}
 deps=
     {[unittest-config]deps}
 passenv=
-    PGUSER PGPASSWORD PGDATABASE PGHOST PGPORT
+    PGUSER
+    PGPASSWORD
+    PGDATABASE
+    PGHOST
+    PGPORT
 setenv=
     PGUSER={env:PGUSER:cfpb}
     PGPASSWORD={env:PGPASSWORD:cfpb}