Skip to content

Commit

Permalink
Drop Python 3.7 support.
Browse files Browse the repository at this point in the history 
Signed-off-by: Pedro Algarvio <[email protected]>
  • Loading branch information
@s0undt3ch
s0undt3ch committed Jun 5, 2023
1 parent d988dfb commit e18d829
Show file tree
Hide file tree
Showing 24 changed files with 99 additions and 3,620 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pre-commit-action.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
- name: Check ALL Files On Branch
if: github.event_name != 'pull_request'
env:
SKIP: lint-salt,lint-tests,remove-import-headers,rstcheck
SKIP: lint-salt,lint-tests,remove-import-headers,pyupgrade
run: |
pre-commit run --show-diff-on-failure --color=always --all-files
Expand Down
188 changes: 2 additions & 186 deletions .pre-commit-config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,19 +94,6 @@ repos:
hooks:

# ----- Packaging Requirements ------------------------------------------------------------------------------------>
- id: pip-tools-compile
alias: compile-pkg-linux-3.7-zmq-requirements
name: Linux Packaging Py3.7 ZeroMQ Requirements
files: ^requirements/((base|zeromq|crypto)\.txt|static/pkg/(linux\.in|py3\.7/linux\.txt))$
pass_filenames: false
args:
- -v
- --py-version=3.7
- --platform=linux
- --include=requirements/base.txt
- --include=requirements/zeromq.txt
- requirements/static/pkg/linux.in

- id: pip-tools-compile
alias: compile-pkg-linux-3.8-zmq-requirements
name: Linux Packaging Py3.8 ZeroMQ Requirements
Expand Down Expand Up @@ -159,19 +146,6 @@ repos:
- --include=requirements/zeromq.txt
- requirements/static/pkg/linux.in

- id: pip-tools-compile
alias: compile-pkg-freebsd-3.7-zmq-requirements
name: FreeBSD Packaging Py3.7 ZeroMQ Requirements
files: ^requirements/((base|zeromq|crypto)\.txt|static/pkg/(freebsd\.in|py3\.7/freebsd\.txt))$
pass_filenames: false
args:
- -v
- --py-version=3.7
- --platform=freebsd
- --include=requirements/base.txt
- --include=requirements/zeromq.txt
- requirements/static/pkg/freebsd.in

- id: pip-tools-compile
alias: compile-pkg-freebsd-3.8-zmq-requirements
name: FreeBSD Packaging Py3.8 ZeroMQ Requirements
Expand Down Expand Up @@ -260,18 +234,6 @@ repos:
- --include=requirements/darwin.txt
- requirements/static/pkg/darwin.in

- id: pip-tools-compile
alias: compile-pkg-windows-3.7-zmq-requirements
name: Windows Packaging Py3.7 ZeroMQ Requirements
files: ^requirements/((base|zeromq|crypto|windows)\.txt|static/pkg/(windows\.in|py3\.7/windows\.txt))$
pass_filenames: false
args:
- -v
- --py-version=3.7
- --platform=windows
- --include=requirements/windows.txt
- requirements/static/pkg/windows.in

- id: pip-tools-compile
alias: compile-pkg-windows-3.8-zmq-requirements
name: Windows Packaging Py3.8 ZeroMQ Requirements
Expand Down Expand Up @@ -323,23 +285,6 @@ repos:
# <---- Packaging Requirements -------------------------------------------------------------------------------------

# ----- CI Requirements ------------------------------------------------------------------------------------------->
- id: pip-tools-compile
alias: compile-ci-linux-3.7-zmq-requirements
name: Linux CI Py3.7 ZeroMQ Requirements
files: ^requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(linux\.in|common\.in)|pkg/py3\.7/linux\.txt))$
pass_filenames: false
args:
- -v
- --py-version=3.7
- --platform=linux
- --include=requirements/base.txt
- --include=requirements/zeromq.txt
- --include=requirements/pytest.txt
- --include=requirements/static/pkg/linux.in
- --include=requirements/static/ci/common.in
- --pip-args=--constraint=requirements/static/pkg/py{py_version}/linux.txt
- requirements/static/ci/linux.in

- id: pip-tools-compile
alias: compile-ci-linux-3.8-zmq-requirements
name: Linux CI Py3.8 ZeroMQ Requirements
Expand Down Expand Up @@ -408,19 +353,6 @@ repos:
- --pip-args=--constraint=requirements/static/pkg/py{py_version}/linux.txt
- requirements/static/ci/linux.in

- id: pip-tools-compile
alias: compile-ci-linux-crypto-3.7-requirements
name: Linux CI Py3.7 Crypto Requirements
files: ^requirements/(crypto\.txt|static/ci/(crypto\.in|py3\.7/linux-crypto\.txt))$
pass_filenames: false
args:
- -v
- --py-version=3.7
- --platform=linux
- --out-prefix=linux
- --pip-args=--constraint=requirements/static/pkg/py{py_version}/linux.txt
- requirements/static/ci/crypto.in

- id: pip-tools-compile
alias: compile-ci-linux-crypto-3.8-requirements
name: Linux CI Py3.8 Crypto Requirements
Expand Down Expand Up @@ -475,23 +407,6 @@ repos:
- --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt
- requirements/static/ci/crypto.in

- id: pip-tools-compile
alias: compile-ci-freebsd-3.7-zmq-requirements
name: FreeBSD CI Py3.7 ZeroMQ Requirements
files: ^requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(freebsd|common)\.in|pkg/py3\.7/freebsd\.txt))$
pass_filenames: false
args:
- -v
- --py-version=3.7
- --platform=freebsd
- --include=requirements/base.txt
- --include=requirements/zeromq.txt
- --include=requirements/pytest.txt
- --include=requirements/static/pkg/freebsd.in
- --include=requirements/static/ci/common.in
- --pip-args=--constraint=requirements/static/pkg/py{py_version}/freebsd.txt
- requirements/static/ci/freebsd.in

- id: pip-tools-compile
alias: compile-ci-freebsd-3.8-zmq-requirements
name: FreeBSD CI Py3.8 ZeroMQ Requirements
Expand Down Expand Up @@ -560,19 +475,6 @@ repos:
- --pip-args=--constraint=requirements/static/pkg/py{py_version}/freebsd.txt
- requirements/static/ci/freebsd.in

- id: pip-tools-compile
alias: compile-ci-freebsd-crypto-3.7-requirements
name: FreeBSD CI Py3.7 Crypto Requirements
files: ^requirements/(crypto\.txt|static/ci/(crypto\.in|py3\.7/freebsd-crypto\.txt))$
pass_filenames: false
args:
- -v
- --py-version=3.7
- --platform=freebsd
- --out-prefix=freebsd
- --pip-args=--constraint=requirements/static/ci/py{py_version}/freebsd.txt
- requirements/static/ci/crypto.in

- id: pip-tools-compile
alias: compile-ci-freebsd-crypto-3.8-requirements
name: FreeBSD CI Py3.8 Crypto Requirements
Expand Down Expand Up @@ -714,22 +616,6 @@ repos:
- --pip-args=--constraint=requirements/static/ci/py{py_version}/darwin.txt
- requirements/static/ci/crypto.in

- id: pip-tools-compile
alias: compile-ci-windows-3.7-zmq-requirements
name: Windows CI Py3.7 ZeroMQ Requirements
files: requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(windows|common)\.in|pkg/py3\.7/windows\.txt))$
pass_filenames: false
args:
- -v
- --py-version=3.7
- --platform=windows
- --include=requirements/windows.txt
- --include=requirements/pytest.txt
- --include=requirements/static/pkg/windows.in
- --include=requirements/static/ci/common.in
- --pip-args=--constraint=requirements/static/pkg/py{py_version}/windows.txt
- requirements/static/ci/windows.in

- id: pip-tools-compile
alias: compile-ci-windows-3.8-zmq-requirements
name: Windows CI Py3.8 ZeroMQ Requirements
Expand Down Expand Up @@ -794,19 +680,6 @@ repos:
- --pip-args=--constraint=requirements/static/pkg/py{py_version}/windows.txt
- requirements/static/ci/windows.in

- id: pip-tools-compile
alias: compile-ci-windows-crypto-3.7-requirements
name: Windows CI Py3.7 Crypto Requirements
files: ^requirements/(crypto\.txt|static/ci/(crypto\.in|py3\.7/windows-crypto\.txt))$
pass_filenames: false
args:
- -v
- --py-version=3.7
- --platform=windows
- --out-prefix=windows
- --pip-args=--constraint=requirements/static/ci/py{py_version}/windows.txt
- requirements/static/ci/crypto.in

- id: pip-tools-compile
alias: compile-ci-windows-crypto-3.8-requirements
name: Windows CI Py3.8 Crypto Requirements
Expand Down Expand Up @@ -863,22 +736,6 @@ repos:


# ----- Cloud CI Requirements ------------------------------------------------------------------------------------->
- id: pip-tools-compile
alias: compile-ci-cloud-3.7-requirements
name: Cloud CI Py3.7 Requirements
files: ^requirements/((base|zeromq|pytest)\.txt|static/(pkg/linux\.in|ci/((cloud|common)\.in|py3\.7/cloud\.txt)))$
pass_filenames: false
args:
- -v
- --py-version=3.7
- --include=requirements/base.txt
- --include=requirements/zeromq.txt
- --include=requirements/pytest.txt
- --include=requirements/static/pkg/linux.in
- --include=requirements/static/ci/common.in
- --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt
- requirements/static/ci/cloud.in

- id: pip-tools-compile
alias: compile-ci-cloud-3.8-requirements
name: Cloud CI Py3.8 Requirements
Expand Down Expand Up @@ -929,19 +786,6 @@ repos:
# <---- Cloud CI Requirements --------------------------------------------------------------------------------------

# ----- Doc CI Requirements --------------------------------------------------------------------------------------->
- id: pip-tools-compile
alias: compile-doc-requirements
name: Docs CI Py3.7 Requirements
files: ^requirements/((base|zeromq|pytest)\.txt|static/ci/(docs|common|linux)\.in|static/pkg/linux\.in|static/pkg/.*/linux\.txt)$
pass_filenames: false
args:
- -v
- --py-version=3.7
- --platform=linux
- --include=requirements/base.txt
- --include=requirements/zeromq.txt
- requirements/static/ci/docs.in

- id: pip-tools-compile
alias: compile-doc-requirements
name: Docs CI Py3.8 Requirements
Expand Down Expand Up @@ -984,23 +828,6 @@ repos:
# <---- Doc CI Requirements ----------------------------------------------------------------------------------------

# ----- Lint CI Requirements -------------------------------------------------------------------------------------->
- id: pip-tools-compile
alias: compile-ci-lint-3.7-requirements
name: Lint CI Py3.7 Requirements
files: ^requirements/((base|zeromq)\.txt|static/(pkg/linux\.in|ci/(linux\.in|common\.in|lint\.in|py3\.7/linux\.txt)))$
pass_filenames: false
args:
- -v
- --py-version=3.7
- --platform=linux
- --include=requirements/base.txt
- --include=requirements/zeromq.txt
- --include=requirements/static/pkg/linux.in
- --include=requirements/static/ci/linux.in
- --include=requirements/static/ci/common.in
- --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt
- requirements/static/ci/lint.in

- id: pip-tools-compile
alias: compile-ci-lint-3.8-requirements
name: Lint CI Py3.8 Requirements
Expand Down Expand Up @@ -1093,17 +920,6 @@ repos:
# <---- Changelog --------------------------------------------------------------------------------------------------

# ----- Invoke ---------------------------------------------------------------------------------------------------->
- id: pip-tools-compile
alias: compile-ci-invoke-3.7-requirements
name: Linux CI Py3.7 Invoke Requirements
files: ^requirements/static/ci/(invoke\.in|py3.7/(invoke|linux)\.txt)$
pass_filenames: false
args:
- -v
- --py-version=3.7
- --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt
- requirements/static/ci/invoke.in

- id: pip-tools-compile
alias: compile-ci-invoke-3.8-requirements
name: Linux CI Py3.8 Invoke Requirements
Expand Down Expand Up @@ -1197,8 +1013,8 @@ repos:
rev: v2.37.2
hooks:
- id: pyupgrade
name: Drop six usage and Py2 support
args: [--py3-plus, --keep-mock]
name: Upgrade code for Py3.8+
args: [--py38-plus, --keep-mock]
exclude: >
(?x)^(
salt/client/ssh/ssh_py_shim.py
Expand Down
27 changes: 0 additions & 27 deletions .rstcheck.cfg
View file

This file was deleted.

Loading

0 comments on commit e18d829

Please sign in to comment.