Skip to content

Commit

Permalink
workflows: drop Python 3.7 (bug 1854134) (#1469)
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 authored Sep 25, 2023
1 parent d976fa0 commit c73a493
Show file tree
Hide file tree
Showing 15 changed files with 46 additions and 1,012 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/run-compile-requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
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:
uses: ./.github/workflows/compile-requirements.yml
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.*
8 changes: 4 additions & 4 deletions requirements/requirements-3.10-Linux.txt
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ idna==3.4 \
# via
# requests
# yarl
importlib-metadata==6.8.0 ; python_version >= "3.8" \
importlib-metadata==6.8.0 \
--hash=sha256:3ebb78df84a805d7698245025b975d9d67053cd94c79245ba4b3eb694abe68bb \
--hash=sha256:dbace7892d8c0c4ac1ad096662232f831d4e64f4c4545bd53016a3e9d4654743
# via -r base.in
Expand Down Expand Up @@ -786,9 +786,9 @@ semver==3.0.1 \
--hash=sha256:2a23844ba1647362c7490fe3995a86e097bb590d16f0f32dfc383008f19e4cdf \
--hash=sha256:9ec78c5447883c67b97f98c3b6212796708191d22e4ad30f4570f840171cbce1
# via glean-sdk
setuptools-scm==7.1.0 \
--hash=sha256:6c508345a771aad7d56ebff0e70628bf2b0ec7573762be9960214730de278f27 \
--hash=sha256:73988b6d848709e2af142aa48c986ea29592bbcfca5375678064708205253d8e
setuptools-scm==8.0.3 \
--hash=sha256:0169fd70197efda2f8c4d0b2a7a3d614431b488116f37b79d031e9e7ec884d8c \
--hash=sha256:813822234453438a13c78d05c8af29918fbc06f88efb33d38f065340bbb48c39
# via -r base.in
shiboken6==6.5.1.1 \
--hash=sha256:1c7ba82093d66ace5c7a07ed9c7b4ea57a311ddbfecbe44aff7ed023efc8a380 \
Expand Down
8 changes: 4 additions & 4 deletions requirements/requirements-3.10-Windows.txt
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ idna==3.4 \
# via
# requests
# yarl
importlib-metadata==6.8.0 ; python_version >= "3.8" \
importlib-metadata==6.8.0 \
--hash=sha256:3ebb78df84a805d7698245025b975d9d67053cd94c79245ba4b3eb694abe68bb \
--hash=sha256:dbace7892d8c0c4ac1ad096662232f831d4e64f4c4545bd53016a3e9d4654743
# via -r base.in
Expand Down Expand Up @@ -805,9 +805,9 @@ semver==3.0.1 \
--hash=sha256:2a23844ba1647362c7490fe3995a86e097bb590d16f0f32dfc383008f19e4cdf \
--hash=sha256:9ec78c5447883c67b97f98c3b6212796708191d22e4ad30f4570f840171cbce1
# via glean-sdk
setuptools-scm==7.1.0 \
--hash=sha256:6c508345a771aad7d56ebff0e70628bf2b0ec7573762be9960214730de278f27 \
--hash=sha256:73988b6d848709e2af142aa48c986ea29592bbcfca5375678064708205253d8e
setuptools-scm==8.0.3 \
--hash=sha256:0169fd70197efda2f8c4d0b2a7a3d614431b488116f37b79d031e9e7ec884d8c \
--hash=sha256:813822234453438a13c78d05c8af29918fbc06f88efb33d38f065340bbb48c39
# via -r base.in
shiboken6==6.5.1.1 \
--hash=sha256:1c7ba82093d66ace5c7a07ed9c7b4ea57a311ddbfecbe44aff7ed023efc8a380 \
Expand Down
8 changes: 4 additions & 4 deletions requirements/requirements-3.10-macOS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ idna==3.4 \
# via
# requests
# yarl
importlib-metadata==6.8.0 ; python_version >= "3.8" \
importlib-metadata==6.8.0 \
--hash=sha256:3ebb78df84a805d7698245025b975d9d67053cd94c79245ba4b3eb694abe68bb \
--hash=sha256:dbace7892d8c0c4ac1ad096662232f831d4e64f4c4545bd53016a3e9d4654743
# via -r base.in
Expand Down Expand Up @@ -705,9 +705,9 @@ semver==3.0.1 \
--hash=sha256:2a23844ba1647362c7490fe3995a86e097bb590d16f0f32dfc383008f19e4cdf \
--hash=sha256:9ec78c5447883c67b97f98c3b6212796708191d22e4ad30f4570f840171cbce1
# via glean-sdk
setuptools-scm==7.1.0 \
--hash=sha256:6c508345a771aad7d56ebff0e70628bf2b0ec7573762be9960214730de278f27 \
--hash=sha256:73988b6d848709e2af142aa48c986ea29592bbcfca5375678064708205253d8e
setuptools-scm==8.0.3 \
--hash=sha256:0169fd70197efda2f8c4d0b2a7a3d614431b488116f37b79d031e9e7ec884d8c \
--hash=sha256:813822234453438a13c78d05c8af29918fbc06f88efb33d38f065340bbb48c39
# via -r base.in
shiboken6==6.5.1.1 \
--hash=sha256:1c7ba82093d66ace5c7a07ed9c7b4ea57a311ddbfecbe44aff7ed023efc8a380 \
Expand Down
12 changes: 4 additions & 8 deletions requirements/requirements-3.11-Linux.txt
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ idna==3.4 \
# via
# requests
# yarl
importlib-metadata==6.8.0 ; python_version >= "3.8" \
importlib-metadata==6.8.0 \
--hash=sha256:3ebb78df84a805d7698245025b975d9d67053cd94c79245ba4b3eb694abe68bb \
--hash=sha256:dbace7892d8c0c4ac1ad096662232f831d4e64f4c4545bd53016a3e9d4654743
# via -r base.in
Expand Down Expand Up @@ -782,9 +782,9 @@ semver==3.0.1 \
--hash=sha256:2a23844ba1647362c7490fe3995a86e097bb590d16f0f32dfc383008f19e4cdf \
--hash=sha256:9ec78c5447883c67b97f98c3b6212796708191d22e4ad30f4570f840171cbce1
# via glean-sdk
setuptools-scm==7.1.0 \
--hash=sha256:6c508345a771aad7d56ebff0e70628bf2b0ec7573762be9960214730de278f27 \
--hash=sha256:73988b6d848709e2af142aa48c986ea29592bbcfca5375678064708205253d8e
setuptools-scm==8.0.3 \
--hash=sha256:0169fd70197efda2f8c4d0b2a7a3d614431b488116f37b79d031e9e7ec884d8c \
--hash=sha256:813822234453438a13c78d05c8af29918fbc06f88efb33d38f065340bbb48c39
# via -r base.in
shiboken6==6.5.1.1 \
--hash=sha256:1c7ba82093d66ace5c7a07ed9c7b4ea57a311ddbfecbe44aff7ed023efc8a380 \
Expand Down Expand Up @@ -829,10 +829,6 @@ taskcluster-urls==13.0.1 \
--hash=sha256:b25e122ecec249c4299ac7b20b08db76e3e2025bdaeb699a9d444556de5fd367 \
--hash=sha256:f66dcbd6572a6216ab65949f0fa0b91f2df647918028436c384e6af5cd12ae2b
# via taskcluster
typing-extensions==4.8.0 \
--hash=sha256:8f92fc8806f9a6b641eaa5318da32b44d401efaac0f6678c9bc448ba3605faa0 \
--hash=sha256:df8e4339e9cb77357558cbdbceca33c303714cf861d1eef15e1070055ae8b7ef
# via setuptools-scm
urllib3==2.0.5 \
--hash=sha256:13abf37382ea2ce6fb744d4dad67838eec857c9f4f57009891805e0b5e123594 \
--hash=sha256:ef16afa8ba34a1f989db38e1dbbe0c302e4289a47856990d0682e374563ce35e
Expand Down
12 changes: 4 additions & 8 deletions requirements/requirements-3.11-Windows.txt
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ idna==3.4 \
# via
# requests
# yarl
importlib-metadata==6.8.0 ; python_version >= "3.8" \
importlib-metadata==6.8.0 \
--hash=sha256:3ebb78df84a805d7698245025b975d9d67053cd94c79245ba4b3eb694abe68bb \
--hash=sha256:dbace7892d8c0c4ac1ad096662232f831d4e64f4c4545bd53016a3e9d4654743
# via -r base.in
Expand Down Expand Up @@ -801,9 +801,9 @@ semver==3.0.1 \
--hash=sha256:2a23844ba1647362c7490fe3995a86e097bb590d16f0f32dfc383008f19e4cdf \
--hash=sha256:9ec78c5447883c67b97f98c3b6212796708191d22e4ad30f4570f840171cbce1
# via glean-sdk
setuptools-scm==7.1.0 \
--hash=sha256:6c508345a771aad7d56ebff0e70628bf2b0ec7573762be9960214730de278f27 \
--hash=sha256:73988b6d848709e2af142aa48c986ea29592bbcfca5375678064708205253d8e
setuptools-scm==8.0.3 \
--hash=sha256:0169fd70197efda2f8c4d0b2a7a3d614431b488116f37b79d031e9e7ec884d8c \
--hash=sha256:813822234453438a13c78d05c8af29918fbc06f88efb33d38f065340bbb48c39
# via -r base.in
shiboken6==6.5.1.1 \
--hash=sha256:1c7ba82093d66ace5c7a07ed9c7b4ea57a311ddbfecbe44aff7ed023efc8a380 \
Expand Down Expand Up @@ -848,10 +848,6 @@ taskcluster-urls==13.0.1 \
--hash=sha256:b25e122ecec249c4299ac7b20b08db76e3e2025bdaeb699a9d444556de5fd367 \
--hash=sha256:f66dcbd6572a6216ab65949f0fa0b91f2df647918028436c384e6af5cd12ae2b
# via taskcluster
typing-extensions==4.8.0 \
--hash=sha256:8f92fc8806f9a6b641eaa5318da32b44d401efaac0f6678c9bc448ba3605faa0 \
--hash=sha256:df8e4339e9cb77357558cbdbceca33c303714cf861d1eef15e1070055ae8b7ef
# via setuptools-scm
urllib3==2.0.5 \
--hash=sha256:13abf37382ea2ce6fb744d4dad67838eec857c9f4f57009891805e0b5e123594 \
--hash=sha256:ef16afa8ba34a1f989db38e1dbbe0c302e4289a47856990d0682e374563ce35e
Expand Down
12 changes: 4 additions & 8 deletions requirements/requirements-3.11-macOS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ idna==3.4 \
# via
# requests
# yarl
importlib-metadata==6.8.0 ; python_version >= "3.8" \
importlib-metadata==6.8.0 \
--hash=sha256:3ebb78df84a805d7698245025b975d9d67053cd94c79245ba4b3eb694abe68bb \
--hash=sha256:dbace7892d8c0c4ac1ad096662232f831d4e64f4c4545bd53016a3e9d4654743
# via -r base.in
Expand Down Expand Up @@ -701,9 +701,9 @@ semver==3.0.1 \
--hash=sha256:2a23844ba1647362c7490fe3995a86e097bb590d16f0f32dfc383008f19e4cdf \
--hash=sha256:9ec78c5447883c67b97f98c3b6212796708191d22e4ad30f4570f840171cbce1
# via glean-sdk
setuptools-scm==7.1.0 \
--hash=sha256:6c508345a771aad7d56ebff0e70628bf2b0ec7573762be9960214730de278f27 \
--hash=sha256:73988b6d848709e2af142aa48c986ea29592bbcfca5375678064708205253d8e
setuptools-scm==8.0.3 \
--hash=sha256:0169fd70197efda2f8c4d0b2a7a3d614431b488116f37b79d031e9e7ec884d8c \
--hash=sha256:813822234453438a13c78d05c8af29918fbc06f88efb33d38f065340bbb48c39
# via -r base.in
shiboken6==6.5.1.1 \
--hash=sha256:1c7ba82093d66ace5c7a07ed9c7b4ea57a311ddbfecbe44aff7ed023efc8a380 \
Expand Down Expand Up @@ -748,10 +748,6 @@ taskcluster-urls==13.0.1 \
--hash=sha256:b25e122ecec249c4299ac7b20b08db76e3e2025bdaeb699a9d444556de5fd367 \
--hash=sha256:f66dcbd6572a6216ab65949f0fa0b91f2df647918028436c384e6af5cd12ae2b
# via taskcluster
typing-extensions==4.8.0 \
--hash=sha256:8f92fc8806f9a6b641eaa5318da32b44d401efaac0f6678c9bc448ba3605faa0 \
--hash=sha256:df8e4339e9cb77357558cbdbceca33c303714cf861d1eef15e1070055ae8b7ef
# via setuptools-scm
urllib3==2.0.5 \
--hash=sha256:13abf37382ea2ce6fb744d4dad67838eec857c9f4f57009891805e0b5e123594 \
--hash=sha256:ef16afa8ba34a1f989db38e1dbbe0c302e4289a47856990d0682e374563ce35e
Expand Down
Loading

0 comments on commit c73a493

Please sign in to comment.