Skip to content

Commit

Permalink
Merge branch 'master' into master-port-49955
Browse files Browse the repository at this point in the history
  • Loading branch information
@dwoz
dwoz authored Apr 23, 2020
2 parents 0548fc5 + ad70cd5 commit 962daf4
Show file tree
Hide file tree
Showing 160 changed files with 3,944 additions and 1,197 deletions.
204 changes: 203 additions & 1 deletion .pre-commit-config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,207 @@ repos:
- --py-version=3.7
- --platform=linux

- id: pip-tools-compile
alias: compile-linux-py3.8-zmq-requirements
name: Linux Py3.8 ZeroMQ Requirements
files: ^requirements/((base|zeromq|pytest)\.txt|static/linux\.in)$
exclude: ^requirements/static/(centos-6|amzn-2018\.03|lint|cloud|docs|darwin|windows)\.in$
args:
- -v
- --py-version=3.8
- --platform=linux
- --include=requirements/base.txt
- --include=requirements/zeromq.txt
- --include=requirements/pytest.txt

- id: pip-tools-compile
alias: compile-darwin-py3.8-zmq-requirements
name: Darwin Py3.8 ZeroMQ Requirements
files: ^(pkg/osx/(req|req_ext)\.txt|requirements/((base|zeromq|pytest)\.txt|static/darwin\.in))$
args:
- -v
- --py-version=3.8
- --platform=darwin
- --include=pkg/osx/req.txt
- --include=pkg/osx/req_ext.txt
- --include=requirements/base.txt
- --include=requirements/zeromq.txt
- --include=requirements/pytest.txt
- --passthrough-line-from-input=^pyobjc(.*)$

# Commented out since pywin32 and pymssql do not have packages or support for Py >= 3.8
# - id: pip-tools-compile
# alias: compile-windows-py3.8-zmq-requirements
# name: Windows Py3.8 ZeroMQ Requirements
# files: ^(pkg/windows/(req|req_win)\.txt|requirements/((base|zeromq|pytest)\.txt|static/windows\.in))$
# args:
# - -v
# - --py-version=3.8
# - --platform=windows
# - --include=pkg/windows/req.txt
# - --include=pkg/windows/req_win.txt
# - --include=requirements/base.txt
# - --include=requirements/zeromq.txt
# - --include=requirements/pytest.txt

- id: pip-tools-compile
alias: compile-cloud-py3.8-requirements
name: Cloud Py3.8 Requirements
files: ^requirements/(static/cloud\.in)$
args:
- -v
- --py-version=3.8

- id: pip-tools-compile
alias: compile-doc-requirements
name: Docs Py3.8 Requirements
files: ^requirements/((base|zeromq|pytest)\.txt|static/docs\.in)$
args:
- -v
- --py-version=3.8
- --platform=linux

- id: pip-tools-compile
alias: compile-linux-crypto-py3.8-requirements
name: Linux Py3.8 Crypto Requirements
files: ^requirements/(crypto\.txt|static/crypto\.in)$
args:
- -v
- --py-version=3.8
- --platform=linux
- --out-prefix=linux

- id: pip-tools-compile
alias: compile-darwin-crypto-py3.8-requirements
name: Darwin Py3.8 Crypto Requirements
files: ^requirements/(crypto\.txt|static/crypto\.in)$
args:
- -v
- --py-version=3.8
- --platform=darwin
- --out-prefix=darwin

# Commented out since pywin32 and pymssql do not have packages or support for Py >= 3.8
# - id: pip-tools-compile
# alias: compile-windows-crypto-py3.8-requirements
# name: Windows Py3.8 Crypto Requirements
# files: ^requirements/(crypto\.txt|static/crypto\.in)$
# args:
# - -v
# - --py-version=3.8
# - --platform=windows
# - --out-prefix=windows

- id: pip-tools-compile
alias: compile-lint-py3.8-requirements
name: Lint Py3.8 Requirements
files: ^requirements/static/lint\.in$
args:
- -v
- --py-version=3.8
- --platform=linux


- id: pip-tools-compile
alias: compile-linux-py3.9-zmq-requirements
name: Linux Py3.9 ZeroMQ Requirements
files: ^requirements/((base|zeromq|pytest)\.txt|static/linux\.in)$
exclude: ^requirements/static/(centos-6|amzn-2018\.03|lint|cloud|docs|darwin|windows)\.in$
args:
- -v
- --py-version=3.9
- --platform=linux
- --include=requirements/base.txt
- --include=requirements/zeromq.txt
- --include=requirements/pytest.txt

- id: pip-tools-compile
alias: compile-darwin-py3.9-zmq-requirements
name: Darwin Py3.9 ZeroMQ Requirements
files: ^(pkg/osx/(req|req_ext)\.txt|requirements/((base|zeromq|pytest)\.txt|static/darwin\.in))$
args:
- -v
- --py-version=3.9
- --platform=darwin
- --include=pkg/osx/req.txt
- --include=pkg/osx/req_ext.txt
- --include=requirements/base.txt
- --include=requirements/zeromq.txt
- --include=requirements/pytest.txt
- --passthrough-line-from-input=^pyobjc(.*)$

# Commented out since pywin32 and pymssql do not have packages or support for Py >= 3.8
# - id: pip-tools-compile
# alias: compile-windows-py3.9-zmq-requirements
# name: Windows Py3.9 ZeroMQ Requirements
# files: ^(pkg/windows/(req|req_win)\.txt|requirements/((base|zeromq|pytest)\.txt|static/windows\.in))$
# args:
# - -v
# - --py-version=3.9
# - --platform=windows
# - --include=pkg/windows/req.txt
# - --include=pkg/windows/req_win.txt
# - --include=requirements/base.txt
# - --include=requirements/zeromq.txt
# - --include=requirements/pytest.txt

- id: pip-tools-compile
alias: compile-cloud-py3.9-requirements
name: Cloud Py3.9 Requirements
files: ^requirements/(static/cloud\.in)$
args:
- -v
- --py-version=3.9

- id: pip-tools-compile
alias: compile-doc-requirements
name: Docs Py3.9 Requirements
files: ^requirements/((base|zeromq|pytest)\.txt|static/docs\.in)$
args:
- -v
- --py-version=3.9
- --platform=linux

- id: pip-tools-compile
alias: compile-linux-crypto-py3.9-requirements
name: Linux Py3.9 Crypto Requirements
files: ^requirements/(crypto\.txt|static/crypto\.in)$
args:
- -v
- --py-version=3.9
- --platform=linux
- --out-prefix=linux

- id: pip-tools-compile
alias: compile-darwin-crypto-py3.9-requirements
name: Darwin Py3.9 Crypto Requirements
files: ^requirements/(crypto\.txt|static/crypto\.in)$
args:
- -v
- --py-version=3.9
- --platform=darwin
- --out-prefix=darwin

# Commented out since pywin32 and pymssql do not have packages or support for Py >= 3.8
# - id: pip-tools-compile
# alias: compile-windows-crypto-py3.9-requirements
# name: Windows Py3.9 Crypto Requirements
# files: ^requirements/(crypto\.txt|static/crypto\.in)$
# args:
# - -v
# - --py-version=3.9
# - --platform=windows
# - --out-prefix=windows

- id: pip-tools-compile
alias: compile-lint-py3.9-requirements
name: Lint Py3.9 Requirements
files: ^requirements/static/lint\.in$
args:
- -v
- --py-version=3.9
- --platform=linux

- repo: https://github.com/timothycrosley/isort
rev: "1e78a9acf3110e1f9721feb591f89a451fc9876a"
hooks:
Expand All @@ -319,7 +520,7 @@ repos:
)$
- repo: https://github.com/psf/black
rev: 19.10b0
rev: stable
hooks:
- id: black
# This tells pre-commit not to pass files to black.
Expand All @@ -331,6 +532,7 @@ repos:
tests/kitchen/.*
)$
- repo: https://github.com/saltstack/salt-nox-pre-commit
rev: master
hooks:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ Versions are `MAJOR.PATCH`.
### Deprecated

### Changed
- [#56730](https://github.com/saltstack/salt/pull/56730) - Backport #52992

### Fixed

Expand Down
158 changes: 0 additions & 158 deletions COPYING
View file

This file was deleted.

Loading

0 comments on commit 962daf4

Please sign in to comment.