remove distutils dependency

Author: bbatha

Makefile

@@ -42,7 +42,7 @@ BUILDDIR      = build
 help:
 	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 
-.PHONY: help Makefile
+.PHONY: help build Makefile
 
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).

Pipfile

@@ -4,7 +4,6 @@ name = "pypi"
 verify_ssl = true
 
 [packages]
-e1839a8 = {path = ".",editable = true}
 requests = {extras = ["security"]}
 requests-toolbelt = "*"
 progressbar2 = "*"
@@ -22,6 +21,7 @@ pyyaml = "*"
 python-dateutil = ">=2.0,<3.0"
 websocket-client = "*"
 gradient-utils = ">=0.5.0"
+packaging = "*"
 sphinx = "*"
 recommonmark = "*"
 sphinx-click = "*"

gradient/version.py

@@ -1 +1 @@
-version = "0.0.0"
+version = "2.99.0"

gradient/version_checker.py

@@ -3,8 +3,9 @@
 from platform import system
 import json
 
+import six
 import requests
-from distutils.version import StrictVersion
+from packaging.version import Version
 
 from gradient.clilogger import CliLogger
 from gradient.version import version
@@ -20,9 +21,7 @@ class VersionChecker(object):
     def is_up_to_date(self, module_name, current_version):
         version_in_repository = self.get_version_from_repository(module_name)
 
-        up_to_date = StrictVersion(current_version) >= StrictVersion(
-            version_in_repository
-        )
+        up_to_date = Version(current_version) >= Version(version_in_repository)
         return up_to_date, version_in_repository
 
     def get_version_from_repository(
@@ -58,9 +57,9 @@ def get_version_from_repository(
         v2_versions = []
         for v in versions:
             try:
-                if StrictVersion(v) < StrictVersion("3.0.0"):
+                if Version(v) < Version("3.0.0"):
                     v2_versions.append(v)
-            except ValueError:
+            except Exception:
                 # Skip invalid version strings
                 continue
 
@@ -71,7 +70,7 @@ def get_version_from_repository(
             )
 
         # Sort v2_versions to get the latest one (highest version number)
-        v2_versions.sort(key=lambda x: StrictVersion(x), reverse=True)
+        v2_versions.sort(key=lambda x: Version(x), reverse=True)
         return v2_versions[0]
 
 

setup.py

@@ -66,13 +66,14 @@ def run(self):
         "requests-toolbelt",
         "progressbar2",
         "halo",
-        "marshmallow<3.0",
+        "marshmallow~=4.0",
         "attrs<=19",
         "PyYAML==5.3.1",
         "python-dateutil==2.*",
         "websocket-client==0.57.*",
         "gradient-utils>=0.1.2",
         "gql[requests]==3.0.0a6",
+        "packaging",
         'windows-curses>=2.3.0 ; platform_system=="Windows"',
     ],
     entry_points={