Merge tag 'v1.2.0' into develop

v1.2.0

Author: ahknight

MANIFEST

@@ -5,9 +5,7 @@ README.rst
 requirements.txt
 setup.cfg
 setup.py
-versioneer.py
 httpsig/__init__.py
-httpsig/_version.py
 httpsig/requests_auth.py
 httpsig/sign.py
 httpsig/utils.py

MANIFEST.in

@@ -1,5 +1,3 @@
 include *.rst
 include *.txt
-include versioneer.py
-include httpsig/_version.py
 include httpsig/tests/*.pem

httpsig/__init__.py

@@ -1,8 +1,12 @@
+from pkg_resources import get_distribution, DistributionNotFound
+
 from .sign import Signer, HeaderSigner
 from .verify import Verifier, HeaderVerifier
 
-from ._version import get_versions
-__version__ = get_versions()['version']
-del get_versions
+try:
+    __version__ = get_distribution(__name__).version
+except DistributionNotFound:
+    # package is not installed
+    pass
 
 __all__ = (Signer, HeaderSigner, Verifier, HeaderVerifier)

httpsig/_version.py

@@ -0,0 +1,2 @@
+setuptools
+wheel

requirements_dev.txt

@@ -1,2 +1,2 @@
 [bdist_wheel]
-universal = True
+universal = True

setup.cfg

@@ -1,13 +1,6 @@
 #!/usr/bin/env python
 from setuptools import setup, find_packages
 
-# versioneer config
-import versioneer
-versioneer.versionfile_source = 'httpsig/_version.py'
-versioneer.versionfile_build = 'httpsig/_version.py'
-versioneer.tag_prefix = 'v'                 # tags are like v1.2.0
-versioneer.parentdir_prefix = 'httpsig-'    # dirname like 'myproject-1.2.0'
-
 # create long description
 with open('README.rst') as file:
     long_description = file.read()
@@ -16,8 +9,7 @@
 
 setup(
     name='httpsig',
-    version=versioneer.get_version(),
-    cmdclass=versioneer.get_cmdclass(),
+    # version=versioneer.get_version(),
     description="Secure HTTP request signing using the HTTP Signature draft specification",
     long_description=long_description,
     classifiers=[
@@ -43,6 +35,8 @@
     packages=find_packages(),
     include_package_data=True,
     zip_safe=True,
+    use_scm_version=True,
+    setup_requires=['setuptools_scm'],
     install_requires=['pycryptodome==3.4.7', 'six'],
     test_suite="httpsig.tests",
 )