requirements: pin universal2 binaries for PyInstaller (bug 1855547)

mozilla · Sep 28, 2023 · c85ed07 · c85ed07
1 parent 3886011
commit c85ed07
Show file tree

Hide file tree

Showing 13 changed files with 215 additions and 1,044 deletions.
diff --git a/.github/workflows/run-compile-requirements.yml b/.github/workflows/run-compile-requirements.yml
@@ -25,6 +25,6 @@ jobs:
   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"]'
diff --git a/requirements/base.in b/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.*
diff --git a/requirements/base.universal2.in b/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'
diff --git a/requirements/requirements-3.10-Linux.txt b/requirements/requirements-3.10-Linux.txt
@@ -288,20 +288,21 @@ frozenlist==1.4.0 \
     # via
     #   aiohttp
     #   aiosignal
-glean-parser==7.2.1 \
-    --hash=sha256:11496ac004fe421b914c7fbdc9a1d620e4821d56e1d9f65523d3858cdb907bbd \
-    --hash=sha256:651cfee34422ea1db90bbf1cb03732bd8c598773bf95daa289a62addeaf10295
+glean-parser==8.1.1 \
+    --hash=sha256:5fdd123d9711032a4e2acfa7983cbbfa6a53a29f7270dbe52be9e5ee1790a0f8 \
+    --hash=sha256:6d49e0c0aac34a1e9eda7fc63b12f1513efed1c827e0ac94078493114049021e
     # via
     #   -r linters.in
     #   glean-sdk
-glean-sdk==53.0.0 ; sys_platform != "darwin" \
-    --hash=sha256:0995ea815cfdea5d658c26c3fdeaa036626bd5ba1c437d0c2c882ea7d7a0eade \
-    --hash=sha256:2f97584df51baf9495d2beaa22c1109a5af42c96e686ed88155263c7cdb3b043 \
-    --hash=sha256:6225e2ae36dcc0c7af72357b783d117a8b1f9de10c9bc4b505f98ebce44806f3 \
-    --hash=sha256:825ceecd2369b23e01e22deef9e28b60b66582dd81c422267551177dbf435895 \
-    --hash=sha256:99d67d5e52a967fc02205f477a521818a680214b3a56d6547df9fb90fc54109b \
-    --hash=sha256:bda1090fcfb03aa76e63f59ea2f2b825761ec93253506dcbe8b0ffa2a9a0f874 \
-    --hash=sha256:be5722360d8a4186979bd0f7fca20f648b2d5c56b1ac0be61a1b616c7444c3e1
+glean-sdk==54.0.0 ; sys_platform != "darwin" \
+    --hash=sha256:32979762ac817ba97080e09be42154a68320b29da2282696decbfa95c9a01153 \
+    --hash=sha256:3ec60a498c3a4976d51bb04eb3f736a72b62e09a244d8cbf11cdfb71b12ed377 \
+    --hash=sha256:435ebf7ba38d8f61890c4d09c0ec0645ebce12031a8771458bccb76a7e13e59c \
+    --hash=sha256:5dcfb927266bf0f2295ca5e6bb098443df32141d484bffeaed8f0b8f456ae71a \
+    --hash=sha256:66175dc6b21226ba0382fda9101dbb8666b181998899f3204eddcf870cf4f325 \
+    --hash=sha256:74c9e34d961d553c5ba82302c23df6601f6a1ffddfcc084c2f18ea22baeb193b \
+    --hash=sha256:8a8864246b06976f17293b686892a50698feb37a9a0054dfdb6f7dd81319a162 \
+    --hash=sha256:960d861e9a25fbf7be98840c90642bf731600f11bdf6f87e15dbe2242cbe4cd1
     # via -r base.in
 idna==3.4 \
     --hash=sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4 \
@@ -825,9 +826,9 @@ soupsieve==2.5 \
     --hash=sha256:5663d5a7b3bfaeee0bc4372e7fc48f9cff4940b3eec54a6451cc5299f1097690 \
     --hash=sha256:eaa337ff55a1579b6549dc679565eac1e3d000563bcb1c8ab0d0fefbc0c2cdc7
     # via beautifulsoup4
-taskcluster==55.3.0 \
-    --hash=sha256:2468b9597547ea11a773e81563a5c2ae155b3710ce119c41f4cfeaf28827bb55 \
-    --hash=sha256:50378160bf3ae1094ac93b7535ecd8c21531337b9bf285342115e18fb9790c5e
+taskcluster==55.3.2 \
+    --hash=sha256:cf3a238e704991529f73bc103cddfdcb3a395fb5716a1d05a91f784cee97cc5b \
+    --hash=sha256:e9e298f3d4ba3aa51191f462ee63a666dfeb0a22c90ddeda7d92872fa1f07e7a
     # via -r base.in
 taskcluster-urls==13.0.1 \
     --hash=sha256:5e25e7e6818e8877178b175ff43d2e6548afad72694aa125f404a7329ece0973 \

diff --git a/requirements/requirements-3.10-Windows.txt b/requirements/requirements-3.10-Windows.txt
@@ -295,20 +295,21 @@ frozenlist==1.4.0 \
     # via
     #   aiohttp
     #   aiosignal
-glean-parser==7.2.1 \
-    --hash=sha256:11496ac004fe421b914c7fbdc9a1d620e4821d56e1d9f65523d3858cdb907bbd \
-    --hash=sha256:651cfee34422ea1db90bbf1cb03732bd8c598773bf95daa289a62addeaf10295
+glean-parser==8.1.1 \
+    --hash=sha256:5fdd123d9711032a4e2acfa7983cbbfa6a53a29f7270dbe52be9e5ee1790a0f8 \
+    --hash=sha256:6d49e0c0aac34a1e9eda7fc63b12f1513efed1c827e0ac94078493114049021e
     # via
     #   -r linters.in
     #   glean-sdk
-glean-sdk==53.0.0 ; sys_platform != "darwin" \
-    --hash=sha256:0995ea815cfdea5d658c26c3fdeaa036626bd5ba1c437d0c2c882ea7d7a0eade \
-    --hash=sha256:2f97584df51baf9495d2beaa22c1109a5af42c96e686ed88155263c7cdb3b043 \
-    --hash=sha256:6225e2ae36dcc0c7af72357b783d117a8b1f9de10c9bc4b505f98ebce44806f3 \
-    --hash=sha256:825ceecd2369b23e01e22deef9e28b60b66582dd81c422267551177dbf435895 \
-    --hash=sha256:99d67d5e52a967fc02205f477a521818a680214b3a56d6547df9fb90fc54109b \
-    --hash=sha256:bda1090fcfb03aa76e63f59ea2f2b825761ec93253506dcbe8b0ffa2a9a0f874 \
-    --hash=sha256:be5722360d8a4186979bd0f7fca20f648b2d5c56b1ac0be61a1b616c7444c3e1
+glean-sdk==54.0.0 ; sys_platform != "darwin" \
+    --hash=sha256:32979762ac817ba97080e09be42154a68320b29da2282696decbfa95c9a01153 \
+    --hash=sha256:3ec60a498c3a4976d51bb04eb3f736a72b62e09a244d8cbf11cdfb71b12ed377 \
+    --hash=sha256:435ebf7ba38d8f61890c4d09c0ec0645ebce12031a8771458bccb76a7e13e59c \
+    --hash=sha256:5dcfb927266bf0f2295ca5e6bb098443df32141d484bffeaed8f0b8f456ae71a \
+    --hash=sha256:66175dc6b21226ba0382fda9101dbb8666b181998899f3204eddcf870cf4f325 \
+    --hash=sha256:74c9e34d961d553c5ba82302c23df6601f6a1ffddfcc084c2f18ea22baeb193b \
+    --hash=sha256:8a8864246b06976f17293b686892a50698feb37a9a0054dfdb6f7dd81319a162 \
+    --hash=sha256:960d861e9a25fbf7be98840c90642bf731600f11bdf6f87e15dbe2242cbe4cd1
     # via -r base.in
 idna==3.4 \
     --hash=sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4 \
@@ -844,9 +845,9 @@ soupsieve==2.5 \
     --hash=sha256:5663d5a7b3bfaeee0bc4372e7fc48f9cff4940b3eec54a6451cc5299f1097690 \
     --hash=sha256:eaa337ff55a1579b6549dc679565eac1e3d000563bcb1c8ab0d0fefbc0c2cdc7
     # via beautifulsoup4
-taskcluster==55.3.0 \
-    --hash=sha256:2468b9597547ea11a773e81563a5c2ae155b3710ce119c41f4cfeaf28827bb55 \
-    --hash=sha256:50378160bf3ae1094ac93b7535ecd8c21531337b9bf285342115e18fb9790c5e
+taskcluster==55.3.2 \
+    --hash=sha256:cf3a238e704991529f73bc103cddfdcb3a395fb5716a1d05a91f784cee97cc5b \
+    --hash=sha256:e9e298f3d4ba3aa51191f462ee63a666dfeb0a22c90ddeda7d92872fa1f07e7a
     # via -r base.in
 taskcluster-urls==13.0.1 \
     --hash=sha256:5e25e7e6818e8877178b175ff43d2e6548afad72694aa125f404a7329ece0973 \