saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Allow pre-commit for Python 3.8

Browse source
This commit is contained in:
twangboy 2021-03-22 16:43:28 -06:00 • committed by Gareth J. Greenaway
parent dcd1925475
commit 647c1e90d3
3 changed files with 47 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
.pre-commit-config.yaml
View file

@ -208,18 +208,17 @@ repos:
- --include=requirements/windows.txt - --include=requirements/windows.txt
- requirements/static/pkg/windows.in - requirements/static/pkg/windows.in
# Commented out since pywin32 and pymssql do not have packages or support for Py >= 3.8 - id: pip-tools-compile
# - id: pip-tools-compile alias: compile-pkg-windows-3.8-zmq-requirements
# alias: compile-pkg-windows-3.8-zmq-requirements name: Windows Packaging Py3.8 ZeroMQ Requirements
# name: Windows Packaging Py3.8 ZeroMQ Requirements files: ^requirements/((base|zeromq|crypto|windows)\.txt|static/pkg/(windows\.in|py3\.8/windows\.txt))$
# files: ^requirements/((base|zeromq|crypto|windows)\.txt|static/pkg/(windows\.in|py3\.8/windows\.txt))$ pass_filenames: false
# pass_filenames: false args:
# args: - -v
# - -v - --py-version=3.8
# - --py-version=3.8 - --platform=windows
# - --platform=windows - --include=requirements/windows.txt
# - --include=requirements/windows.txt - requirements/static/pkg/windows.in
# - requirements/static/pkg/windows.in
# Commented out since pywin32 and pymssql do not have packages or support for Py >= 3.9 # Commented out since pywin32 and pymssql do not have packages or support for Py >= 3.9
# - id: pip-tools-compile # - id: pip-tools-compile
@ -641,20 +640,19 @@ repos:
- --include=requirements/static/ci/common.in - --include=requirements/static/ci/common.in
- requirements/static/ci/windows.in - requirements/static/ci/windows.in
# Commented out since pywin32 and pymssql do not have packages or support for Py >= 3.8 - id: pip-tools-compile
# - id: pip-tools-compile alias: compile-ci-windows-py3.8-zmq-requirements
# alias: compile-ci-windows-py3.8-zmq-requirements name: Windows CI Py3.8 ZeroMQ Requirements
# name: Windows CI Py3.8 ZeroMQ Requirements files: requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(windows|common)\.in|pkg/py3\.8/windows\.txt))$
# files: requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(windows|common)\.in|pkg/py3\.8/windows\.txt))$ pass_filenames: false
# pass_filenames: false args:
# args: - -v
# - -v - --py-version=3.8
# - --py-version=3.8 - --platform=windows
# - --platform=windows - --include=requirements/static/pkg/py{py_version}/windows.txt
# - --include=requirements/static/pkg/py{py_version}/windows.txt - --include=requirements/pytest.txt
# - --include=requirements/pytest.txt - --include=requirements/static/ci/common.in
# - --include=requirements/static/ci/common.in - requirements/static/ci/windows.in
# - requirements/static/ci/windows.in
# Commented out since pywin32 and pymssql do not have packages or support for Py >= 3.9 # Commented out since pywin32 and pymssql do not have packages or support for Py >= 3.9
# - id: pip-tools-compile # - id: pip-tools-compile
@ -698,20 +696,19 @@ repos:
- --out-prefix=windows - --out-prefix=windows
- requirements/static/ci/crypto.in - requirements/static/ci/crypto.in
# Commented out since pywin32 and pymssql do not have packages or support for Py >= 3.8 - id: pip-tools-compile
# - id: pip-tools-compile alias: compile-ci-windows-crypto-py3.8-requirements
# alias: compile-ci-windows-crypto-py3.8-requirements name: Windows CI Py3.8 Crypto Requirements
# name: Windows CI Py3.8 Crypto Requirements files: ^requirements/(crypto\.txt|static/ci/crypto\.in)$
# files: ^requirements/(crypto\.txt|static/ci/crypto\.in)$ pass_filenames: false
# pass_filenames: false args:
# args: - -v
# - -v - --py-version=3.8
# - --py-version=3.8 - --platform=windows
# - --platform=windows - --out-prefix=windows
# - --out-prefix=windows - requirements/static/ci/crypto.in
# - requirements/static/ci/crypto.in
# Commented out since pywin32 and pymssql do not have packages or support for Py >= 3.8 # Commented out since pywin32 and pymssql do not have packages or support for Py >= 3.9
# - id: pip-tools-compile # - id: pip-tools-compile
# alias: compile-ci-windows-crypto-py3.9-requirements # alias: compile-ci-windows-crypto-py3.9-requirements
# name: Windows CI Py3.9 Crypto Requirements # name: Windows CI Py3.9 Crypto Requirements

6
pkg/windows/modules/get-settings.psm1
View file

@ -83,12 +83,18 @@ Function Get-Settings {
# DLL's for 64 bit Windows # DLL's for 64 bit Windows
$64bitDLLs = @{ $64bitDLLs = @{
"Libeay" = "libeay32.dll"
"SSLeay" = "ssleay32.dll"
"OpenSSLLic" = "OpenSSL_License.txt"
"Libsodium" = "libsodium/1.0.18/libsodium.dll" "Libsodium" = "libsodium/1.0.18/libsodium.dll"
} }
$ini.Add("64bitDLLs", $64bitDLLs) $ini.Add("64bitDLLs", $64bitDLLs)
# DLL's for 32 bit Windows # DLL's for 32 bit Windows
$32bitDLLs = @{ $32bitDLLs = @{
"Libeay" = "libeay32.dll"
"SSLeay" = "ssleay32.dll"
"OpenSSLLic" = "OpenSSL_License.txt"
"Libsodium" = "libsodium/1.0.18/libsodium.dll" "Libsodium" = "libsodium/1.0.18/libsodium.dll"
} }
$ini.Add("32bitDLLs", $32bitDLLs) $ini.Add("32bitDLLs", $32bitDLLs)

6
setup.py
View file

@ -504,7 +504,11 @@ class DownloadWindowsDlls(Command):
url = "https://repo.saltstack.com/windows/dependencies/{bits}/{fname}" url = "https://repo.saltstack.com/windows/dependencies/{bits}/{fname}"
dest = os.path.join(os.path.dirname(sys.executable), "{fname}") dest = os.path.join(os.path.dirname(sys.executable), "{fname}")
with indent_log(): with indent_log():
for fname in ("libsodium/1.0.18/libsodium.dll",): for fname in (
"ssleay32.dll",
"libeay32.dll",
"libsodium/1.0.18/libsodium.dll",
):
# See if the library is already on the system # See if the library is already on the system
if find_library(fname): if find_library(fname):
continue continue