[style] fixed extra requires typo

[leap_pycommon.git] / setup.py

diff --git a/setup.py b/setup.py
index bdf97c5..ca83017 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -17,22 +17,17 @@
 """
 setup file for leap.common
 """
+import re
 from setuptools import setup, find_packages
 
-# XXX parse pkg/requirements.pip
-requirements = [
-    "jsonschema",
-    "pyxdg",
-    'protobuf',
-    'protobuf.socketrpc',
-    "PyOpenSSL",
-    "python-dateutil",
-    "PyCrypto",
-]
+from pkg import utils
+parsed_reqs = utils.parse_requirements()
 
-#dependency_links = [
-    #"https://protobuf-socket-rpc.googlecode.com/files/protobuf.socketrpc-1.3.2.tar.gz#egg=protobuf.socketrpc"
-#]
+import versioneer
+versioneer.versionfile_source = 'src/leap/common/_version.py'
+versioneer.versionfile_build = 'leap/common/_version.py'
+versioneer.tag_prefix = ''  # tags are like 1.2.0
+versioneer.parentdir_prefix = 'leap.common-'
 
 tests_requirements = [
     'mock',
@@ -52,29 +47,102 @@ trove_classifiers = [
     "Topic :: Utilities"
 ]
 
+DOWNLOAD_BASE = ('https://github.com/leapcode/leap_pycommon/'
+                 'archive/%s.tar.gz')
+_versions = versioneer.get_versions()
+VERSION = _versions['version']
+VERSION_FULL = _versions['full']
+DOWNLOAD_URL = ""
+
+# get the short version for the download url
+_version_short = re.findall('\d+\.\d+\.\d+', VERSION)
+if len(_version_short) > 0:
+    VERSION_SHORT = _version_short[0]
+    DOWNLOAD_URL = DOWNLOAD_BASE % VERSION_SHORT
+
+cmdclass = versioneer.get_cmdclass()
+from setuptools import Command
+
+
+class freeze_debianver(Command):
+    """
+    Freezes the version in a debian branch.
+    To be used after merging the development branch onto the debian one.
+    """
+    user_options = []
+
+    def initialize_options(self):
+        pass
+
+    def finalize_options(self):
+        pass
+
+    def run(self):
+        proceed = str(raw_input(
+            "This will overwrite the file _version.py. Continue? [y/N] "))
+        if proceed != "y":
+            print("He. You scared. Aborting.")
+            return
+        template = r"""
+# This file was generated by the `freeze_debianver` command in setup.py
+# Using 'versioneer.py' (0.7+) from
+# revision-control system data, or from the parent directory name of an
+# unpacked source archive. Distribution tarballs contain a pre-generated copy
+# of this file.
+
+version_version = '{version}'
+version_full = '{version_full}'
+"""
+        templatefun = r"""
+
+def get_versions(default={}, verbose=False):
+        return {'version': version_version, 'full': version_full}
+"""
+        subst_template = template.format(
+            version=VERSION_SHORT,
+            version_full=VERSION_FULL) + templatefun
+        with open(versioneer.versionfile_source, 'w') as f:
+            f.write(subst_template)
+
+try:
+    long_description = open('README.rst').read() + '\n\n\n' + \
+        open('CHANGELOG').read()
+except Exception:
+    long_description = ""
+
+cmdclass["freeze_debianver"] = freeze_debianver
 setup(
     name='leap.common',
-    # If you change version, do it also in
-    # src/leap/common/__init__.py
-    version='0.2.5',
+    version=VERSION,
+    cmdclass=cmdclass,
     url='https://leap.se/',
+    download_url=DOWNLOAD_URL,
     license='GPLv3+',
     author='The LEAP Encryption Access Project',
     author_email='info@leap.se',
+    maintainer='Kali Kaneko',
+    maintainer_email='kali@leap.se',
     description='Common files used by the LEAP project.',
-    long_description=(
-        "Common files used by the LEAP Client project."
-    ),
+    long_description=long_description,
     classifiers=trove_classifiers,
     namespace_packages=["leap"],
     package_dir={'': 'src'},
+    package_data={'': ['*.pem']},
     # For now, we do not exclude tests because of the circular dependency
     # between leap.common and leap.soledad.
     #packages=find_packages('src', exclude=['leap.common.tests']),
     packages=find_packages('src'),
     test_suite='leap.common.tests',
-    install_requires=requirements,
+    install_requires=parsed_reqs,
     #dependency_links=dependency_links,
     tests_require=tests_requirements,
-    include_package_data=True
+    include_package_data=True,
+    zip_safe=False,
+
+    extras_require={
+        # needed for leap.common.http
+        #  service_identity needed for propper hostname identification,
+        #  see http://twistedmatrix.com/documents/current/core/howto/ssl.html
+        'Twisted':  ["Twisted>=14.0.2", "service_identity", "zope.interface"]
+    },
 )