From 41ba89caf9f145f5808623b8c03e17b247aac0c7 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Thu, 15 Aug 2013 08:48:49 -0300
Subject: Force protobuf version to >=2.4.1.

* Also, generate events_pb2.py file using 2.4.1.
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index 0db731e..b675675 100644
--- a/setup.py
+++ b/setup.py
@@ -23,7 +23,7 @@ from setuptools import setup, find_packages
 requirements = [
     "jsonschema",
     "pyxdg",
-    'protobuf',
+    'protobuf>=2.4.1',
     'protobuf.socketrpc',
     "PyOpenSSL",
     "python-dateutil",
-- 
cgit v1.2.3


From 41bd5b9e9d5f2af79103b2efa6b61a73758dd7c3 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Fri, 23 Aug 2013 11:40:17 +0200
Subject: Update requirements

* Use requirements.pip
* Update reqs
---
 setup.py | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index b675675..3cefe1b 100644
--- a/setup.py
+++ b/setup.py
@@ -19,20 +19,8 @@ setup file for leap.common
 """
 from setuptools import setup, find_packages
 
-# XXX parse pkg/requirements.pip
-requirements = [
-    "jsonschema",
-    "pyxdg",
-    'protobuf>=2.4.1',
-    'protobuf.socketrpc',
-    "PyOpenSSL",
-    "python-dateutil",
-    "PyCrypto",
-]
-
-#dependency_links = [
-    #"https://protobuf-socket-rpc.googlecode.com/files/protobuf.socketrpc-1.3.2.tar.gz#egg=protobuf.socketrpc"
-#]
+from pkg import utils
+parsed_reqs = utils.parse_requirements()
 
 tests_requirements = [
     'mock',
@@ -73,7 +61,7 @@ setup(
     #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
-- 
cgit v1.2.3


From 58aaf9c4b4159aeda8acb2485dc479017b83d096 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Fri, 23 Aug 2013 11:56:55 +0200
Subject: Add versioneer to handle versioning here too.

---
 setup.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index b675675..59700e5 100644
--- a/setup.py
+++ b/setup.py
@@ -19,6 +19,12 @@ setup file for leap.common
 """
 from setuptools import setup, find_packages
 
+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-'
+
 # XXX parse pkg/requirements.pip
 requirements = [
     "jsonschema",
@@ -54,9 +60,8 @@ trove_classifiers = [
 
 setup(
     name='leap.common',
-    # If you change version, do it also in
-    # src/leap/common/__init__.py
-    version='0.3.0',
+    version=versioneer.get_version(),
+    cmdclass=versioneer.get_cmdclass(),
     url='https://leap.se/',
     license='GPLv3+',
     author='The LEAP Encryption Access Project',
-- 
cgit v1.2.3