Initial removal usage of distutils and replacement with setuptools

Author: David Murphy

.github/workflows/twine-check.yml

@@ -24,10 +24,12 @@ jobs:
       run: |
         pip install --upgrade pip setuptools wheel
         pip install twine>=3.4.1
+        # pip install build     # add build when implement pyproject.toml
 
     - name: Create Source Tarball
       run: |
         python3 setup.py sdist
+        # TBD python3 -m build --sdist  # replace with build when implement pyproject.toml
 
     - name: Twine check
       run: |

NOTICE

@@ -0,0 +1,13 @@
+Copyright 2012-2022 VMware, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

changelog/60476.removed

@@ -0,0 +1 @@
+Removed distutils and replaced with setuptools, given distutils is deprecated and removed in Python 3.12

noxfile.py

@@ -1308,6 +1308,7 @@ def lint_salt(session):
     if session.posargs:
         paths = session.posargs
     else:
+        # TBD replace paths entries when implement pyproject.toml
         paths = ["setup.py", "noxfile.py", "salt/", "tasks/"]
     _lint(session, ".pylintrc", flags, paths)
 

requirements/base.txt

@@ -9,3 +9,10 @@ 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

requirements/darwin.txt

@@ -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.6' and python_version < '3.10'
+importlib_metadata>=3.3.0; python_version < '3.10'

requirements/static/ci/py3.10/cloud.txt

@@ -485,6 +485,8 @@ 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
@@ -621,8 +623,10 @@ oauthlib==3.2.1
     # via requests-oauthlib
 oscrypto==1.2.1
     # via certvalidator
-packaging==21.0
-    # via pytest
+packaging==21.3
+    # via
+    #   -r requirements/base.txt
+    #   pytest
 paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin"
     # via
     #   -r requirements/static/ci/common.in
@@ -669,8 +673,9 @@ pyopenssl==20.0.1
     # via
     #   -r requirements/static/pkg/linux.in
     #   etcd3-py
-pyparsing==2.4.7
+pyparsing==3.0.9
     # via
+    #   -r requirements/base.txt
     #   junos-eznc
     #   packaging
 pypsexec==0.1.0

requirements/static/ci/py3.10/darwin.txt

@@ -486,6 +486,8 @@ 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
@@ -620,8 +622,10 @@ oauthlib==3.2.1
     # via requests-oauthlib
 oscrypto==1.2.0
     # via certvalidator
-packaging==19.2
-    # via pytest
+packaging==21.3
+    # via
+    #   -r requirements/base.txt
+    #   pytest
 paramiko==2.10.1
     # via
     #   junos-eznc
@@ -669,8 +673,9 @@ pyopenssl==19.0.0
     # via
     #   -r requirements/darwin.txt
     #   etcd3-py
-pyparsing==2.4.5
+pyparsing==3.0.9
     # via
+    #   -r requirements/base.txt
     #   junos-eznc
     #   packaging
 pyrsistent==0.17.3
@@ -805,7 +810,6 @@ six==1.16.0
     #   mock
     #   msrestazure
     #   ncclient
-    #   packaging
     #   paramiko
     #   pynacl
     #   pyopenssl

requirements/static/ci/py3.10/docs.txt

@@ -492,6 +492,8 @@ 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
@@ -620,8 +622,9 @@ oauthlib==3.2.1
     # via requests-oauthlib
 oscrypto==1.2.1
     # via certvalidator
-packaging==20.9
+packaging==21.3
     # via
+    #   -r requirements/base.txt
     #   ansible-core
     #   sphinx
 paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin"
@@ -673,8 +676,9 @@ pyopenssl==19.1.0
     # via
     #   -r requirements/static/pkg/linux.in
     #   etcd3-py
-pyparsing==2.4.7
+pyparsing==3.0.9
     # via
+    #   -r requirements/base.txt
     #   junos-eznc
     #   packaging
 pyrsistent==0.18.0

requirements/static/ci/py3.10/freebsd.txt

@@ -483,6 +483,8 @@ 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
@@ -615,8 +617,10 @@ oauthlib==3.2.1
     # via requests-oauthlib
 oscrypto==1.2.0
     # via certvalidator
-packaging==19.2
-    # via pytest
+packaging==21.3
+    # via
+    #   -r requirements/base.txt
+    #   pytest
 paramiko==2.10.1 ; sys_platform != "win32" and sys_platform != "darwin"
     # via
     #   -r requirements/static/ci/common.in
@@ -666,8 +670,9 @@ pyopenssl==19.1.0
     # via
     #   -r requirements/static/pkg/freebsd.in
     #   etcd3-py
-pyparsing==2.4.5
+pyparsing==3.0.9
     # via
+    #   -r requirements/base.txt
     #   junos-eznc
     #   packaging
 pyrsistent==0.17.3
@@ -803,7 +808,6 @@ six==1.16.0
     #   more-itertools
     #   msrestazure
     #   ncclient
-    #   packaging
     #   paramiko
     #   pynacl
     #   pyopenssl