Further setup.py utilities

setup.py

@@ -5,7 +5,7 @@
 from setuptools import setup, find_packages
 
 sys.path.append('src')  # Only needed for this project
-from hdx.utilities import CleanMore
+from hdx.utilities import CleanCommand, PackageCommand, PublishCommand
 from hdx.utilities.loader import load_file_to_str
 
 requirements = ['basicauth',
@@ -17,7 +17,7 @@
                 'pyaml',
                 'six>=1.12.0',
                 'sshtunnel',
-                'tabulator>=1.19.0',
+                'tabulator>=1.20.0',
                 'typing',
                 'yamlloader'
                 ]
@@ -52,5 +52,5 @@
     zip_safe=True,
     classifiers=classifiers,
     install_requires=requirements,
-    cmdclass={'clean': CleanMore}
+    cmdclass={'clean': CleanCommand, 'package': PackageCommand, 'publish': PublishCommand},
 )

src/hdx/utilities/__init__.py

@@ -1,3 +1,4 @@
+import os
 import sys
 from distutils import log
 from distutils.command.clean import clean
@@ -7,6 +8,9 @@
 from uuid import UUID
 
 import six
+from setuptools import Command
+
+from hdx.utilities.version import get_utils_version
 
 
 def raisefrom(exc_type, message, exc):
@@ -47,18 +51,59 @@ def is_valid_uuid(uuid_to_test, version=4):
     return str(uuid_obj) == uuid_to_test
 
 
-class CleanMore(clean):
+class CleanCommand(clean):
     """
     Custom implementation of ``clean`` setuptools command."""
 
     def run(self):  # pragma: no cover
         """After calling the super class implementation, this function removes
         the dist directory if it exists."""
         self.all = True  # --all by default when cleaning
-        super(CleanMore, self).run()
+        super(CleanCommand, self).run()
         dir_ = 'dist'
         if exists(dir_):
             log.info("removing '%s' (and everything under it)", dir_)
             rmtree(dir_)
         else:
             log.info("'%s' does not exist -- can't clean it", dir_)
+
+
+class PackageCommand(Command):
+    """Package command for setup.py that creates source and wheel packages."""
+
+    description = 'Build the packages.'
+    user_options = []
+
+    def initialize_options(self):
+        pass
+
+    def finalize_options(self):
+        pass
+
+    def run(self):
+        log.info('Building Source and Wheel (universal) Packages...')
+        os.system('{0} setup.py clean sdist bdist_wheel --universal'.format(sys.executable))
+        sys.exit()
+
+
+class PublishCommand(Command):
+    """Publish command for setup.py that creates git tags and publishes to pypi.
+    Requires that twine and git be installed."""
+
+    description = 'Publish the packages.'
+    user_options = []
+
+    def initialize_options(self):
+        pass
+
+    def finalize_options(self):
+        pass
+
+    def run(self):
+        log.info('Uploading the package to PyPI using twine...')
+        os.system('twine upload dist/*')
+
+        log.info('Pushing git tags...')
+        os.system('git tag v{0}'.format(get_utils_version()))
+        os.system('git push --tags')
+        sys.exit()

src/hdx/utilities/version.txt

@@ -1 +1 @@
-1.7.0
+1.7.1