From 82e6a091225664c757f56b38f806401910889773 Mon Sep 17 00:00:00 2001 From: drebs Date: Tue, 2 Jul 2013 15:30:02 -0300 Subject: Move the key manager from leap_client repo to its own repo. --- keymanager/setup.py | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 keymanager/setup.py (limited to 'keymanager/setup.py') diff --git a/keymanager/setup.py b/keymanager/setup.py new file mode 100644 index 0000000..83aeddb --- /dev/null +++ b/keymanager/setup.py @@ -0,0 +1,58 @@ +# -*- coding: utf-8 -*- +# setup.py +# Copyright (C) 2013 LEAP +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +from setuptools import ( + setup, + find_packages +) + + +install_requirements = [ + 'leap.common', + 'simplejson', + 'requests', + 'python-gnupg', +] + + +tests_requirements = [ + 'mock', + 'leap.soledad', +] + + +setup( + name='leap.keymanager', + version='0.2.1', + url='https://leap.se/', + license='GPLv3+', + description='LEAP\'s Key Manager', + author='The LEAP Encryption Access Project', + author_email='info@leap.se', + long_description=( + "The Key Manager handles all types of keys to allow for " + "point-to-point encryption between parties communicating through " + "LEAP infrastructure." + ), + namespace_packages=["leap"], + packages=find_packages('src', exclude=['leap.keymanager.tests']), + package_dir={'': 'src'}, + test_suite='leap.keymanager.tests', + install_requires=install_requirements, + tests_require=tests_requirements, +) -- cgit v1.2.3 From f2fefe6a5e58d81d5c2d85371c4a575603258a91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= Date: Fri, 12 Jul 2013 15:05:16 -0300 Subject: Correct version to 0.2.0 --- keymanager/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keymanager/setup.py') diff --git a/keymanager/setup.py b/keymanager/setup.py index 83aeddb..84780ed 100644 --- a/keymanager/setup.py +++ b/keymanager/setup.py @@ -38,7 +38,7 @@ tests_requirements = [ setup( name='leap.keymanager', - version='0.2.1', + version='0.2.0', url='https://leap.se/', license='GPLv3+', description='LEAP\'s Key Manager', -- cgit v1.2.3 From cc76711ff17e7f45eca4a28a601b792fd15dc64f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= Date: Fri, 9 Aug 2013 14:26:52 -0300 Subject: Bump version to 0.3.0 --- keymanager/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keymanager/setup.py') diff --git a/keymanager/setup.py b/keymanager/setup.py index 84780ed..88fe35f 100644 --- a/keymanager/setup.py +++ b/keymanager/setup.py @@ -38,7 +38,7 @@ tests_requirements = [ setup( name='leap.keymanager', - version='0.2.0', + version='0.3.0', url='https://leap.se/', license='GPLv3+', description='LEAP\'s Key Manager', -- cgit v1.2.3 From 82191866aa668e7ad294087c0365decf54588698 Mon Sep 17 00:00:00 2001 From: drebs Date: Mon, 19 Aug 2013 08:57:42 -0300 Subject: Update to new soledad package scheme. --- keymanager/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keymanager/setup.py') diff --git a/keymanager/setup.py b/keymanager/setup.py index 88fe35f..c42ad2b 100644 --- a/keymanager/setup.py +++ b/keymanager/setup.py @@ -32,7 +32,7 @@ install_requirements = [ tests_requirements = [ 'mock', - 'leap.soledad', + 'leap.soledad.client', ] -- cgit v1.2.3 From 8783a07eea46e7d35c11ab1f6805fc5c715464c9 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Fri, 23 Aug 2013 12:17:20 +0200 Subject: Some packaging improvements * versioneer all the things * add parse_requirements --- keymanager/setup.py | 49 ++++++++++++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 19 deletions(-) (limited to 'keymanager/setup.py') diff --git a/keymanager/setup.py b/keymanager/setup.py index c42ad2b..1e48931 100644 --- a/keymanager/setup.py +++ b/keymanager/setup.py @@ -14,31 +14,40 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . +""" +setup file for leap.keymanager +""" +from setuptools import setup +from setuptools import find_packages +import versioneer +versioneer.versionfile_source = 'src/leap/keymanager/_version.py' +versioneer.versionfile_build = 'leap/keymanager/_version.py' +versioneer.tag_prefix = '' # tags are like 1.2.0 +versioneer.parentdir_prefix = 'leap.keymanager-' -from setuptools import ( - setup, - find_packages -) - - -install_requirements = [ - 'leap.common', - 'simplejson', - 'requests', - 'python-gnupg', -] - +from pkg import utils -tests_requirements = [ - 'mock', - 'leap.soledad.client', +trove_classifiers = [ + 'Development Status :: 4 - Beta', + 'Intended Audience :: Developers', + 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)', + 'Operating System :: OS Independent', + 'Programming Language :: Python', + 'Programming Language :: Python :: 2.6', + 'Programming Language :: Python :: 2.7', + 'Topic :: Communications :: Email', + 'Topic :: Internet', + 'Topic :: Security :: Cryptography', + 'Topic :: Software Development :: Libraries', ] +# XXX add ref to docs setup( name='leap.keymanager', - version='0.3.0', + version=versioneer.get_version(), + cmdclass=versioneer.get_cmdclass(), url='https://leap.se/', license='GPLv3+', description='LEAP\'s Key Manager', @@ -49,10 +58,12 @@ setup( "point-to-point encryption between parties communicating through " "LEAP infrastructure." ), + classifiers=trove_classifiers, namespace_packages=["leap"], packages=find_packages('src', exclude=['leap.keymanager.tests']), package_dir={'': 'src'}, test_suite='leap.keymanager.tests', - install_requires=install_requirements, - tests_require=tests_requirements, + install_requires=utils.parse_requirements(), + tests_require=utils.parse_requirements( + reqfiles=['pkg/requirements-testing.pip']), ) -- cgit v1.2.3 From 8de47edac23f3d6a7304a78b701ad0fde0c0d214 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Wed, 30 Oct 2013 11:08:42 -0200 Subject: add freeze_debianver command --- keymanager/setup.py | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 68 insertions(+), 2 deletions(-) (limited to 'keymanager/setup.py') diff --git a/keymanager/setup.py b/keymanager/setup.py index 1e48931..778909d 100644 --- a/keymanager/setup.py +++ b/keymanager/setup.py @@ -17,6 +17,7 @@ """ setup file for leap.keymanager """ +import re from setuptools import setup from setuptools import find_packages @@ -42,17 +43,82 @@ trove_classifiers = [ 'Topic :: Software Development :: Libraries', ] +DOWNLOAD_BASE = ('https://github.com/leapcode/keymanager/' + '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) + + +cmdclass["freeze_debianver"] = freeze_debianver + # XXX add ref to docs setup( name='leap.keymanager', - version=versioneer.get_version(), - cmdclass=versioneer.get_cmdclass(), + version=VERSION, + cmdclass=cmdclass, url='https://leap.se/', + download_url=DOWNLOAD_URL, license='GPLv3+', description='LEAP\'s Key Manager', author='The LEAP Encryption Access Project', author_email='info@leap.se', + maintainer='Kali Kaneko', + maintainer_email='kali@leap.se', long_description=( "The Key Manager handles all types of keys to allow for " "point-to-point encryption between parties communicating through " -- cgit v1.2.3 From d0535f4e613dddef4037f62bb42a6b8250489871 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Wed, 22 Jul 2015 10:31:59 -0400 Subject: [pkg] separate leap requirements this is part of a process to make the setup of the development mode less troublesome. from now on, setting up a virtualenv in pure development mode will be as easy as telling pip to just install the external dependencies:: pip install -r pkg/requirements.pip and traversing all the leap repos for the needed leap dependencies doing:: python setup.py develop - Related: #7288 --- keymanager/setup.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'keymanager/setup.py') diff --git a/keymanager/setup.py b/keymanager/setup.py index 778909d..f554e09 100644 --- a/keymanager/setup.py +++ b/keymanager/setup.py @@ -107,6 +107,10 @@ cmdclass["freeze_debianver"] = freeze_debianver # XXX add ref to docs +requirements = ( + utils.parse_requirements() + + utils.parse_requirements(reqfiles=["pkg/requirements-leap.pip"])) + setup( name='leap.keymanager', version=VERSION, @@ -129,7 +133,7 @@ setup( packages=find_packages('src', exclude=['leap.keymanager.tests']), package_dir={'': 'src'}, test_suite='leap.keymanager.tests', - install_requires=utils.parse_requirements(), + install_requires=requirements, tests_require=utils.parse_requirements( reqfiles=['pkg/requirements-testing.pip']), ) -- cgit v1.2.3 From d700bf5774643b132d635ce744680ac3c3d7b2b4 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Wed, 22 Jul 2015 16:03:50 -0400 Subject: [pkg] do not add leap deps in develop mode it is the responsibility of the developer to install them now - Related: #7288 --- keymanager/setup.py | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'keymanager/setup.py') diff --git a/keymanager/setup.py b/keymanager/setup.py index f554e09..adca6e1 100644 --- a/keymanager/setup.py +++ b/keymanager/setup.py @@ -107,9 +107,21 @@ cmdclass["freeze_debianver"] = freeze_debianver # XXX add ref to docs -requirements = ( - utils.parse_requirements() + - utils.parse_requirements(reqfiles=["pkg/requirements-leap.pip"])) +requirements = utils.parse_requirements() + +if utils.is_develop_mode(): + print + print ("[WARNING] Skipping leap-specific dependencies " + "because development mode is detected.") + print ("[WARNING] You can install " + "the latest published versions with " + "'pip install -r pkg/requirements-leap.pip'") + print ("[WARNING] Or you can instead do 'python setup.py develop' " + "from the parent folder of each one of them.") + print +else: + requirements += utils.parse_requirements( + reqfiles=["pkg/requirements-leap.pip"]) setup( name='leap.keymanager', -- cgit v1.2.3 From ad54a96cb065290f02135b6f6cae2adcf0d92ab1 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Mon, 17 Aug 2015 21:52:55 -0400 Subject: [style] pep8 fixes --- keymanager/setup.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'keymanager/setup.py') diff --git a/keymanager/setup.py b/keymanager/setup.py index adca6e1..26840c6 100644 --- a/keymanager/setup.py +++ b/keymanager/setup.py @@ -20,6 +20,10 @@ setup file for leap.keymanager import re from setuptools import setup from setuptools import find_packages +from setuptools import Command + +from pkg import utils + import versioneer versioneer.versionfile_source = 'src/leap/keymanager/_version.py' @@ -27,8 +31,6 @@ versioneer.versionfile_build = 'leap/keymanager/_version.py' versioneer.tag_prefix = '' # tags are like 1.2.0 versioneer.parentdir_prefix = 'leap.keymanager-' -from pkg import utils - trove_classifiers = [ 'Development Status :: 4 - Beta', 'Intended Audience :: Developers', @@ -59,9 +61,6 @@ if len(_version_short) > 0: cmdclass = versioneer.get_cmdclass() -from setuptools import Command - - class freeze_debianver(Command): """ Freezes the version in a debian branch. -- cgit v1.2.3 From 59419055fe0037808ec8b2ae215f8d3ce7595494 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Fri, 1 Apr 2016 17:25:58 -0400 Subject: [pkg] update to versioneer 0.16 --- keymanager/setup.py | 51 ++++++++++++++++++++++++--------------------------- 1 file changed, 24 insertions(+), 27 deletions(-) (limited to 'keymanager/setup.py') diff --git a/keymanager/setup.py b/keymanager/setup.py index 26840c6..4a05a1e 100644 --- a/keymanager/setup.py +++ b/keymanager/setup.py @@ -24,12 +24,7 @@ from setuptools import Command from pkg import utils - import versioneer -versioneer.versionfile_source = 'src/leap/keymanager/_version.py' -versioneer.versionfile_build = 'leap/keymanager/_version.py' -versioneer.tag_prefix = '' # tags are like 1.2.0 -versioneer.parentdir_prefix = 'leap.keymanager-' trove_classifiers = [ 'Development Status :: 4 - Beta', @@ -45,11 +40,11 @@ trove_classifiers = [ 'Topic :: Software Development :: Libraries', ] -DOWNLOAD_BASE = ('https://github.com/leapcode/keymanager/' +DOWNLOAD_BASE = ('https://github.com/leapcode/bitmask_client/' 'archive/%s.tar.gz') _versions = versioneer.get_versions() VERSION = _versions['version'] -VERSION_FULL = _versions['full'] +VERSION_REVISION = _versions['full-revisionid'] DOWNLOAD_URL = "" # get the short version for the download url @@ -58,15 +53,30 @@ if len(_version_short) > 0: VERSION_SHORT = _version_short[0] DOWNLOAD_URL = DOWNLOAD_BASE % VERSION_SHORT -cmdclass = versioneer.get_cmdclass() - 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 = [] + template = r""" +# This file was generated by the `freeze_debianver` command in setup.py +# Using 'versioneer.py' (0.16) 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}' +full_revisionid = '{full_revisionid}' +""" + templatefun = r""" + +def get_versions(default={}, verbose=False): + return {'version': version_version, + 'full-revisionid': full_revisionid} +""" def initialize_options(self): pass @@ -80,28 +90,15 @@ class freeze_debianver(Command): 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( + subst_template = self.template.format( version=VERSION_SHORT, - version_full=VERSION_FULL) + templatefun - with open(versioneer.versionfile_source, 'w') as f: + full_revisionid=VERSION_REVISION) + self.templatefun + versioneer_cfg = versioneer.get_config_from_root('.') + with open(versioneer_cfg.versionfile_source, 'w') as f: f.write(subst_template) +cmdclass = versioneer.get_cmdclass() cmdclass["freeze_debianver"] = freeze_debianver # XXX add ref to docs -- cgit v1.2.3 From c201648c735850ecc000c88855aa26f551d22900 Mon Sep 17 00:00:00 2001 From: "Kali Kaneko (leap communications)" Date: Wed, 18 May 2016 11:56:37 -0400 Subject: [pkg] update to new versioneer json format --- keymanager/setup.py | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) (limited to 'keymanager/setup.py') diff --git a/keymanager/setup.py b/keymanager/setup.py index 4a05a1e..cde5f8b 100644 --- a/keymanager/setup.py +++ b/keymanager/setup.py @@ -53,7 +53,6 @@ if len(_version_short) > 0: VERSION_SHORT = _version_short[0] DOWNLOAD_URL = DOWNLOAD_BASE % VERSION_SHORT - class freeze_debianver(Command): """ @@ -68,14 +67,20 @@ class freeze_debianver(Command): # unpacked source archive. Distribution tarballs contain a pre-generated copy # of this file. -version_version = '{version}' -full_revisionid = '{full_revisionid}' -""" - templatefun = r""" +import json +import sys + +version_json = ''' +{ + "dirty": false, + "error": null, + "full-revisionid": "FULL_REVISIONID", + "version": "VERSION_STRING" +} +''' # END VERSION_JSON -def get_versions(default={}, verbose=False): - return {'version': version_version, - 'full-revisionid': full_revisionid} +def get_versions(): + return json.loads(version_json) """ def initialize_options(self): @@ -90,9 +95,9 @@ def get_versions(default={}, verbose=False): if proceed != "y": print("He. You scared. Aborting.") return - subst_template = self.template.format( - version=VERSION_SHORT, - full_revisionid=VERSION_REVISION) + self.templatefun + subst_template = self.template.replace( + 'VERSION_STRING', VERSION_SHORT).replace( + 'FULL_REVISIONID', VERSION_REVISION) versioneer_cfg = versioneer.get_config_from_root('.') with open(versioneer_cfg.versionfile_source, 'w') as f: f.write(subst_template) -- cgit v1.2.3