From 58e6a1df85204ab30b9a9351de32ac2f71f1026b Mon Sep 17 00:00:00 2001 From: drebs Date: Sun, 31 Mar 2013 21:02:23 -0300 Subject: Add events mechanism dependencies to setup.py file. --- setup.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index b29c352..c25693b 100644 --- a/setup.py +++ b/setup.py @@ -19,9 +19,18 @@ setup file for leap.common """ from setuptools import setup, find_packages + requirements = [ + 'protobuf', + 'protobuf.socketrpc', ] + +dependency_links = [ + 'https://protobuf-socket-rpc.googlecode.com/files/protobuf.socketrpc-1.3.2-py2.6.egg#egg=protobuf.socketrpc', +] + + # XXX add classifiers, docs setup( @@ -39,5 +48,6 @@ setup( package_dir={'': 'src'}, packages=find_packages('src'), #test_suite='leap.common.tests', - #install_requires=requirements, + install_requires=requirements, + dependency_links=dependency_links, ) -- cgit v1.2.3 From 9d6f27cb2a83cb36d5201439e02dc1fb2048765b Mon Sep 17 00:00:00 2001 From: drebs Date: Sun, 31 Mar 2013 21:07:58 -0300 Subject: Add tests for events mechanism. --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index c25693b..6732d69 100644 --- a/setup.py +++ b/setup.py @@ -46,8 +46,8 @@ setup( ), namespace_packages=["leap"], package_dir={'': 'src'}, - packages=find_packages('src'), - #test_suite='leap.common.tests', + packages=find_packages('src', exclude=['leap.common.tests']), + test_suite='leap.common.tests', install_requires=requirements, dependency_links=dependency_links, ) -- cgit v1.2.3 From e9f5294ead530c69d246e79e9576f043390a4e2a Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Tue, 9 Apr 2013 22:30:42 +0900 Subject: add pyopenssl to dependencies --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index b29c352..0156a1d 100644 --- a/setup.py +++ b/setup.py @@ -20,6 +20,7 @@ setup file for leap.common from setuptools import setup, find_packages requirements = [ + "PyOpenSSL", ] # XXX add classifiers, docs -- cgit v1.2.3 From 21539df85ed5d0e1fc2c84d66e1e37281aeee256 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Tue, 9 Apr 2013 22:45:36 +0900 Subject: add dateutil to reqs --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 0156a1d..c0d1b7e 100644 --- a/setup.py +++ b/setup.py @@ -21,6 +21,7 @@ from setuptools import setup, find_packages requirements = [ "PyOpenSSL", + "python-dateutil", ] # XXX add classifiers, docs -- cgit v1.2.3 From 2611f4e5fd199d6c3b24d212c862ccf03fea93ff Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Tue, 9 Apr 2013 23:52:21 +0900 Subject: add BaseConfig class and its dependencies --- setup.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 6732d69..45ff001 100644 --- a/setup.py +++ b/setup.py @@ -19,15 +19,19 @@ setup file for leap.common """ from setuptools import setup, find_packages - +# XXX parse pkg/requirements.pip requirements = [ + "jsonschema", + "pyxdg", 'protobuf', 'protobuf.socketrpc', ] dependency_links = [ - 'https://protobuf-socket-rpc.googlecode.com/files/protobuf.socketrpc-1.3.2-py2.6.egg#egg=protobuf.socketrpc', + # XXX this link is only for py2.6??? + # we need to get this packaged or included + "https://protobuf-socket-rpc.googlecode.com/files/protobuf.socketrpc-1.3.2-py2.6.egg#egg=protobuf.socketrpc", ] -- cgit v1.2.3 From 8c9c8fb20b87a1a66f373ccc9e2e60ddd8266cde Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Wed, 10 Apr 2013 00:07:07 +0900 Subject: add generic tarball to download link for protobuf.rpc --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 45ff001..31fc8d3 100644 --- a/setup.py +++ b/setup.py @@ -31,7 +31,8 @@ requirements = [ dependency_links = [ # XXX this link is only for py2.6??? # we need to get this packaged or included - "https://protobuf-socket-rpc.googlecode.com/files/protobuf.socketrpc-1.3.2-py2.6.egg#egg=protobuf.socketrpc", + #"https://protobuf-socket-rpc.googlecode.com/files/protobuf.socketrpc-1.3.2-py2.6.egg#egg=protobuf.socketrpc", + "https://code.google.com/p/protobuf-socket-rpc/downloads/detail?name=protobuf.socketrpc-1.3.2.tar.gz#egg=protobuf.socketrpc", ] -- cgit v1.2.3 From 1ab74ac4f032114f775b6a44392e293b79dad686 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Wed, 10 Apr 2013 21:41:48 +0900 Subject: Add option to compile services (needed from 2.4.0 onwards, since it defaults to false) --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index c0bd98f..269d755 100644 --- a/setup.py +++ b/setup.py @@ -42,7 +42,7 @@ dependency_links = [ setup( name='leap.common', - version='0.2.0-dev', + version='0.2.1-dev', url='https://leap.se/', license='GPLv3+', author='The LEAP Encryption Access Project', -- cgit v1.2.3 From 577a3341e5c09f40bddf8a3723818941c32fa5c1 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Wed, 10 Apr 2013 21:43:24 +0900 Subject: Add compiled proto bumped version --- setup.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 269d755..c7bdd76 100644 --- a/setup.py +++ b/setup.py @@ -42,6 +42,8 @@ dependency_links = [ setup( name='leap.common', + # If you change version, do it also in + # src/leap/common/__init__.py version='0.2.1-dev', url='https://leap.se/', license='GPLv3+', -- cgit v1.2.3 From 1ae67202f1878106a3a9770d22dcb695f604d5ee Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Wed, 10 Apr 2013 21:44:19 +0900 Subject: Add the right name for pypi package --- setup.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index c7bdd76..3c0f9de 100644 --- a/setup.py +++ b/setup.py @@ -31,10 +31,7 @@ requirements = [ dependency_links = [ - # XXX this link is only for py2.6??? - # we need to get this packaged or included - #"https://protobuf-socket-rpc.googlecode.com/files/protobuf.socketrpc-1.3.2-py2.6.egg#egg=protobuf.socketrpc", - "https://code.google.com/p/protobuf-socket-rpc/downloads/detail?name=protobuf.socketrpc-1.3.2.tar.gz#egg=protobuf.socketrpc", + "https://protobuf-socket-rpc.googlecode.com/files/protobuf.socketrpc-1.3.2.tar.gz" ] -- cgit v1.2.3 From f74c32a4a8e9eae9c8055c25d3848ff7d836e308 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Wed, 1 May 2013 04:05:03 +0900 Subject: return None if no key found, avoid KeyError --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 3c0f9de..d5323bc 100644 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ setup( name='leap.common', # If you change version, do it also in # src/leap/common/__init__.py - version='0.2.1-dev', + version='0.2.1-dev2', url='https://leap.se/', license='GPLv3+', author='The LEAP Encryption Access Project', -- cgit v1.2.3 From c72aa2e8c356d57c272ce91e72417ee231edd57d Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Wed, 8 May 2013 01:47:14 +0900 Subject: version bump --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index d5323bc..1a3f2fd 100644 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ setup( name='leap.common', # If you change version, do it also in # src/leap/common/__init__.py - version='0.2.1-dev2', + version='0.2.3-dev', url='https://leap.se/', license='GPLv3+', author='The LEAP Encryption Access Project', -- cgit v1.2.3 From 42d46aae15fcdda803b4dc8e3e2f37f6e695f09d Mon Sep 17 00:00:00 2001 From: drebs Date: Tue, 14 May 2013 15:18:21 -0300 Subject: Fix dependency link for protobuf.socketrpc dependency. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 1a3f2fd..410fc6d 100644 --- a/setup.py +++ b/setup.py @@ -31,7 +31,7 @@ requirements = [ dependency_links = [ - "https://protobuf-socket-rpc.googlecode.com/files/protobuf.socketrpc-1.3.2.tar.gz" + "https://protobuf-socket-rpc.googlecode.com/files/protobuf.socketrpc-1.3.2.tar.gz#egg=protobuf.socketrpc" ] -- cgit v1.2.3 From adc5bb1c8e6ff5bada17e27ed772dee1ba424b28 Mon Sep 17 00:00:00 2001 From: drebs Date: Tue, 14 May 2013 15:53:04 -0300 Subject: Add dependency on soledad and install tests. --- setup.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 410fc6d..ad44633 100644 --- a/setup.py +++ b/setup.py @@ -27,6 +27,7 @@ requirements = [ 'protobuf.socketrpc', "PyOpenSSL", "python-dateutil", + "leap.soledad", ] @@ -34,6 +35,10 @@ dependency_links = [ "https://protobuf-socket-rpc.googlecode.com/files/protobuf.socketrpc-1.3.2.tar.gz#egg=protobuf.socketrpc" ] +tests_requirements = [ + 'mock', +] + # XXX add classifiers, docs @@ -52,8 +57,12 @@ setup( ), namespace_packages=["leap"], package_dir={'': 'src'}, - packages=find_packages('src', exclude=['leap.common.tests']), + # 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, dependency_links=dependency_links, + tests_require=tests_requirements, ) -- cgit v1.2.3 From d4eaa23280da258eb43baf345b1118a91c6d47fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= Date: Wed, 15 May 2013 16:43:41 -0300 Subject: Bump leap.common version for tagging --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index ad44633..112736e 100644 --- a/setup.py +++ b/setup.py @@ -46,7 +46,7 @@ setup( name='leap.common', # If you change version, do it also in # src/leap/common/__init__.py - version='0.2.3-dev', + version='0.2.4', url='https://leap.se/', license='GPLv3+', author='The LEAP Encryption Access Project', -- cgit v1.2.3 From 5c971f5a57ebac56f27d0374fe24942124be4406 Mon Sep 17 00:00:00 2001 From: drebs Date: Thu, 16 May 2013 12:10:23 -0300 Subject: Add crypto submodule that handles AES-256-CTR encryption. --- setup.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 112736e..99fd25b 100644 --- a/setup.py +++ b/setup.py @@ -28,6 +28,8 @@ requirements = [ "PyOpenSSL", "python-dateutil", "leap.soledad", + "python-gnupg", + "PyCrypto", ] -- cgit v1.2.3 From b00bb5cf4af7183076c02b02722ed6c495ff3f8a Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Thu, 30 May 2013 02:38:03 +0900 Subject: add data files: testing certificates --- setup.py | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 99fd25b..c6b7fab 100644 --- a/setup.py +++ b/setup.py @@ -32,31 +32,42 @@ requirements = [ "PyCrypto", ] - -dependency_links = [ - "https://protobuf-socket-rpc.googlecode.com/files/protobuf.socketrpc-1.3.2.tar.gz#egg=protobuf.socketrpc" -] +#dependency_links = [ + #"https://protobuf-socket-rpc.googlecode.com/files/protobuf.socketrpc-1.3.2.tar.gz#egg=protobuf.socketrpc" +#] tests_requirements = [ 'mock', ] - -# XXX add classifiers, docs +trove_classifiers = [ + "Development Status :: 3 - Alpha", + "Intended Audience :: Developers", + ("License :: OSI Approved :: GNU General " + "Public License v3 or later (GPLv3+)"), + "Operating System :: OS Independent", + "Programming Language :: Python", + "Programming Language :: Python :: 2.6", + "Programming Language :: Python :: 2.7", + "Topic :: Communications", + "Topic :: Security", + "Topic :: Utilities" +] setup( name='leap.common', # If you change version, do it also in # src/leap/common/__init__.py - version='0.2.4', + version='0.2.5', url='https://leap.se/', license='GPLv3+', author='The LEAP Encryption Access Project', author_email='info@leap.se', - description='Common files used by the LEAP Client project.', + description='Common files used by the LEAP project.', long_description=( "Common files used by the LEAP Client project." ), + classifiers=trove_classifiers, namespace_packages=["leap"], package_dir={'': 'src'}, # For now, we do not exclude tests because of the circular dependency @@ -65,6 +76,7 @@ setup( packages=find_packages('src'), test_suite='leap.common.tests', install_requires=requirements, - dependency_links=dependency_links, + #dependency_links=dependency_links, tests_require=tests_requirements, + include_package_data=True ) -- cgit v1.2.3 From 7f35ec61513d4286bde08ba957945b38b85ca87a Mon Sep 17 00:00:00 2001 From: drebs Date: Thu, 30 May 2013 10:05:13 -0300 Subject: Remove deps on soledad and python-gnupg. --- setup.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 99fd25b..7005b9e 100644 --- a/setup.py +++ b/setup.py @@ -27,8 +27,6 @@ requirements = [ 'protobuf.socketrpc', "PyOpenSSL", "python-dateutil", - "leap.soledad", - "python-gnupg", "PyCrypto", ] -- cgit v1.2.3