Skip to content

Commit

Permalink
workflows: drop Python 3.7 (bug 1854134)
Browse files Browse the repository at this point in the history
- remove Python 3.7 from all workflows
- remove Python 3.7 requirement files
- upgrade setuptools-scm
  • Loading branch information
zzzeid committed Sep 25, 2023
1 parent d976fa0 commit c64d8d8
Show file tree
Hide file tree
Showing 16 changed files with 9 additions and 10,206 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
os:
- ubuntu-20.04
- ubuntu-22.04
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
python-version: ["3.8", "3.9", "3.10", "3.11"]
steps:
- uses: actions/checkout@v3
- name: setup
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/compile-requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/run-compile-requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@ on:
jobs:
call-compile-requirements-linux:
uses: ./.github/workflows/compile-requirements.yml
needs: call-compile-requirements-mac
with:
requirements_files: '["base.in dev.in gui-dev.in gui.in linters.in"]'
os: '["ubuntu-latest"]'
python: '["3.7", "3.8", "3.9", "3.10", "3.11"]'
python: '["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"]'
Expand Down
5 changes: 2 additions & 3 deletions requirements/base.in
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ 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.8.0; python_version >= '3.8'
importlib-metadata==4.2.0; python_version < '3.8'
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
Expand All @@ -25,6 +24,6 @@ mozversion>=2.1.0
redo>=2.0.2
requests>=2.21.0
setuptools
setuptools_scm==7.*
setuptools_scm==8.*
taskcluster>=6.0.0
pyyaml==6.*
946 changes: 0 additions & 946 deletions requirements/requirements-3.10-Linux.txt

This file was deleted.

965 changes: 0 additions & 965 deletions requirements/requirements-3.10-Windows.txt

This file was deleted.

865 changes: 0 additions & 865 deletions requirements/requirements-3.10-macOS.txt

This file was deleted.

932 changes: 0 additions & 932 deletions requirements/requirements-3.11-Linux.txt

This file was deleted.

951 changes: 0 additions & 951 deletions requirements/requirements-3.11-Windows.txt

This file was deleted.

851 changes: 0 additions & 851 deletions requirements/requirements-3.11-macOS.txt

This file was deleted.

953 changes: 0 additions & 953 deletions requirements/requirements-3.7-Linux.txt

This file was deleted.

959 changes: 0 additions & 959 deletions requirements/requirements-3.8-Linux.txt

This file was deleted.

946 changes: 0 additions & 946 deletions requirements/requirements-3.9-Linux.txt

This file was deleted.

965 changes: 0 additions & 965 deletions requirements/requirements-3.9-Windows.txt

This file was deleted.

865 changes: 0 additions & 865 deletions requirements/requirements-3.9-macOS.txt

This file was deleted.

4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,18 @@
""",
package_data={"mozregression": ["*.yaml"]},
platforms=["Any"],
python_requires=">=3.7",
python_requires=">=3.8",
install_requires=DEPENDENCIES,
classifiers=[
"License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
"Development Status :: 5 - Production/Stable",
"Environment :: Console",
"Intended Audience :: Developers",
"Operating System :: OS Independent",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3 :: Only",
],
)

0 comments on commit c64d8d8

Please sign in to comment.