diff --git a/gstatus/__main__.py b/gstatus/__main__.py index 27fdbe2..71b37c7 100755 --- a/gstatus/__main__.py +++ b/gstatus/__main__.py @@ -4,7 +4,7 @@ import sys from optparse import OptionParser -from distutils.version import LooseVersion as version +from packaging.version import parse as version from shutil import get_terminal_size try: diff --git a/setup.py b/setup.py index 4843bf8..8d70125 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,6 @@ #!/usr/bin/python from setuptools import setup -import distutils.command.install_scripts import shutil from gstatus import version @@ -10,15 +9,6 @@ long_description = f.read().strip() f.close() -# idea from http://stackoverflow.com/a/11400431/2139420 -class strip_py_ext(distutils.command.install_scripts.install_scripts): - def run(self): - distutils.command.install_scripts.install_scripts.run(self) - for script in self.get_outputs(): - if script.endswith(".py"): - shutil.move(script, script[:-3]) - - setup( name = "gstatus", version= version.VERSION, @@ -28,7 +18,7 @@ def run(self): author_email = "pcuzner@redhat.com", url = "https://github.com/gluster/gstatus", license = "GPLv3", - install_requires=['glustercli'], + install_requires=['glustercli', 'packaging'], packages = [ "gstatus", "gstatus.glusterlib", @@ -37,8 +27,5 @@ def run(self): "console_scripts": [ "gstatus = gstatus.__main__:main", ] - }, - cmdclass = { - "install_scripts" : strip_py_ext } )