mozilla-releng · jcristau · Nov 15, 2023 · Nov 15, 2023 · Nov 15, 2023 · Nov 15, 2023
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -8,3 +8,6 @@ build:
 sphinx:
   configuration: docs/conf.py
 
+python:
+   install:
+     - requirements: requirements/docs.txt
diff --git a/addonscript/requirements/test.in b/addonscript/requirements/test.in
@@ -3,6 +3,7 @@
 -r base.in
 aioresponses
 black
+platformdirs<4 # Because of https://github.com/pypa/virtualenv/issues/2666
 check-manifest
 coverage>=4.2
 flake8

diff --git a/addonscript/requirements/test.txt b/addonscript/requirements/test.txt
@@ -1,4 +1,4 @@
-# SHA1:965c4b013102d241671c812a20f3f99ea3fa275a
+# SHA1:5316274e71583a29de4a81c1336833388e9efb49
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -167,7 +167,9 @@ pip-tools==7.3.0 \
 platformdirs==3.11.0 \
     --hash=sha256:cf8ee52a3afdb965072dcc652433e0c7e3e40cf5ea1477cd4b3b1d2eb75495b3 \
     --hash=sha256:e9d171d00af68be50e9202731309c4e658fd8bc76f55c11c7dd760d023bda68e
-    # via black
+    # via
+    #   -r requirements/test.in
+    #   black
 pluggy==1.3.0 \
     --hash=sha256:cf61ae8f126ac6f7c451172cf30e3e43d3ca77615509771b3a984a0730651e12 \
     --hash=sha256:d89c696a773f8bd377d18e5ecda92b7a3793cbe66c87060a6fb58c7b6e1061f7

diff --git a/balrogscript/requirements/test.in b/balrogscript/requirements/test.in
@@ -1,6 +1,7 @@
 -r base.in
 
 black
+platformdirs<4 # Because of https://github.com/pypa/virtualenv/issues/2666
 check-manifest
 coverage
 flake8

diff --git a/balrogscript/requirements/test.txt b/balrogscript/requirements/test.txt
@@ -1,4 +1,4 @@
-# SHA1:29791650e17fec3d748ce54e1ba568d70039a0d0
+# SHA1:7b0ac065e3d4f3b7c68695aae9ba79bdc9cdace7
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -154,7 +154,9 @@ pip-tools==7.3.0 \
 platformdirs==3.11.0 \
     --hash=sha256:cf8ee52a3afdb965072dcc652433e0c7e3e40cf5ea1477cd4b3b1d2eb75495b3 \
     --hash=sha256:e9d171d00af68be50e9202731309c4e658fd8bc76f55c11c7dd760d023bda68e
-    # via black
+    # via
+    #   -r requirements/test.in
+    #   black
 pluggy==1.3.0 \
     --hash=sha256:cf61ae8f126ac6f7c451172cf30e3e43d3ca77615509771b3a984a0730651e12 \
     --hash=sha256:d89c696a773f8bd377d18e5ecda92b7a3793cbe66c87060a6fb58c7b6e1061f7

diff --git a/beetmoverscript/requirements/test.in b/beetmoverscript/requirements/test.in
@@ -1,6 +1,7 @@
 -r base.in
 
 black
+platformdirs<4 # Because of https://github.com/pypa/virtualenv/issues/2666
 check-manifest
 coverage
 flake8

diff --git a/beetmoverscript/requirements/test.txt b/beetmoverscript/requirements/test.txt
@@ -1,4 +1,4 @@
-# SHA1:a97cf89fa62b604f6d8548e385bc882da23baa14
+# SHA1:8d1bb20d975cf91b3714528a91cf7151a164fafd
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -153,7 +153,9 @@ pip-tools==7.3.0 \
 platformdirs==3.11.0 \
     --hash=sha256:cf8ee52a3afdb965072dcc652433e0c7e3e40cf5ea1477cd4b3b1d2eb75495b3 \
     --hash=sha256:e9d171d00af68be50e9202731309c4e658fd8bc76f55c11c7dd760d023bda68e
-    # via black
+    # via
+    #   -r requirements/test.in
+    #   black
 pluggy==1.3.0 \
     --hash=sha256:cf61ae8f126ac6f7c451172cf30e3e43d3ca77615509771b3a984a0730651e12 \
     --hash=sha256:d89c696a773f8bd377d18e5ecda92b7a3793cbe66c87060a6fb58c7b6e1061f7

diff --git a/bouncerscript/requirements/test.in b/bouncerscript/requirements/test.in
@@ -1,6 +1,7 @@
 -r base.in
 
 black
+platformdirs<4 # Because of https://github.com/pypa/virtualenv/issues/2666
 check-manifest
 coverage
 flake8

diff --git a/bouncerscript/requirements/test.txt b/bouncerscript/requirements/test.txt
@@ -1,4 +1,4 @@
-# SHA1:a97cf89fa62b604f6d8548e385bc882da23baa14
+# SHA1:8d1bb20d975cf91b3714528a91cf7151a164fafd
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -153,7 +153,9 @@ pip-tools==7.3.0 \
 platformdirs==3.11.0 \
     --hash=sha256:cf8ee52a3afdb965072dcc652433e0c7e3e40cf5ea1477cd4b3b1d2eb75495b3 \
     --hash=sha256:e9d171d00af68be50e9202731309c4e658fd8bc76f55c11c7dd760d023bda68e
-    # via black
+    # via
+    #   -r requirements/test.in
+    #   black
 pluggy==1.3.0 \
     --hash=sha256:cf61ae8f126ac6f7c451172cf30e3e43d3ca77615509771b3a984a0730651e12 \
     --hash=sha256:d89c696a773f8bd377d18e5ecda92b7a3793cbe66c87060a6fb58c7b6e1061f7

diff --git a/configloader/requirements/test.in b/configloader/requirements/test.in
@@ -3,6 +3,7 @@
 -r base.in
 
 black
+platformdirs<4 # Because of https://github.com/pypa/virtualenv/issues/2666
 check-manifest
 coverage>=4.2
 flake8

diff --git a/configloader/requirements/test.py38.txt b/configloader/requirements/test.py38.txt
@@ -1,4 +1,4 @@
-# SHA1:c5c20fbd7c9bf9966c026ccd3951bc392a9bf9ec
+# SHA1:8186ed08d6d08dc980766f8ceadb844edef6579e
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -142,7 +142,9 @@ pip-tools==7.3.0 \
 platformdirs==3.11.0 \
     --hash=sha256:cf8ee52a3afdb965072dcc652433e0c7e3e40cf5ea1477cd4b3b1d2eb75495b3 \
     --hash=sha256:e9d171d00af68be50e9202731309c4e658fd8bc76f55c11c7dd760d023bda68e
-    # via black
+    # via
+    #   -r requirements/test.in
+    #   black
 pluggy==1.3.0 \
     --hash=sha256:cf61ae8f126ac6f7c451172cf30e3e43d3ca77615509771b3a984a0730651e12 \
     --hash=sha256:d89c696a773f8bd377d18e5ecda92b7a3793cbe66c87060a6fb58c7b6e1061f7

diff --git a/configloader/requirements/test.txt b/configloader/requirements/test.txt
@@ -1,4 +1,4 @@
-# SHA1:c5c20fbd7c9bf9966c026ccd3951bc392a9bf9ec
+# SHA1:8186ed08d6d08dc980766f8ceadb844edef6579e
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -142,7 +142,9 @@ pip-tools==7.3.0 \
 platformdirs==3.11.0 \
     --hash=sha256:cf8ee52a3afdb965072dcc652433e0c7e3e40cf5ea1477cd4b3b1d2eb75495b3 \
     --hash=sha256:e9d171d00af68be50e9202731309c4e658fd8bc76f55c11c7dd760d023bda68e
-    # via black
+    # via
+    #   -r requirements/test.in
+    #   black
 pluggy==1.3.0 \
     --hash=sha256:cf61ae8f126ac6f7c451172cf30e3e43d3ca77615509771b3a984a0730651e12 \
     --hash=sha256:d89c696a773f8bd377d18e5ecda92b7a3793cbe66c87060a6fb58c7b6e1061f7

diff --git a/githubscript/requirements/test.in b/githubscript/requirements/test.in
@@ -1,6 +1,7 @@
 -r base.in
 
 black
+platformdirs<4 # Because of https://github.com/pypa/virtualenv/issues/2666
 check-manifest
 coverage
 flake8

diff --git a/githubscript/requirements/test.txt b/githubscript/requirements/test.txt
@@ -1,4 +1,4 @@
-# SHA1:7d25766d9bafef6b61042241a9823b99eab79e80
+# SHA1:e429df0f69979e0140f06f959f14ba20f680307e
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -149,7 +149,9 @@ pip-tools==7.3.0 \
 platformdirs==3.11.0 \
     --hash=sha256:cf8ee52a3afdb965072dcc652433e0c7e3e40cf5ea1477cd4b3b1d2eb75495b3 \
     --hash=sha256:e9d171d00af68be50e9202731309c4e658fd8bc76f55c11c7dd760d023bda68e
-    # via black
+    # via
+    #   -r requirements/test.in
+    #   black
 pluggy==1.3.0 \
     --hash=sha256:cf61ae8f126ac6f7c451172cf30e3e43d3ca77615509771b3a984a0730651e12 \
     --hash=sha256:d89c696a773f8bd377d18e5ecda92b7a3793cbe66c87060a6fb58c7b6e1061f7

diff --git a/iscript/requirements/test.in b/iscript/requirements/test.in
@@ -1,5 +1,6 @@
 -r base.in
 black
+platformdirs<4 # Because of https://github.com/pypa/virtualenv/issues/2666
 check-manifest
 coverage
 flake8

diff --git a/iscript/requirements/test.txt b/iscript/requirements/test.txt
@@ -1,4 +1,4 @@
-# SHA1:4d272c6acf957526f9af265764f7f74b19000d91
+# SHA1:8e5b4c13b2cf45c3bcd2ee263bfaf0bc8829c729
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -186,7 +186,9 @@ pip-tools==7.3.0 \
 platformdirs==3.11.0 \
     --hash=sha256:cf8ee52a3afdb965072dcc652433e0c7e3e40cf5ea1477cd4b3b1d2eb75495b3 \
     --hash=sha256:e9d171d00af68be50e9202731309c4e658fd8bc76f55c11c7dd760d023bda68e
-    # via black
+    # via
+    #   -r requirements/test.in
+    #   black
 pluggy==1.3.0 \
     --hash=sha256:cf61ae8f126ac6f7c451172cf30e3e43d3ca77615509771b3a984a0730651e12 \
     --hash=sha256:d89c696a773f8bd377d18e5ecda92b7a3793cbe66c87060a6fb58c7b6e1061f7

diff --git a/maintenance/pin-helper.sh b/maintenance/pin-helper.sh
@@ -19,6 +19,9 @@ for dir in $DIRS; do
         ARGS="$ARGS -g flat-manager"
     fi
     echo $ARGS
+    if [ "$dir" = "." ]; then
+        ARGS="$EXTRA_ARGS -g test -g docs"
+    fi
     pushd "$dir"
     pip-compile-multi -o "$SUFFIX" $ARGS
     chmod 644 requirements/*.txt

diff --git a/maintenance/pin.sh b/maintenance/pin.sh
@@ -6,9 +6,9 @@ set -x
 EXTRA_ARGS=${EXTRA_ARGS:-""}
 
 if [ $# -gt 0 ]; then
-    DIRS="$@"
+    DIRS=("$@")
 else
-    DIRS="
+    DIRS=(
         addonscript
         balrogscript
         beetmoverscript
@@ -24,7 +24,8 @@ else
         shipitscript
         signingscript
         treescript
-    "
+        .
+    )
 fi
 
 RUNCMD="RUN apt-get update && \
@@ -41,5 +42,11 @@ echo -e "FROM python:3.8\n${RUNCMD}" | docker build --pull --tag "scriptworker-s
 echo -e "FROM python:3.9\n${RUNCMD}" | docker build --pull --tag "scriptworker-script-pin:3.9" -
 
 
-echo $DIRS | xargs -n8 -P8 time docker run --rm -t -v "$PWD":/src -e EXTRA_ARGS="$EXTRA_ARGS" -w /src scriptworker-script-pin:3.9 maintenance/pin-helper.sh
-echo $DIRS | xargs -n8 -P8 time docker run --rm -t -v "$PWD":/src -e EXTRA_ARGS="$EXTRA_ARGS" -e SUFFIX=py38.txt -w /src scriptworker-script-pin:3.8 maintenance/pin-helper.sh
+echo "${DIRS[@]}" | xargs -n8 -P8 time docker run --rm -t -v "$PWD":/src -e EXTRA_ARGS="$EXTRA_ARGS" -w /src scriptworker-script-pin:3.9 maintenance/pin-helper.sh
+for idx in "${!DIRS[@]}"; do
+    # the toplevel requirements dir doesn't need py38
+    if [ "${DIRS[$idx]}" = "." ]; then unset DIRS[$idx]; fi
+done
+if [ ${#DIRS} -gt 0 ]; then
+    echo "${DIRS[@]}" | xargs -n8 -P8 time docker run --rm -t -v "$PWD":/src -e EXTRA_ARGS="$EXTRA_ARGS" -e SUFFIX=py38.txt -w /src scriptworker-script-pin:3.8 maintenance/pin-helper.sh
+fi
diff --git a/notarization_poller/requirements/test.in b/notarization_poller/requirements/test.in
@@ -6,6 +6,7 @@ flake8_docstrings
 isort
 mock
 pip-compile-multi
+platformdirs<4 # Because of https://github.com/pypa/virtualenv/issues/2666
 pytest
 pytest-asyncio
 pytest-black

diff --git a/notarization_poller/requirements/test.txt b/notarization_poller/requirements/test.txt
@@ -1,4 +1,4 @@
-# SHA1:5d2145b692c0a6734183de2e5881bb66a83c6dce
+# SHA1:15fe988c9d6671611f6e03d3afb9cb1a62b61fdc
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -160,7 +160,9 @@ pip-tools==7.3.0 \
 platformdirs==3.11.0 \
     --hash=sha256:cf8ee52a3afdb965072dcc652433e0c7e3e40cf5ea1477cd4b3b1d2eb75495b3 \
     --hash=sha256:e9d171d00af68be50e9202731309c4e658fd8bc76f55c11c7dd760d023bda68e
-    # via black
+    # via
+    #   -r requirements/test.in
+    #   black
 pluggy==1.3.0 \
     --hash=sha256:cf61ae8f126ac6f7c451172cf30e3e43d3ca77615509771b3a984a0730651e12 \
     --hash=sha256:d89c696a773f8bd377d18e5ecda92b7a3793cbe66c87060a6fb58c7b6e1061f7

diff --git a/pushapkscript/requirements/test.in b/pushapkscript/requirements/test.in
@@ -1,6 +1,7 @@
 -r base.in
 
 black
+platformdirs<4 # Because of https://github.com/pypa/virtualenv/issues/2666
 check-manifest
 coverage>=4.2b1
 flake8

diff --git a/pushapkscript/requirements/test.txt b/pushapkscript/requirements/test.txt
@@ -1,4 +1,4 @@
-# SHA1:63269db0b6002c5f7e9c2f9cc71ebc56e87b76ad
+# SHA1:156849f37aaffe2614d5fe66ca55f098b1b6cb74
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -131,7 +131,9 @@ pip-tools==7.3.0 \
 platformdirs==3.11.0 \
     --hash=sha256:cf8ee52a3afdb965072dcc652433e0c7e3e40cf5ea1477cd4b3b1d2eb75495b3 \
     --hash=sha256:e9d171d00af68be50e9202731309c4e658fd8bc76f55c11c7dd760d023bda68e
-    # via black
+    # via
+    #   -r requirements/test.in
+    #   black
 pluggy==1.3.0 \
     --hash=sha256:cf61ae8f126ac6f7c451172cf30e3e43d3ca77615509771b3a984a0730651e12 \
     --hash=sha256:d89c696a773f8bd377d18e5ecda92b7a3793cbe66c87060a6fb58c7b6e1061f7

diff --git a/pushflatpakscript/requirements/test.in b/pushflatpakscript/requirements/test.in
@@ -1,6 +1,7 @@
 -r base.in
 
 black
+platformdirs<4 # Because of https://github.com/pypa/virtualenv/issues/2666
 check-manifest
 coverage>=4.2b1
 flake8

diff --git a/pushflatpakscript/requirements/test.txt b/pushflatpakscript/requirements/test.txt
@@ -1,4 +1,4 @@
-# SHA1:0bfa63096d13cfbbecac15cb15b2b18ac1fd072e
+# SHA1:5fffdef4c22dda673c1ea9cab119babc343f560f
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -153,7 +153,9 @@ pip-tools==7.3.0 \
 platformdirs==3.11.0 \
     --hash=sha256:cf8ee52a3afdb965072dcc652433e0c7e3e40cf5ea1477cd4b3b1d2eb75495b3 \
     --hash=sha256:e9d171d00af68be50e9202731309c4e658fd8bc76f55c11c7dd760d023bda68e
-    # via black
+    # via
+    #   -r requirements/test.in
+    #   black
 pluggy==1.3.0 \
     --hash=sha256:cf61ae8f126ac6f7c451172cf30e3e43d3ca77615509771b3a984a0730651e12 \
     --hash=sha256:d89c696a773f8bd377d18e5ecda92b7a3793cbe66c87060a6fb58c7b6e1061f7

diff --git a/pushmsixscript/requirements/test.in b/pushmsixscript/requirements/test.in
@@ -1,6 +1,7 @@
 -r base.in
 
 black
+platformdirs<4 # Because of https://github.com/pypa/virtualenv/issues/2666
 check-manifest
 coverage>=4.2b1
 flake8

diff --git a/pushmsixscript/requirements/test.txt b/pushmsixscript/requirements/test.txt
@@ -1,4 +1,4 @@
-# SHA1:6b6118fce6f3ddc317a9541e5a2ec18f2746d483
+# SHA1:90b3b5df80a1f19d8c105535181eee2ce81796dd
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -153,7 +153,9 @@ pip-tools==7.3.0 \
 platformdirs==3.11.0 \
     --hash=sha256:cf8ee52a3afdb965072dcc652433e0c7e3e40cf5ea1477cd4b3b1d2eb75495b3 \
     --hash=sha256:e9d171d00af68be50e9202731309c4e658fd8bc76f55c11c7dd760d023bda68e
-    # via black
+    # via
+    #   -r requirements/test.in
+    #   black
 pluggy==1.3.0 \
     --hash=sha256:cf61ae8f126ac6f7c451172cf30e3e43d3ca77615509771b3a984a0730651e12 \
     --hash=sha256:d89c696a773f8bd377d18e5ecda92b7a3793cbe66c87060a6fb58c7b6e1061f7

diff --git a/requirements/docs.in b/requirements/docs.in
@@ -0,0 +1 @@
+recommonmark