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 2

Further cleanup, removed used of looseversion and packaging

Browse source
This commit is contained in:
David Murphy 2022-12-16 09:34:54 -07:00 • committed by Megan Wilhite
parent fb1178de60
commit 75b1be30a6
47 changed files with 40 additions and 302 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pyproject.toml
View file

@ -1,7 +1,3 @@
## [build-system]
## requires = ["setuptools", "wheel", "packaging", "looseversion"]
## build-backend = "setuptools.build_meta"
[tool.black]
exclude= """
/(

7
requirements/base.txt
View file

@ -9,10 +9,3 @@ psutil>=5.0.0
# We need contextvars for salt-ssh
contextvars
# since removal of distutils support
setuptools
looseversion
# pyparsing!=3.0.5,>=2.0.2
pyparsing==3.0.9
packaging==21.3

2
requirements/darwin.txt
View file

@ -20,4 +20,4 @@ setproctitle>=1.2.3 ; python_version >= '3.10'
timelib>=0.2.5
vultr>=1.0.1
importlib_metadata>=3.3.0; python_version < '3.10'
importlib_metadata>=3.3.0; python_version >= '3.6' and python_version < '3.10'

7
requirements/static/ci/py3.10/cloud.txt
View file

@ -485,8 +485,6 @@ kubernetes==3.0.0
# via -r requirements/static/ci/common.in
libnacl==1.8.0 ; sys_platform != "win32" and sys_platform != "darwin"
# via -r requirements/static/ci/common.in
looseversion==1.0.2
# via -r requirements/base.txt
lxml==4.9.1
# via
# junos-eznc
@ -624,9 +622,7 @@ oauthlib==3.2.1
oscrypto==1.2.1
# via certvalidator
packaging==21.3
# via
# -r requirements/base.txt
# pytest
# via pytest
paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin"
# via
# -r requirements/static/ci/common.in
@ -675,7 +671,6 @@ pyopenssl==20.0.1
# etcd3-py
pyparsing==3.0.9
# via
# -r requirements/base.txt
# junos-eznc
# packaging
pypsexec==0.1.0

7
requirements/static/ci/py3.10/darwin.txt
View file

@ -486,8 +486,6 @@ kubernetes==3.0.0
# via -r requirements/static/ci/common.in
linode-python==1.1.1
# via -r requirements/darwin.txt
looseversion==1.0.2
# via -r requirements/base.txt
lxml==4.9.1
# via
# junos-eznc
@ -623,9 +621,7 @@ oauthlib==3.2.1
oscrypto==1.2.0
# via certvalidator
packaging==21.3
# via
# -r requirements/base.txt
# pytest
# via pytest
paramiko==2.10.1
# via
# junos-eznc
@ -675,7 +671,6 @@ pyopenssl==19.0.0
# etcd3-py
pyparsing==3.0.9
# via
# -r requirements/base.txt
# junos-eznc
# packaging
pyrsistent==0.17.3

4
requirements/static/ci/py3.10/docs.txt
View file

@ -492,8 +492,6 @@ kubernetes==3.0.0
# via -r requirements/static/ci/common.in
libnacl==1.8.0 ; sys_platform != "win32" and sys_platform != "darwin"
# via -r requirements/static/ci/common.in
looseversion==1.0.2
# via -r requirements/base.txt
lxml==4.9.1
# via
# junos-eznc
@ -624,7 +622,6 @@ oscrypto==1.2.1
# via certvalidator
packaging==21.3
# via
# -r requirements/base.txt
# ansible-core
# sphinx
paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin"
@ -678,7 +675,6 @@ pyopenssl==19.1.0
# etcd3-py
pyparsing==3.0.9
# via
# -r requirements/base.txt
# junos-eznc
# packaging
pyrsistent==0.18.0

7
requirements/static/ci/py3.10/freebsd.txt
View file

@ -483,8 +483,6 @@ kubernetes==3.0.0
# via -r requirements/static/ci/common.in
libnacl==1.7.1 ; sys_platform != "win32" and sys_platform != "darwin"
# via -r requirements/static/ci/common.in
looseversion==1.0.2
# via -r requirements/base.txt
lxml==4.9.1
# via
# junos-eznc
@ -618,9 +616,7 @@ oauthlib==3.2.1
oscrypto==1.2.0
# via certvalidator
packaging==21.3
# via
# -r requirements/base.txt
# pytest
# via pytest
paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin"
# via
# -r requirements/static/ci/common.in
@ -672,7 +668,6 @@ pyopenssl==19.1.0
# etcd3-py
pyparsing==3.0.9
# via
# -r requirements/base.txt
# junos-eznc
# packaging
pyrsistent==0.17.3

7
requirements/static/ci/py3.10/lint.txt
View file

@ -486,8 +486,6 @@ lazy-object-proxy==1.4.3
# via astroid
libnacl==1.8.0 ; sys_platform != "win32" and sys_platform != "darwin"
# via -r requirements/static/ci/common.in
looseversion==1.0.2
# via -r requirements/base.txt
lxml==4.9.1
# via
# junos-eznc
@ -621,9 +619,7 @@ oauthlib==3.2.1
oscrypto==1.2.1
# via certvalidator
packaging==21.3
# via
# -r requirements/base.txt
# ansible-core
# via ansible-core
paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin"
# via
# -r requirements/static/ci/common.in
@ -679,7 +675,6 @@ pyopenssl==20.0.1
# etcd3-py
pyparsing==3.0.9
# via
# -r requirements/base.txt
# junos-eznc
# packaging
pyrsistent==0.18.0

4
requirements/static/ci/py3.10/linux.txt
View file

@ -500,8 +500,6 @@ kubernetes==3.0.0
# via -r requirements/static/ci/common.in
libnacl==1.7.1 ; sys_platform != "win32" and sys_platform != "darwin"
# via -r requirements/static/ci/common.in
looseversion==1.0.2
# via -r requirements/base.txt
lxml==4.9.1
# via
# junos-eznc
@ -633,7 +631,6 @@ oscrypto==1.2.0
# via certvalidator
packaging==21.3
# via
# -r requirements/base.txt
# ansible-core
# pytest
paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin"
@ -693,7 +690,6 @@ pyopenssl==19.1.0
# etcd3-py
pyparsing==3.0.9
# via
# -r requirements/base.txt
# junos-eznc
# packaging
pyrsistent==0.17.3

10
requirements/static/ci/py3.10/windows.txt
View file

@ -157,8 +157,6 @@ kubernetes==3.0.0
# via -r requirements/static/ci/common.in
libnacl==1.8.0
# via -r requirements/windows.txt
looseversion==1.0.2
# via -r requirements/base.txt
lxml==4.9.1
# via -r requirements/windows.txt
mako==1.2.2
@ -193,9 +191,7 @@ multidict==6.0.2
ntlm-auth==1.5.0
# via requests-ntlm
packaging==21.3
# via
# -r requirements/base.txt
# pytest
# via pytest
passlib[bcrypt]==1.7.4
# via -r requirements/static/ci/common.in
patch==1.16
@ -242,9 +238,7 @@ pyopenssl==20.0.1
# -r requirements/windows.txt
# etcd3-py
pyparsing==3.0.9
# via
# -r requirements/base.txt
# packaging
# via packaging
pyrsistent==0.17.3
# via jsonschema
pytest-custom-exit-code==0.3.0

7
requirements/static/ci/py3.7/cloud.txt
View file

@ -511,8 +511,6 @@ libnacl==1.8.0 ; sys_platform != "win32" and sys_platform != "darwin"
# via -r requirements/static/ci/common.in
loguru==0.6.0
# via ciscoconfparse
looseversion==1.0.2
# via -r requirements/base.txt
lxml==4.9.1
# via
# junos-eznc
@ -663,9 +661,7 @@ oauthlib==3.2.1
oscrypto==1.2.1
# via certvalidator
packaging==21.3
# via
# -r requirements/base.txt
# pytest
# via pytest
paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin"
# via
# -r requirements/static/ci/common.in
@ -717,7 +713,6 @@ pyopenssl==20.0.1
# etcd3-py
pyparsing==3.0.9
# via
# -r requirements/base.txt
# junos-eznc
# packaging
pypsexec==0.1.0

4
requirements/static/ci/py3.7/docs.txt
View file

@ -516,8 +516,6 @@ libnacl==1.8.0 ; sys_platform != "win32" and sys_platform != "darwin"
# via -r requirements/static/ci/common.in
loguru==0.6.0
# via ciscoconfparse
looseversion==1.0.2
# via -r requirements/base.txt
lxml==4.9.1
# via
# junos-eznc
@ -662,7 +660,6 @@ oscrypto==1.2.1
# via certvalidator
packaging==21.3
# via
# -r requirements/base.txt
# ansible-core
# sphinx
paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin"
@ -719,7 +716,6 @@ pyopenssl==19.1.0
# etcd3-py
pyparsing==3.0.9
# via
# -r requirements/base.txt
# junos-eznc
# packaging
pyrsistent==0.18.0

7
requirements/static/ci/py3.7/freebsd.txt
View file

@ -508,8 +508,6 @@ kubernetes==3.0.0
# via -r requirements/static/ci/common.in
libnacl==1.7.1 ; sys_platform != "win32" and sys_platform != "darwin"
# via -r requirements/static/ci/common.in
looseversion==1.0.2
# via -r requirements/base.txt
lxml==4.9.1
# via
# junos-eznc
@ -653,9 +651,7 @@ oauthlib==3.2.1
oscrypto==1.2.0
# via certvalidator
packaging==21.3
# via
# -r requirements/base.txt
# pytest
# via pytest
paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin"
# via
# -r requirements/static/ci/common.in
@ -710,7 +706,6 @@ pyopenssl==19.1.0
# etcd3-py
pyparsing==3.0.9
# via
# -r requirements/base.txt
# junos-eznc
# packaging
pyrsistent==0.17.3

7
requirements/static/ci/py3.7/lint.txt
View file

@ -512,8 +512,6 @@ libnacl==1.8.0 ; sys_platform != "win32" and sys_platform != "darwin"
# via -r requirements/static/ci/common.in
loguru==0.6.0
# via ciscoconfparse
looseversion==1.0.2
# via -r requirements/base.txt
lxml==4.9.1
# via
# junos-eznc
@ -661,9 +659,7 @@ oauthlib==3.2.1
oscrypto==1.2.1
# via certvalidator
packaging==21.3
# via
# -r requirements/base.txt
# ansible-core
# via ansible-core
paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin"
# via
# -r requirements/static/ci/common.in
@ -722,7 +718,6 @@ pyopenssl==20.0.1
# etcd3-py
pyparsing==3.0.9
# via
# -r requirements/base.txt
# junos-eznc
# packaging
pyrsistent==0.18.0

4
requirements/static/ci/py3.7/linux.txt
View file

@ -523,8 +523,6 @@ kubernetes==3.0.0
# via -r requirements/static/ci/common.in
libnacl==1.7.1 ; sys_platform != "win32" and sys_platform != "darwin"
# via -r requirements/static/ci/common.in
looseversion==1.0.2
# via -r requirements/base.txt
lxml==4.9.1
# via
# junos-eznc
@ -666,7 +664,6 @@ oscrypto==1.2.0
# via certvalidator
packaging==21.3
# via
# -r requirements/base.txt
# ansible-core
# pytest
paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin"
@ -729,7 +726,6 @@ pyopenssl==19.1.0
# etcd3-py
pyparsing==3.0.9
# via
# -r requirements/base.txt
# junos-eznc
# packaging
pyrsistent==0.17.3

10
requirements/static/ci/py3.7/windows.txt
View file

@ -173,8 +173,6 @@ kubernetes==3.0.0
# via -r requirements/static/ci/common.in
libnacl==1.8.0
# via -r requirements/windows.txt
looseversion==1.0.2
# via -r requirements/base.txt
lxml==4.9.1
# via -r requirements/windows.txt
mako==1.2.2
@ -208,9 +206,7 @@ multidict==6.0.2
ntlm-auth==1.5.0
# via requests-ntlm
packaging==21.3
# via
# -r requirements/base.txt
# pytest
# via pytest
passlib[bcrypt]==1.7.4
# via -r requirements/static/ci/common.in
patch==1.16
@ -256,9 +252,7 @@ pyopenssl==20.0.1
# -r requirements/windows.txt
# etcd3-py
pyparsing==3.0.9
# via
# -r requirements/base.txt
# packaging
# via packaging
pyrsistent==0.17.3
# via jsonschema
pytest-custom-exit-code==0.3.0

7
requirements/static/ci/py3.8/cloud.txt
View file

@ -500,8 +500,6 @@ libnacl==1.8.0 ; sys_platform != "win32" and sys_platform != "darwin"
# via -r requirements/static/ci/common.in
loguru==0.6.0
# via ciscoconfparse
looseversion==1.0.2
# via -r requirements/base.txt
lxml==4.9.1
# via
# junos-eznc
@ -652,9 +650,7 @@ oauthlib==3.2.1
oscrypto==1.2.1
# via certvalidator
packaging==21.3
# via
# -r requirements/base.txt
# pytest
# via pytest
paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin"
# via
# -r requirements/static/ci/common.in
@ -706,7 +702,6 @@ pyopenssl==20.0.1
# etcd3-py
pyparsing==3.0.9
# via
# -r requirements/base.txt
# junos-eznc
# packaging
pypsexec==0.1.0

4
requirements/static/ci/py3.8/docs.txt
View file

@ -507,8 +507,6 @@ libnacl==1.8.0 ; sys_platform != "win32" and sys_platform != "darwin"
# via -r requirements/static/ci/common.in
loguru==0.6.0
# via ciscoconfparse
looseversion==1.0.2
# via -r requirements/base.txt
lxml==4.9.1
# via
# junos-eznc
@ -653,7 +651,6 @@ oscrypto==1.2.1
# via certvalidator
packaging==21.3
# via
# -r requirements/base.txt
# ansible-core
# sphinx
paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin"
@ -710,7 +707,6 @@ pyopenssl==19.1.0
# etcd3-py
pyparsing==3.0.9
# via
# -r requirements/base.txt
# junos-eznc
# packaging
pyrsistent==0.18.0

7
requirements/static/ci/py3.8/freebsd.txt
View file

@ -498,8 +498,6 @@ kubernetes==3.0.0
# via -r requirements/static/ci/common.in
libnacl==1.7.1 ; sys_platform != "win32" and sys_platform != "darwin"
# via -r requirements/static/ci/common.in
looseversion==1.0.2
# via -r requirements/base.txt
lxml==4.9.1
# via
# junos-eznc
@ -643,9 +641,7 @@ oauthlib==3.2.1
oscrypto==1.2.0
# via certvalidator
packaging==21.3
# via
# -r requirements/base.txt
# pytest
# via pytest
paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin"
# via
# -r requirements/static/ci/common.in
@ -700,7 +696,6 @@ pyopenssl==19.1.0
# etcd3-py
pyparsing==3.0.9
# via
# -r requirements/base.txt
# junos-eznc
# packaging
pyrsistent==0.17.3

7
requirements/static/ci/py3.8/lint.txt
View file

@ -503,8 +503,6 @@ libnacl==1.8.0 ; sys_platform != "win32" and sys_platform != "darwin"
# via -r requirements/static/ci/common.in
loguru==0.6.0
# via ciscoconfparse
looseversion==1.0.2
# via -r requirements/base.txt
lxml==4.9.1
# via
# junos-eznc
@ -652,9 +650,7 @@ oauthlib==3.2.1
oscrypto==1.2.1
# via certvalidator
packaging==21.3
# via
# -r requirements/base.txt
# ansible-core
# via ansible-core
paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin"
# via
# -r requirements/static/ci/common.in
@ -713,7 +709,6 @@ pyopenssl==20.0.1
# etcd3-py
pyparsing==3.0.9
# via
# -r requirements/base.txt
# junos-eznc
# packaging
pyrsistent==0.18.0

4
requirements/static/ci/py3.8/linux.txt
View file

@ -513,8 +513,6 @@ kubernetes==3.0.0
# via -r requirements/static/ci/common.in
libnacl==1.7.1 ; sys_platform != "win32" and sys_platform != "darwin"
# via -r requirements/static/ci/common.in
looseversion==1.0.2
# via -r requirements/base.txt
lxml==4.9.1
# via
# junos-eznc
@ -656,7 +654,6 @@ oscrypto==1.2.0
# via certvalidator
packaging==21.3
# via
# -r requirements/base.txt
# ansible-core
# pytest
paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin"
@ -719,7 +716,6 @@ pyopenssl==19.1.0
# etcd3-py
pyparsing==3.0.9
# via
# -r requirements/base.txt
# junos-eznc
# packaging
pyrsistent==0.17.3

10
requirements/static/ci/py3.8/windows.txt
View file

@ -161,8 +161,6 @@ kubernetes==3.0.0
# via -r requirements/static/ci/common.in
libnacl==1.8.0
# via -r requirements/windows.txt
looseversion==1.0.2
# via -r requirements/base.txt
lxml==4.9.1
# via -r requirements/windows.txt
mako==1.2.2
@ -196,9 +194,7 @@ multidict==6.0.2
ntlm-auth==1.5.0
# via requests-ntlm
packaging==21.3
# via
# -r requirements/base.txt
# pytest
# via pytest
passlib[bcrypt]==1.7.4
# via -r requirements/static/ci/common.in
patch==1.16
@ -244,9 +240,7 @@ pyopenssl==20.0.1
# -r requirements/windows.txt
# etcd3-py
pyparsing==3.0.9
# via
# -r requirements/base.txt
# packaging
# via packaging
pyrsistent==0.17.3
# via jsonschema
pytest-custom-exit-code==0.3.0

7
requirements/static/ci/py3.9/cloud.txt
View file

@ -500,8 +500,6 @@ libnacl==1.8.0 ; sys_platform != "win32" and sys_platform != "darwin"
# via -r requirements/static/ci/common.in
loguru==0.6.0
# via ciscoconfparse
looseversion==1.0.2
# via -r requirements/base.txt
lxml==4.9.1
# via
# junos-eznc
@ -652,9 +650,7 @@ oauthlib==3.2.1
oscrypto==1.2.1
# via certvalidator
packaging==21.3
# via
# -r requirements/base.txt
# pytest
# via pytest
paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin"
# via
# -r requirements/static/ci/common.in
@ -709,7 +705,6 @@ pyopenssl==20.0.1
# etcd3-py
pyparsing==3.0.9
# via
# -r requirements/base.txt
# junos-eznc
# packaging
pypsexec==0.1.0

9
requirements/static/ci/py3.9/darwin.txt
View file

@ -456,7 +456,7 @@ idna==2.8
# yarl
immutables==0.15
# via contextvars
importlib-metadata==4.6.4 ; python_version < "3.10"
importlib-metadata==4.6.4 ; python_version >= "3.6" and python_version < "3.10"
# via -r requirements/darwin.txt
iniconfig==1.0.1
# via pytest
@ -501,8 +501,6 @@ kubernetes==3.0.0
# via -r requirements/static/ci/common.in
linode-python==1.1.1
# via -r requirements/darwin.txt
looseversion==1.0.2
# via -r requirements/base.txt
lxml==4.9.1
# via
# junos-eznc
@ -648,9 +646,7 @@ oauthlib==3.2.1
oscrypto==1.2.0
# via certvalidator
packaging==21.3
# via
# -r requirements/base.txt
# pytest
# via pytest
paramiko==2.10.1
# via
# junos-eznc
@ -706,7 +702,6 @@ pyopenssl==19.0.0
# etcd3-py
pyparsing==3.0.9
# via
# -r requirements/base.txt
# junos-eznc
# packaging
pyrsistent==0.17.3

4
requirements/static/ci/py3.9/docs.txt
View file

@ -505,8 +505,6 @@ libnacl==1.8.0 ; sys_platform != "win32" and sys_platform != "darwin"
# via -r requirements/static/ci/common.in
loguru==0.6.0
# via ciscoconfparse
looseversion==1.0.2
# via -r requirements/base.txt
lxml==4.9.1
# via
# junos-eznc
@ -651,7 +649,6 @@ oscrypto==1.2.1
# via certvalidator
packaging==21.3
# via
# -r requirements/base.txt
# ansible-core
# sphinx
paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin"
@ -711,7 +708,6 @@ pyopenssl==19.1.0
# etcd3-py
pyparsing==3.0.9
# via
# -r requirements/base.txt
# junos-eznc
# packaging
pyrsistent==0.18.0

7
requirements/static/ci/py3.9/freebsd.txt
View file

@ -498,8 +498,6 @@ kubernetes==3.0.0
# via -r requirements/static/ci/common.in
libnacl==1.7.1 ; sys_platform != "win32" and sys_platform != "darwin"
# via -r requirements/static/ci/common.in
looseversion==1.0.2
# via -r requirements/base.txt
lxml==4.9.1
# via
# junos-eznc
@ -643,9 +641,7 @@ oauthlib==3.2.1
oscrypto==1.2.0
# via certvalidator
packaging==21.3
# via
# -r requirements/base.txt
# pytest
# via pytest
paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin"
# via
# -r requirements/static/ci/common.in
@ -703,7 +699,6 @@ pyopenssl==19.1.0
# etcd3-py
pyparsing==3.0.9
# via
# -r requirements/base.txt
# junos-eznc
# packaging
pyrsistent==0.17.3

7
requirements/static/ci/py3.9/lint.txt
View file

@ -501,8 +501,6 @@ libnacl==1.8.0 ; sys_platform != "win32" and sys_platform != "darwin"
# via -r requirements/static/ci/common.in
loguru==0.6.0
# via ciscoconfparse
looseversion==1.0.2
# via -r requirements/base.txt
lxml==4.9.1
# via
# junos-eznc
@ -650,9 +648,7 @@ oauthlib==3.2.1
oscrypto==1.2.1
# via certvalidator
packaging==21.3
# via
# -r requirements/base.txt
# ansible-core
# via ansible-core
paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin"
# via
# -r requirements/static/ci/common.in
@ -714,7 +710,6 @@ pyopenssl==20.0.1
# etcd3-py
pyparsing==3.0.9
# via
# -r requirements/base.txt
# junos-eznc
# packaging
pyrsistent==0.18.0

4
requirements/static/ci/py3.9/linux.txt
View file

@ -515,8 +515,6 @@ kubernetes==3.0.0
# via -r requirements/static/ci/common.in
libnacl==1.7.1 ; sys_platform != "win32" and sys_platform != "darwin"
# via -r requirements/static/ci/common.in
looseversion==1.0.2
# via -r requirements/base.txt
lxml==4.9.1
# via
# junos-eznc
@ -658,7 +656,6 @@ oscrypto==1.2.0
# via certvalidator
packaging==21.3
# via
# -r requirements/base.txt
# ansible-core
# pytest
paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin"
@ -724,7 +721,6 @@ pyopenssl==19.1.0
# etcd3-py
pyparsing==3.0.9
# via
# -r requirements/base.txt
# junos-eznc
# packaging
pyrsistent==0.17.3

10
requirements/static/ci/py3.9/windows.txt
View file

@ -161,8 +161,6 @@ kubernetes==3.0.0
# via -r requirements/static/ci/common.in
libnacl==1.8.0
# via -r requirements/windows.txt
looseversion==1.0.2
# via -r requirements/base.txt
lxml==4.9.1
# via -r requirements/windows.txt
mako==1.2.2
@ -196,9 +194,7 @@ multidict==6.0.2
ntlm-auth==1.5.0
# via requests-ntlm
packaging==21.3
# via
# -r requirements/base.txt
# pytest
# via pytest
passlib[bcrypt]==1.7.4
# via -r requirements/static/ci/common.in
patch==1.16
@ -245,9 +241,7 @@ pyopenssl==20.0.1
# -r requirements/windows.txt
# etcd3-py
pyparsing==3.0.9
# via
# -r requirements/base.txt
# packaging
# via packaging
pyrsistent==0.17.3
# via jsonschema
pytest-custom-exit-code==0.3.0

8
requirements/static/pkg/py3.10/darwin.txt
View file

@ -51,8 +51,6 @@ jmespath==1.0.1
# via -r requirements/base.txt
linode-python==1.1.1
# via -r requirements/darwin.txt
looseversion==1.0.2
# via -r requirements/base.txt
mako==1.2.2
# via -r requirements/darwin.txt
markupsafe==2.0.1
@ -68,8 +66,6 @@ more-itertools==8.2.0
# jaraco.functools
msgpack==1.0.2
# via -r requirements/base.txt
packaging==21.3
# via -r requirements/base.txt
portend==2.6
# via cherrypy
psutil==5.8.0
@ -84,10 +80,6 @@ pycryptodomex==3.9.8
# via -r requirements/crypto.txt
pyopenssl==19.0.0
# via -r requirements/darwin.txt
pyparsing==3.0.9
# via
# -r requirements/base.txt
# packaging
python-dateutil==2.8.0
# via -r requirements/darwin.txt
python-gnupg==0.4.8

8
requirements/static/pkg/py3.10/freebsd.txt
View file

@ -41,8 +41,6 @@ jinja2==3.1.0
# via -r requirements/base.txt
jmespath==1.0.1
# via -r requirements/base.txt
looseversion==1.0.2
# via -r requirements/base.txt
markupsafe==2.0.1
# via
# -r requirements/base.txt
@ -55,8 +53,6 @@ more-itertools==5.0.0
# jaraco.functools
msgpack==1.0.2
# via -r requirements/base.txt
packaging==21.3
# via -r requirements/base.txt
portend==2.4
# via cherrypy
psutil==5.8.0
@ -69,10 +65,6 @@ pycryptodomex==3.9.8
# via -r requirements/crypto.txt
pyopenssl==19.1.0
# via -r requirements/static/pkg/freebsd.in
pyparsing==3.0.9
# via
# -r requirements/base.txt
# packaging
python-dateutil==2.8.1
# via -r requirements/static/pkg/freebsd.in
python-gnupg==0.4.8

8
requirements/static/pkg/py3.10/linux.txt
View file

@ -41,8 +41,6 @@ jinja2==3.1.0
# via -r requirements/base.txt
jmespath==1.0.1
# via -r requirements/base.txt
looseversion==1.0.2
# via -r requirements/base.txt
markupsafe==2.0.1
# via
# -r requirements/base.txt
@ -55,8 +53,6 @@ more-itertools==5.0.0
# jaraco.functools
msgpack==1.0.2
# via -r requirements/base.txt
packaging==21.3
# via -r requirements/base.txt
portend==2.4
# via cherrypy
psutil==5.8.0
@ -69,10 +65,6 @@ pycryptodomex==3.9.8
# via -r requirements/crypto.txt
pyopenssl==19.1.0
# via -r requirements/static/pkg/linux.in
pyparsing==3.0.9
# via
# -r requirements/base.txt
# packaging
python-dateutil==2.8.1
# via -r requirements/static/pkg/linux.in
python-gnupg==0.4.8

8
requirements/static/pkg/py3.10/windows.txt
View file

@ -53,8 +53,6 @@ jmespath==1.0.1
# via -r requirements/base.txt
libnacl==1.8.0
# via -r requirements/windows.txt
looseversion==1.0.2
# via -r requirements/base.txt
lxml==4.9.1
# via -r requirements/windows.txt
mako==1.2.2
@ -72,8 +70,6 @@ more-itertools==8.2.0
# jaraco.functools
msgpack==1.0.2
# via -r requirements/base.txt
packaging==21.3
# via -r requirements/base.txt
portend==2.6
# via cherrypy
psutil==5.8.0
@ -93,10 +89,6 @@ pymysql==1.0.2
# via -r requirements/windows.txt
pyopenssl==20.0.1
# via -r requirements/windows.txt
pyparsing==3.0.9
# via
# -r requirements/base.txt
# packaging
python-dateutil==2.8.1
# via -r requirements/windows.txt
python-gnupg==0.4.8

8
requirements/static/pkg/py3.7/freebsd.txt
View file

@ -43,8 +43,6 @@ jinja2==3.1.0
# via -r requirements/base.txt
jmespath==1.0.1
# via -r requirements/base.txt
looseversion==1.0.2
# via -r requirements/base.txt
markupsafe==2.0.1
# via
# -r requirements/base.txt
@ -57,8 +55,6 @@ more-itertools==5.0.0
# jaraco.functools
msgpack==1.0.2
# via -r requirements/base.txt
packaging==21.3
# via -r requirements/base.txt
portend==2.4
# via cherrypy
psutil==5.8.0
@ -69,10 +65,6 @@ pycryptodomex==3.9.8
# via -r requirements/crypto.txt
pyopenssl==19.1.0
# via -r requirements/static/pkg/freebsd.in
pyparsing==3.0.9
# via
# -r requirements/base.txt
# packaging
python-dateutil==2.8.1
# via -r requirements/static/pkg/freebsd.in
python-gnupg==0.4.8

8
requirements/static/pkg/py3.7/linux.txt
View file

@ -41,8 +41,6 @@ jinja2==3.1.0
# via -r requirements/base.txt
jmespath==1.0.1
# via -r requirements/base.txt
looseversion==1.0.2
# via -r requirements/base.txt
markupsafe==2.0.1
# via
# -r requirements/base.txt
@ -55,8 +53,6 @@ more-itertools==5.0.0
# jaraco.functools
msgpack==1.0.2
# via -r requirements/base.txt
packaging==21.3
# via -r requirements/base.txt
portend==2.4
# via cherrypy
psutil==5.8.0
@ -67,10 +63,6 @@ pycryptodomex==3.9.8
# via -r requirements/crypto.txt
pyopenssl==19.1.0
# via -r requirements/static/pkg/linux.in
pyparsing==3.0.9
# via
# -r requirements/base.txt
# packaging
python-dateutil==2.8.1
# via -r requirements/static/pkg/linux.in
python-gnupg==0.4.8

8
requirements/static/pkg/py3.7/windows.txt
View file

@ -57,8 +57,6 @@ jmespath==1.0.1
# via -r requirements/base.txt
libnacl==1.8.0
# via -r requirements/windows.txt
looseversion==1.0.2
# via -r requirements/base.txt
lxml==4.9.1
# via -r requirements/windows.txt
mako==1.2.2
@ -76,8 +74,6 @@ more-itertools==8.2.0
# jaraco.functools
msgpack==1.0.2
# via -r requirements/base.txt
packaging==21.3
# via -r requirements/base.txt
portend==2.6
# via cherrypy
psutil==5.8.0
@ -97,10 +93,6 @@ pymysql==1.0.2
# via -r requirements/windows.txt
pyopenssl==20.0.1
# via -r requirements/windows.txt
pyparsing==3.0.9
# via
# -r requirements/base.txt
# packaging
python-dateutil==2.8.1
# via -r requirements/windows.txt
python-gnupg==0.4.8

8
requirements/static/pkg/py3.8/freebsd.txt
View file

@ -43,8 +43,6 @@ jinja2==3.1.0
# via -r requirements/base.txt
jmespath==1.0.1
# via -r requirements/base.txt
looseversion==1.0.2
# via -r requirements/base.txt
markupsafe==2.0.1
# via
# -r requirements/base.txt
@ -57,8 +55,6 @@ more-itertools==5.0.0
# jaraco.functools
msgpack==1.0.2
# via -r requirements/base.txt
packaging==21.3
# via -r requirements/base.txt
portend==2.4
# via cherrypy
psutil==5.8.0
@ -69,10 +65,6 @@ pycryptodomex==3.9.8
# via -r requirements/crypto.txt
pyopenssl==19.1.0
# via -r requirements/static/pkg/freebsd.in
pyparsing==3.0.9
# via
# -r requirements/base.txt
# packaging
python-dateutil==2.8.1
# via -r requirements/static/pkg/freebsd.in
python-gnupg==0.4.8

8
requirements/static/pkg/py3.8/linux.txt
View file

@ -41,8 +41,6 @@ jinja2==3.1.0
# via -r requirements/base.txt
jmespath==1.0.1
# via -r requirements/base.txt
looseversion==1.0.2
# via -r requirements/base.txt
markupsafe==2.0.1
# via
# -r requirements/base.txt
@ -55,8 +53,6 @@ more-itertools==5.0.0
# jaraco.functools
msgpack==1.0.2
# via -r requirements/base.txt
packaging==21.3
# via -r requirements/base.txt
portend==2.4
# via cherrypy
psutil==5.8.0
@ -67,10 +63,6 @@ pycryptodomex==3.9.8
# via -r requirements/crypto.txt
pyopenssl==19.1.0
# via -r requirements/static/pkg/linux.in
pyparsing==3.0.9
# via
# -r requirements/base.txt
# packaging
python-dateutil==2.8.1
# via -r requirements/static/pkg/linux.in
python-gnupg==0.4.8

8
requirements/static/pkg/py3.8/windows.txt
View file

@ -55,8 +55,6 @@ jmespath==1.0.1
# via -r requirements/base.txt
libnacl==1.8.0
# via -r requirements/windows.txt
looseversion==1.0.2
# via -r requirements/base.txt
lxml==4.9.1
# via -r requirements/windows.txt
mako==1.2.2
@ -74,8 +72,6 @@ more-itertools==8.2.0
# jaraco.functools
msgpack==1.0.2
# via -r requirements/base.txt
packaging==21.3
# via -r requirements/base.txt
portend==2.6
# via cherrypy
psutil==5.8.0
@ -95,10 +91,6 @@ pymysql==1.0.2
# via -r requirements/windows.txt
pyopenssl==20.0.1
# via -r requirements/windows.txt
pyparsing==3.0.9
# via
# -r requirements/base.txt
# packaging
python-dateutil==2.8.1
# via -r requirements/windows.txt
python-gnupg==0.4.8

10
requirements/static/pkg/py3.9/darwin.txt
View file

@ -34,7 +34,7 @@ idna==2.8
# requests
immutables==0.15
# via contextvars
importlib-metadata==4.6.4 ; python_version < "3.10"
importlib-metadata==4.6.4 ; python_version >= "3.6" and python_version < "3.10"
# via -r requirements/darwin.txt
jaraco.classes==3.2.1
# via jaraco.collections
@ -53,8 +53,6 @@ jmespath==1.0.1
# via -r requirements/base.txt
linode-python==1.1.1
# via -r requirements/darwin.txt
looseversion==1.0.2
# via -r requirements/base.txt
mako==1.2.2
# via -r requirements/darwin.txt
markupsafe==2.0.1
@ -70,8 +68,6 @@ more-itertools==8.2.0
# jaraco.functools
msgpack==1.0.2
# via -r requirements/base.txt
packaging==21.3
# via -r requirements/base.txt
portend==2.6
# via cherrypy
psutil==5.8.0
@ -86,10 +82,6 @@ pycryptodomex==3.9.8
# via -r requirements/crypto.txt
pyopenssl==19.0.0
# via -r requirements/darwin.txt
pyparsing==3.0.9
# via
# -r requirements/base.txt
# packaging
python-dateutil==2.8.0
# via -r requirements/darwin.txt
python-gnupg==0.4.8

8
requirements/static/pkg/py3.9/freebsd.txt
View file

@ -43,8 +43,6 @@ jinja2==3.1.0
# via -r requirements/base.txt
jmespath==1.0.1
# via -r requirements/base.txt
looseversion==1.0.2
# via -r requirements/base.txt
markupsafe==2.0.1
# via
# -r requirements/base.txt
@ -57,8 +55,6 @@ more-itertools==5.0.0
# jaraco.functools
msgpack==1.0.2
# via -r requirements/base.txt
packaging==21.3
# via -r requirements/base.txt
portend==2.4
# via cherrypy
psutil==5.8.0
@ -71,10 +67,6 @@ pycryptodomex==3.9.8
# via -r requirements/crypto.txt
pyopenssl==19.1.0
# via -r requirements/static/pkg/freebsd.in
pyparsing==3.0.9
# via
# -r requirements/base.txt
# packaging
python-dateutil==2.8.1
# via -r requirements/static/pkg/freebsd.in
python-gnupg==0.4.8

8
requirements/static/pkg/py3.9/linux.txt
View file

@ -41,8 +41,6 @@ jinja2==3.1.0
# via -r requirements/base.txt
jmespath==1.0.1
# via -r requirements/base.txt
looseversion==1.0.2
# via -r requirements/base.txt
markupsafe==2.0.1
# via
# -r requirements/base.txt
@ -55,8 +53,6 @@ more-itertools==5.0.0
# jaraco.functools
msgpack==1.0.2
# via -r requirements/base.txt
packaging==21.3
# via -r requirements/base.txt
portend==2.4
# via cherrypy
psutil==5.8.0
@ -69,10 +65,6 @@ pycryptodomex==3.9.8
# via -r requirements/crypto.txt
pyopenssl==19.1.0
# via -r requirements/static/pkg/linux.in
pyparsing==3.0.9
# via
# -r requirements/base.txt
# packaging
python-dateutil==2.8.1
# via -r requirements/static/pkg/linux.in
python-gnupg==0.4.8

8
requirements/static/pkg/py3.9/windows.txt
View file

@ -55,8 +55,6 @@ jmespath==1.0.1
# via -r requirements/base.txt
libnacl==1.8.0
# via -r requirements/windows.txt
looseversion==1.0.2
# via -r requirements/base.txt
lxml==4.9.1
# via -r requirements/windows.txt
mako==1.2.2
@ -74,8 +72,6 @@ more-itertools==8.2.0
# jaraco.functools
msgpack==1.0.2
# via -r requirements/base.txt
packaging==21.3
# via -r requirements/base.txt
portend==2.6
# via cherrypy
psutil==5.8.0
@ -95,10 +91,6 @@ pymysql==1.0.2
# via -r requirements/windows.txt
pyopenssl==20.0.1
# via -r requirements/windows.txt
pyparsing==3.0.9
# via
# -r requirements/base.txt
# packaging
python-dateutil==2.8.1
# via -r requirements/windows.txt
python-gnupg==0.4.8

9
salt/utils/versions.py
View file

@ -18,20 +18,17 @@ import numbers
import sys
import warnings
from setuptools._distutils.version import LooseVersion as _LooseVersion
from setuptools._distutils.version import StrictVersion as _StrictVersion
# pylint: enable=blacklisted-module
import salt.version
# pylint: disable=blacklisted-module
## from distutils.version import StrictVersion as _StrictVersion
## from distutils.version import LooseVersion as _LooseVersion
log = logging.getLogger(__name__)
from setuptools._distutils.version import LooseVersion as _LooseVersion
from setuptools._distutils.version import StrictVersion as _StrictVersion
class StrictVersion(_StrictVersion):
def parse(self, vstring):

23
salt/version.py
View file

@ -287,11 +287,10 @@ class SaltStackVersion:
minor = None
else:
minor = int(minor)
if self.can_have_dot_zero(major):
minor = minor if minor else 0
if bugfix is None and not self.new_version_scheme(major=major):
if bugfix is None and not self.new_version(major=major):
bugfix = 0
elif isinstance(bugfix, str):
if not bugfix:
@ -324,7 +323,7 @@ class SaltStackVersion:
self.mbugfix = mbugfix
self.pre_type = pre_type
self.pre_num = pre_num
if self.new_version_scheme(major):
if self.new_version(major):
vnames_key = (major,)
else:
vnames_key = (major, minor)
@ -332,7 +331,7 @@ class SaltStackVersion:
self.noc = noc
self.sha = sha
def new_version_scheme(self, major):
def new_version(self, major):
"""
determine if using new versioning scheme
"""
@ -393,7 +392,7 @@ class SaltStackVersion:
def min_info(self):
info = [self.major]
if self.new_version_scheme(self.major):
if self.new_version(self.major):
if self.minor:
info.append(self.minor)
elif self.can_have_dot_zero(self.major):
@ -445,7 +444,7 @@ class SaltStackVersion:
@property
def string(self):
if self.new_version_scheme(self.major):
if self.new_version(self.major):
version_string = "{}".format(self.major)
if self.minor:
version_string = "{}.{}".format(self.major, self.minor)
@ -481,7 +480,7 @@ class SaltStackVersion:
@property
def pre_index(self):
if self.new_version_scheme(self.major):
if self.new_version(self.major):
pre_type = 2
if not isinstance(self.minor, int):
pre_type = 1
@ -507,7 +506,7 @@ class SaltStackVersion:
other_noc_info = list(other.noc_info)
noc_info = list(self.noc_info)
if self.new_version_scheme(self.major):
if self.new_version(self.major):
if self.minor and not other.minor:
# We have minor information, the other side does not
if self.minor > 0:
@ -552,7 +551,7 @@ class SaltStackVersion:
parts.append("name='{}'".format(self.name))
parts.extend(["major={}".format(self.major), "minor={}".format(self.minor)])
if self.new_version_scheme(self.major):
if self.new_version(self.major):
if not self.minor:
parts.remove("".join([x for x in parts if re.search("^minor*", x)]))
else:
@ -614,7 +613,7 @@ def __discover_version(saltstack_version):
"v[0-9]*",
"--always",
],
**kwargs,
**kwargs
)
out, err = process.communicate()
@ -639,7 +638,6 @@ def __discover_version(saltstack_version):
# specified), raise the exception so it can be catch by the
# developers
raise
return saltstack_version
@ -648,7 +646,6 @@ def __get_version(saltstack_version):
If we can get a version provided at installation time or from Git, use
that instead, otherwise we carry on.
"""
try:
# Try to import the version information provided at install time
from salt._version import __saltstack_version__ # pylint: disable=E0611,F0401
@ -662,7 +659,6 @@ def __get_version(saltstack_version):
# Get additional version information if available
__saltstack_version__ = __get_version(__saltstack_version__)
if __saltstack_version__.name:
# Set SaltVersionsInfo._current_release to avoid lookups when finding previous and next releases
SaltVersionsInfo._current_release = getattr(
@ -673,6 +669,7 @@ if __saltstack_version__.name:
del __get_version
# <---- Dynamic/Runtime Salt Version Information ---------------------------------------------------------------------
# ----- Common version related attributes - NO NEED TO CHANGE ------------------------------------------------------->
__version_info__ = __saltstack_version__.info
__version__ = __saltstack_version__.string

7
setup.py
View file

@ -34,6 +34,7 @@ from setuptools.command.sdist import sdist
# pylint: enable=no-name-in-module
try:
from urllib2 import urlopen
except ImportError:
@ -177,7 +178,6 @@ exec(compile(open(SALT_VERSION).read(), SALT_VERSION, "exec"))
def _parse_requirements_file(requirements_file):
parsed_requirements = []
with open(requirements_file) as rfh:
for line in rfh.readlines():
@ -188,7 +188,6 @@ def _parse_requirements_file(requirements_file):
if "libcloud" in line:
continue
parsed_requirements.append(line)
return parsed_requirements
@ -239,7 +238,6 @@ class WriteSaltVersion(Command):
date=DATE, full_version_info=salt_version.full_info_all_versions
)
)
# pylint: enable=E0602
@ -415,7 +413,6 @@ class DownloadWindowsDlls(Command):
from pip._internal.utils.logging import ( # pylint: disable=no-name-in-module
indent_log,
)
except ImportError:
# TODO: Impliment indent_log here so we don't require pip
@contextlib.contextmanager
@ -1336,7 +1333,6 @@ class SaltDistribution(distutils.dist.Distribution):
# ----- Overridden Methods -------------------------------------------------------------------------------------->
def parse_command_line(self):
args = distutils.dist.Distribution.parse_command_line(self)
if not self.ssh_packaging and PACKAGED_FOR_SALT_SSH:
@ -1371,6 +1367,7 @@ class SaltDistribution(distutils.dist.Distribution):
# <---- Custom Distribution Class ------------------------------------------------------------------------------------
if __name__ == "__main__":
warnings.warn(
"Warning: distutils is deprecated and shall be removed in Python 3.12, advise migrate to using setuptools"

4
tests/pytests/scenarios/setup/test_install.py
View file

@ -328,16 +328,12 @@ def test_sdist(virtualenv, cache_dir, use_static_requirements, src_dir):
sdist_ver_cmp = salt_generated_package.name.split(".tar.gz")[0].split("salt-")[
-1
]
assert sdist_ver_cmp == salt.version.__version__, "{} != {}".format(
sdist_ver_cmp, salt.version.__version__
)
venv.install(str(salt_generated_package))
# Let's ensure the version is correct
cmd = venv.run(venv.venv_python, "-m", "pip", "list", "--format", "json")
# Let's also ensure we have a salt/_version.py from the installed salt wheel
subdir = [
"lib",