requirements: update various requirements

- match install requirements constraints for applicable packages - loosen the version requirement where applicable - minor fix to prevent lint error
mozilla · Sep 25, 2023 · dee202f · dee202f
1 parent ef3114d
commit dee202f
Show file tree

Hide file tree

Showing 15 changed files with 24 additions and 10,170 deletions.
diff --git a/.github/workflows/compile-requirements.yml b/.github/workflows/compile-requirements.yml
@@ -42,7 +42,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip
+          python -m pip install --upgrade pip==23.1.2
           python -m pip install --upgrade pip-tools
       - name: Generate
         # Generate filename based on Python version and OS.

diff --git a/.github/workflows/run-compile-requirements.yml b/.github/workflows/run-compile-requirements.yml
@@ -16,13 +16,15 @@ jobs:
       python: '["3.7", "3.8", "3.9", "3.10", "3.11"]'
 
   call-compile-requirements-windows:
+    needs: call-compile-requirements-linux
     uses: ./.github/workflows/compile-requirements.yml
     with:
       requirements_files: '["base.in dev.in gui-dev.in gui.in linters.in"]'
       os: '["windows-latest"]'
       python: '["3.9", "3.10", "3.11"]'
 
   call-compile-requirements-macos:
+    needs: call-compile-requirements-windows
     uses: ./.github/workflows/compile-requirements.yml
     with:
       requirements_files: '["base.in dev.in gui-dev.in gui.in linters.in"]'

diff --git a/gui/mozregui/wizard.py b/gui/mozregui/wizard.py
@@ -101,7 +101,7 @@ def __init__(self):
     def _on_repo_changed(self, text):
         enable_release = not text or text == "mozilla-central"
         build_select_page = self.wizard().page(2)
-        if type(build_select_page) == SingleBuildSelectionPage:
+        if isinstance(build_select_page, SingleBuildSelectionPage):
             build_menus = [build_select_page.ui.build]
         else:
             build_menus = [build_select_page.ui.start, build_select_page.ui.end]

diff --git a/requirements/base.in b/requirements/base.in
@@ -1,26 +1,27 @@
 --no-binary pyyaml
-PyInstaller==5.13.2
-beautifulsoup4==4.12.2
+PyInstaller==5.*
+beautifulsoup4>=4.7.1
 charset-normalizer<3
-colorama==0.4.6
-configobj==5.0.8
-dmgbuild==1.6.1
+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'
-importlib-metadata==6.7.0; python_version >= '3.8'
+importlib-metadata==6.8.0; python_version >= '3.8'
 importlib-metadata==4.2.0; python_version < '3.8'
 mozdevice>=4.1.0,<5
-mozfile==3.0.0
-mozinfo==1.2.3
-mozinstall==2.1.0
-mozlog==8.0.0
-mozprofile==2.6.1
-mozrunner==8.3.0
-mozversion==2.4.0
-redo==2.0.4
-requests==2.31.0
+mozfile>=2.0.0
+mozinfo>=1.1.0
+mozinstall>=2.0.0
+mozlog>=4.0
+mozprocess>=1.3.1
+mozprofile>=2.2.0
+mozrunner>=8.0.2
+mozversion>=2.1.0
+redo>=2.0.2
+requests>=2.21.0
 setuptools
-setuptools_scm==7.1.0
-taskcluster==55.1.1
-pyyaml==6.0.1
+setuptools_scm==7.*
+taskcluster>=6.0.0
+pyyaml==6.*
diff --git a/requirements/requirements-3.10-Linux.txt b/requirements/requirements-3.10-Linux.txt
diff --git a/requirements/requirements-3.10-Windows.txt b/requirements/requirements-3.10-Windows.txt
diff --git a/requirements/requirements-3.10-macOS.txt b/requirements/requirements-3.10-macOS.txt
diff --git a/requirements/requirements-3.11-Linux.txt b/requirements/requirements-3.11-Linux.txt
diff --git a/requirements/requirements-3.11-Windows.txt b/requirements/requirements-3.11-Windows.txt
diff --git a/requirements/requirements-3.11-macOS.txt b/requirements/requirements-3.11-macOS.txt
diff --git a/requirements/requirements-3.7-Linux.txt b/requirements/requirements-3.7-Linux.txt
diff --git a/requirements/requirements-3.8-Linux.txt b/requirements/requirements-3.8-Linux.txt
diff --git a/requirements/requirements-3.9-Linux.txt b/requirements/requirements-3.9-Linux.txt
diff --git a/requirements/requirements-3.9-Windows.txt b/requirements/requirements-3.9-Windows.txt
diff --git a/requirements/requirements-3.9-macOS.txt b/requirements/requirements-3.9-macOS.txt