requirements: pin universal2 binaries for PyInstaller (bug 1855547)

.github/workflows/compile-requirements.yml

@@ -79,4 +79,5 @@ jobs:
           find temp-requirements -name "requirements-*" -type f -exec mv -f -t requirements {} +
           git add -A
           git commit -m "Automatically generated requirements"
-          until git push -f https://x-access-token:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git; do git pull --rebase; done
+          until git push https://x-access-token:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git; do git pull --rebase; done
+          until [ "$(git push https://x-access-token:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git)" != "Everything up-to-date" ]; do git pull --rebase; done

.github/workflows/run-compile-requirements.yml

@@ -11,20 +11,20 @@ jobs:
   call-compile-requirements-linux:
     uses: ./.github/workflows/compile-requirements.yml
     with:
-      requirements_files: '["base.in dev.in gui-dev.in gui.in linters.in"]'
+      requirements_files: '["base.in base.universal2.in dev.in gui-dev.in gui.in linters.in"]'
       os: '["ubuntu-latest"]'
       python: '["3.8", "3.9", "3.10", "3.11"]'
 
   call-compile-requirements-windows:
     uses: ./.github/workflows/compile-requirements.yml
     with:
-      requirements_files: '["base.in dev.in gui-dev.in gui.in linters.in"]'
+      requirements_files: '["base.in base.universal2.in dev.in gui-dev.in gui.in linters.in"]'
       os: '["windows-latest"]'
       python: '["3.9", "3.10", "3.11"]'
 
   call-compile-requirements-macos:
     uses: ./.github/workflows/compile-requirements.yml
     with:
-      requirements_files: '["base.in dev.in gui-dev.in gui.in linters.in"]'
+      requirements_files: '["base.in base.universal2.in dev.in gui-dev.in gui.in linters.in"]'
       os: '["macos-latest"]'
       python: '["3.9", "3.10", "3.11"]'

requirements/base.in

@@ -6,12 +6,8 @@ colorama>=0.4.1
 configobj>=5.0.6
 distro>=1.8.0
 dmgbuild==1.*
-glean-sdk==53.0.0; sys.platform != 'darwin'
-# See https://github.com/pypa/pip/issues/11573.
-https://files.pythonhosted.org/packages/d2/eb/c6a4269ff5f293274d736bd99f40c8e3d47c989a3e2eeabb78677cb785ed/glean_sdk-53.0.0-cp36-abi3-macosx_10_7_universal2.whl; sys.platform == 'darwin'
+glean-sdk==54.0.0; sys.platform != 'darwin'
 importlib-metadata==6.8.0
-# Pinned on darwin because later versions depend on a package that has no universal2 binary.
-jsonschema==4.17.3; sys.platform == 'darwin'
 mozdevice>=4.1.0,<5
 mozfile>=2.0.0
 mozinfo>=1.1.0
@@ -21,9 +17,9 @@ mozprocess>=1.3.1
 mozprofile>=2.2.0
 mozrunner>=8.0.2
 mozversion>=2.1.0
+pyyaml==6.*
 redo>=2.0.2
 requests>=2.21.0
 setuptools
 setuptools_scm==8.*
 taskcluster>=6.0.0
-pyyaml==6.*

requirements/base.universal2.in

@@ -0,0 +1,26 @@
+# See https://github.com/pypa/pip/issues/11573.
+
+https://files.pythonhosted.org/packages/3d/92/7fd0f03180efe1bc7f90f1341823793aebd62d1c2ea83f78cac5259db7ce/aiohttp-3.8.5-cp38-cp38-macosx_10_9_universal2.whl; sys.platform == 'darwin' and python_version == '3.8' 
+https://files.pythonhosted.org/packages/44/78/df7d448524402cdc91c1b4e42ebbf6ac483783d2eba7682fe74fc13bf28d/frozenlist-1.4.0-cp38-cp38-macosx_10_9_universal2.whl; sys.platform == 'darwin' and python_version == '3.8'
+https://files.pythonhosted.org/packages/c3/c5/b583cd706f88ef57811229b67d6c4c0fcda56bee49a913156dd401aaa729/multidict-6.0.4-cp38-cp38-macosx_10_9_universal2.whl; sys.platform == 'darwin' and python_version == '3.8'
+https://files.pythonhosted.org/packages/e8/3b/38f2427f7ee497e169d7f8bd74c92a6ace98594c6a921b619ccc57703fe5/yarl-1.9.2-cp38-cp38-macosx_10_9_universal2.whl; sys.platform == 'darwin' and python_version == '3.8'
+
+https://files.pythonhosted.org/packages/04/10/dd1e480800b7375c18da30f69e591906565822328a7518fbd17e07bdf1ea/aiohttp-3.8.5-cp39-cp39-macosx_10_9_universal2.whl; sys.platform == 'darwin' and python_version == '3.9'
+https://files.pythonhosted.org/packages/bb/43/201d3e19dbd570411a29d33f88c287e7a7ff7011fd44df860d5b5a4d76f9/frozenlist-1.4.0-cp39-cp39-macosx_10_9_universal2.whl; sys.platform == 'darwin' and python_version == '3.9'
+https://files.pythonhosted.org/packages/2f/38/e0514ddb9b454b06fc8b29eb8b45ae1861cf1850acc2b0f01ad38b047ad3/multidict-6.0.4-cp39-cp39-macosx_10_9_universal2.whl; sys.platform == 'darwin' and python_version == '3.9'
+https://files.pythonhosted.org/packages/31/2c/e6af0f7710412e4ed49c1641f04ed1af334d448d51c55150235e3381f0a7/yarl-1.9.2-cp39-cp39-macosx_10_9_universal2.whl; sys.platform == 'darwin' and python_version == '3.9'
+
+https://files.pythonhosted.org/packages/4e/56/3bd3f99304be831d798ec3bc424dabc2dac09cb408f37800b29cc96e8eee/aiohttp-3.8.5-cp310-cp310-macosx_10_9_universal2.whl; sys.platform == 'darwin' and python_version == '3.10'
+https://files.pythonhosted.org/packages/6d/6f/86f2c5e34909e72fcbb28d6d27b405b5a685ed7892df3979f83b7a1b2d04/frozenlist-1.4.0-cp310-cp310-macosx_10_9_universal2.whl; sys.platform == 'darwin' and python_version == '3.10'
+https://files.pythonhosted.org/packages/bb/e4/ea5687129b0cb781aba596bd08abb2aca3c8051e41aabf989c966e93af04/multidict-6.0.4-cp310-cp310-macosx_10_9_universal2.whl; sys.platform == 'darwin' and python_version == '3.10'
+https://files.pythonhosted.org/packages/eb/cb/4970008c85810c7d0e154ac5d746451b04476ac1dd85dc538563a1c04698/yarl-1.9.2-cp310-cp310-macosx_10_9_universal2.whl; sys.platform == 'darwin' and python_version == '3.10'
+
+https://files.pythonhosted.org/packages/f9/df/0b93fea3d24d4a9c75568861cced9435741df51f9d4fa48a81162c86b0d1/aiohttp-3.8.5-cp311-cp311-macosx_10_9_universal2.whl; sys.platform == 'darwin' and python_version == '3.11'
+https://files.pythonhosted.org/packages/af/3b/824653cfd0c25e41ec4f854ddf74b4428d21a7e2683af1801f12d22b3c56/frozenlist-1.4.0-cp311-cp311-macosx_10_9_universal2.whl; sys.platform == 'darwin' and python_version == '3.11'
+https://files.pythonhosted.org/packages/bb/ec/ea3435f339cfad0d0a5e9e533a362d230325029deea9cdba6730fcfc1e00/multidict-6.0.4-cp311-cp311-macosx_10_9_universal2.whl; sys.platform == 'darwin' and python_version == '3.11'
+https://files.pythonhosted.org/packages/84/c1/eaebee42cbcace2d5b5eb103cae668dec1c239f5c82b90da4b3b20f39419/yarl-1.9.2-cp311-cp311-macosx_10_9_universal2.whl; sys.platform == 'darwin' and python_version == '3.11'
+
+https://files.pythonhosted.org/packages/2e/2d/09acfde2661ef63aa1400554163117dee88d70dd7bac65585f5641fef953/glean_sdk-54.0.0-py3-none-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl; sys.platform == 'darwin'
+
+# Pinned on darwin because later versions depend on a package that has no universal2 binary.
+jsonschema==4.17.3; sys.platform == 'darwin'