From b17d57d763e2d206e6dcff7b3e245b3dc6b480c4 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Tue, 9 Apr 2013 23:08:33 +0900 Subject: Initial import --- mail/setup.py | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 mail/setup.py (limited to 'mail/setup.py') diff --git a/mail/setup.py b/mail/setup.py new file mode 100644 index 00000000..4de72512 --- /dev/null +++ b/mail/setup.py @@ -0,0 +1,46 @@ +# -*- 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 . +""" +setup file for leap.mail +""" +from setuptools import setup, find_packages + +requirements = [ + "leap.soledad", + "leap.common", + "twisted", +] + +# XXX add classifiers, docs + +setup( + name='leap.mail', + version='0.2.0-dev', + url='https://leap.se/', + license='GPLv3+', + author='The LEAP Encryption Access Project', + author_email='info@leap.se', + description='Mail Services in the LEAP Client project.', + long_description=( + "Mail Services in the LEAP Client project." + ), + namespace_packages=["leap"], + package_dir={'': 'src'}, + packages=find_packages('src'), + #test_suite='leap.mail.tests', + #install_requires=requirements, +) -- cgit v1.2.3 From 98bb3f2cd3bf007041265583af95845264d7e189 Mon Sep 17 00:00:00 2001 From: drebs Date: Mon, 6 May 2013 19:31:56 -0300 Subject: Adapt smtp-relay to use leap.common.keymanager * Add docstrings to smtp-relay classes. * Setup test suite. * Add setuptools-trial as dependency for tests. * Move smtp-relay tests to default test directory. * Add tests for smtp-relay. * Send of unencrypted mail depending on 'encrypted_only' param. * Malformed email address. * Add a helper function for smtp-relay. * Assert params for initializing SMTPFactory. * Use mail.util.parseaddr to parse email address. * Use email.message.Message to represent an email message in smtp-relay. * Make requirements effective and fix leap.common version in setup.py. * Add/remove dependencies in setup.py. * Fix Soledad instantiation in tests. * Fix sender address in smtp-relay. * Fix some comments regarding twisted's SSL and SMTP. * Remove authentication from smtp-relay when sending. This closes #2446. --- mail/setup.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'mail/setup.py') diff --git a/mail/setup.py b/mail/setup.py index 4de72512..8d4e415a 100644 --- a/mail/setup.py +++ b/mail/setup.py @@ -21,10 +21,15 @@ from setuptools import setup, find_packages requirements = [ "leap.soledad", - "leap.common", + "leap.common>=0.2.3-dev", "twisted", ] +tests_requirements = [ + 'setuptools-trial', + 'mock', +] + # XXX add classifiers, docs setup( @@ -40,7 +45,8 @@ setup( ), namespace_packages=["leap"], package_dir={'': 'src'}, - packages=find_packages('src'), - #test_suite='leap.mail.tests', - #install_requires=requirements, + packages=find_packages('src', exclude=['leap.mail.tests']), + test_suite='leap.mail.tests', + install_requires=requirements, + tests_require=tests_requirements, ) -- cgit v1.2.3 From 48868afb477eb605057b8063afb72e427a494877 Mon Sep 17 00:00:00 2001 From: drebs Date: Thu, 13 Jun 2013 16:22:16 -0300 Subject: Adapt smtp relay to latest soledad and keymanager. --- mail/setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'mail/setup.py') diff --git a/mail/setup.py b/mail/setup.py index 8d4e415a..f0713bf8 100644 --- a/mail/setup.py +++ b/mail/setup.py @@ -22,6 +22,7 @@ from setuptools import setup, find_packages requirements = [ "leap.soledad", "leap.common>=0.2.3-dev", + "leap.keymanager>=0.2.1", "twisted", ] -- cgit v1.2.3 From d81f6ced46c1c36c7ceda2783814b60d6b347826 Mon Sep 17 00:00:00 2001 From: drebs Date: Sat, 29 Jun 2013 14:33:50 -0300 Subject: Fix setuptools' test suite spec. --- mail/setup.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'mail/setup.py') diff --git a/mail/setup.py b/mail/setup.py index f0713bf8..3feb275d 100644 --- a/mail/setup.py +++ b/mail/setup.py @@ -17,8 +17,11 @@ """ setup file for leap.mail """ + + from setuptools import setup, find_packages + requirements = [ "leap.soledad", "leap.common>=0.2.3-dev", @@ -32,7 +35,6 @@ tests_requirements = [ ] # XXX add classifiers, docs - setup( name='leap.mail', version='0.2.0-dev', @@ -46,8 +48,8 @@ setup( ), namespace_packages=["leap"], package_dir={'': 'src'}, - packages=find_packages('src', exclude=['leap.mail.tests']), - test_suite='leap.mail.tests', + packages=find_packages('src'), + test_suite='leap.mail.load_tests', install_requires=requirements, tests_require=tests_requirements, ) -- cgit v1.2.3 From 0e65ccfd625fe33908afe111a08686bcf84c3b2c Mon Sep 17 00:00:00 2001 From: drebs Date: Thu, 25 Jul 2013 18:00:24 -0300 Subject: Fix keymanager requirement to version 0.2.0. --- mail/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mail/setup.py') diff --git a/mail/setup.py b/mail/setup.py index 3feb275d..ebf719c0 100644 --- a/mail/setup.py +++ b/mail/setup.py @@ -25,7 +25,7 @@ from setuptools import setup, find_packages requirements = [ "leap.soledad", "leap.common>=0.2.3-dev", - "leap.keymanager>=0.2.1", + "leap.keymanager>=0.2.0", "twisted", ] -- cgit v1.2.3 From 90fb4cad95a44021064871752d667589811842db Mon Sep 17 00:00:00 2001 From: drebs Date: Thu, 8 Aug 2013 15:33:33 +0200 Subject: Update use of keymanager API. --- mail/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mail/setup.py') diff --git a/mail/setup.py b/mail/setup.py index ebf719c0..ba23f7cb 100644 --- a/mail/setup.py +++ b/mail/setup.py @@ -23,7 +23,7 @@ from setuptools import setup, find_packages requirements = [ - "leap.soledad", + "leap.soledad>=0.2.3", "leap.common>=0.2.3-dev", "leap.keymanager>=0.2.0", "twisted", -- cgit v1.2.3 From 162e0e2e10bfaf26a5b3414c57790bd063401373 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= Date: Fri, 9 Aug 2013 14:37:22 -0300 Subject: Bump version to 0.3.0 --- mail/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mail/setup.py') diff --git a/mail/setup.py b/mail/setup.py index ba23f7cb..5597076b 100644 --- a/mail/setup.py +++ b/mail/setup.py @@ -37,7 +37,7 @@ tests_requirements = [ # XXX add classifiers, docs setup( name='leap.mail', - version='0.2.0-dev', + version='0.3.0', url='https://leap.se/', license='GPLv3+', author='The LEAP Encryption Access Project', -- cgit v1.2.3 From 6c006183ba2021bf5bedf98e86fd5a7c1a4506ba Mon Sep 17 00:00:00 2001 From: drebs Date: Mon, 19 Aug 2013 09:09:50 -0300 Subject: Update to new soledad package scheme. --- mail/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mail/setup.py') diff --git a/mail/setup.py b/mail/setup.py index 5597076b..b3891372 100644 --- a/mail/setup.py +++ b/mail/setup.py @@ -23,7 +23,7 @@ from setuptools import setup, find_packages requirements = [ - "leap.soledad>=0.2.3", + "leap.soledad.client>=0.3.0", "leap.common>=0.2.3-dev", "leap.keymanager>=0.2.0", "twisted", -- cgit v1.2.3 From 698c4cbf18933cf083b543806b5a6e11019a90da Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Fri, 23 Aug 2013 12:42:02 +0200 Subject: improve packaging --- mail/setup.py | 46 +++++++++++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 15 deletions(-) (limited to 'mail/setup.py') diff --git a/mail/setup.py b/mail/setup.py index b3891372..f4a663fa 100644 --- a/mail/setup.py +++ b/mail/setup.py @@ -17,27 +17,41 @@ """ setup file for leap.mail """ +from setuptools import setup +from setuptools import find_packages +import versioneer +versioneer.versionfile_source = 'src/leap/mail/_version.py' +versioneer.versionfile_build = 'leap/mail/_version.py' +versioneer.tag_prefix = '' # tags are like 1.2.0 +versioneer.parentdir_prefix = 'leap.mail-' -from setuptools import setup, find_packages +from pkg import utils - -requirements = [ - "leap.soledad.client>=0.3.0", - "leap.common>=0.2.3-dev", - "leap.keymanager>=0.2.0", - "twisted", +trove_classifiers = [ + 'Development Status :: 4 - Beta', + 'Framework :: Twisted', + '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 :: Communications :: Email :: Post-Office :: IMAP', + 'Topic :: Communications :: Email :: Post-Office :: POP3', + 'Topic :: Internet', + 'Topic :: Security :: Cryptography', + 'Topic :: Software Development :: Libraries', ] -tests_requirements = [ - 'setuptools-trial', - 'mock', -] +# XXX add ref to docs -# XXX add classifiers, docs setup( name='leap.mail', - version='0.3.0', + version=versioneer.get_version(), + cmdclass=versioneer.get_cmdclass(), url='https://leap.se/', license='GPLv3+', author='The LEAP Encryption Access Project', @@ -46,10 +60,12 @@ setup( long_description=( "Mail Services in the LEAP Client project." ), + classifiers=trove_classifiers, namespace_packages=["leap"], package_dir={'': 'src'}, packages=find_packages('src'), test_suite='leap.mail.load_tests', - install_requires=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 243ff134e90f2ab8d89de244f48e976bed24787c Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Fri, 6 Sep 2013 23:17:37 +0200 Subject: fix naming --- mail/setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mail/setup.py') diff --git a/mail/setup.py b/mail/setup.py index f4a663fa..f423f7b7 100644 --- a/mail/setup.py +++ b/mail/setup.py @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . """ -setup file for leap.mail +Setup file for leap.mail """ from setuptools import setup from setuptools import find_packages @@ -56,9 +56,9 @@ setup( license='GPLv3+', author='The LEAP Encryption Access Project', author_email='info@leap.se', - description='Mail Services in the LEAP Client project.', + description='Mail Services provided by Bitmask, the LEAP Client.', long_description=( - "Mail Services in the LEAP Client project." + "Mail Services provided by Bitmask, the LEAP Client." ), classifiers=trove_classifiers, namespace_packages=["leap"], -- cgit v1.2.3 From 9c245554b7cb7fa35c81d14d7ce8992ebb29ffaf Mon Sep 17 00:00:00 2001 From: drebs Date: Thu, 24 Oct 2013 16:25:51 -0200 Subject: Fix tests according to rfc 3156. Also fix test suite loading. --- mail/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mail/setup.py') diff --git a/mail/setup.py b/mail/setup.py index f423f7b7..57a41649 100644 --- a/mail/setup.py +++ b/mail/setup.py @@ -64,7 +64,7 @@ setup( namespace_packages=["leap"], package_dir={'': 'src'}, packages=find_packages('src'), - test_suite='leap.mail.load_tests', + test_suite='leap.mail.load_tests.load_tests', install_requires=utils.parse_requirements(), tests_require=utils.parse_requirements( reqfiles=['pkg/requirements-testing.pip']), -- cgit v1.2.3 From 1e7e64eb90490494ae2997807888b42fa0349c01 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Wed, 30 Oct 2013 11:58:22 -0200 Subject: add freeze_debianver_command --- mail/setup.py | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 70 insertions(+), 5 deletions(-) (limited to 'mail/setup.py') diff --git a/mail/setup.py b/mail/setup.py index 57a41649..499a9ee9 100644 --- a/mail/setup.py +++ b/mail/setup.py @@ -17,6 +17,7 @@ """ Setup file for leap.mail """ +import re from setuptools import setup from setuptools import find_packages @@ -46,20 +47,84 @@ trove_classifiers = [ 'Topic :: Software Development :: Libraries', ] +DOWNLOAD_BASE = ('https://github.com/leapcode/leap_mail/' + '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.mail', - version=versioneer.get_version(), - cmdclass=versioneer.get_cmdclass(), + 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='Mail Services provided by Bitmask, the LEAP Client.', - long_description=( - "Mail Services provided by Bitmask, the LEAP Client." - ), + long_description=open('README.rst').read() + '\n\n\n' + + open('CHANGELOG').read(), classifiers=trove_classifiers, namespace_packages=["leap"], package_dir={'': 'src'}, -- cgit v1.2.3 From 46de0ce8859d9fb5265b90e38bbc05138a254cc3 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Wed, 22 Jul 2015 12:23:18 -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 --- mail/setup.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'mail/setup.py') diff --git a/mail/setup.py b/mail/setup.py index 499a9ee9..ead89827 100644 --- a/mail/setup.py +++ b/mail/setup.py @@ -111,6 +111,22 @@ cmdclass["freeze_debianver"] = freeze_debianver # XXX add ref to docs +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.mail', version=VERSION, @@ -130,7 +146,7 @@ setup( package_dir={'': 'src'}, packages=find_packages('src'), test_suite='leap.mail.load_tests.load_tests', - install_requires=utils.parse_requirements(), + install_requires=requirements, tests_require=utils.parse_requirements( reqfiles=['pkg/requirements-testing.pip']), ) -- cgit v1.2.3 From b23b374ead52102709c2a6b4667e4c8debcaaa7b Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Tue, 18 Aug 2015 11:29:57 -0400 Subject: [style] pep8 excludes + fixes --- mail/setup.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mail/setup.py') diff --git a/mail/setup.py b/mail/setup.py index ead89827..575a6ecd 100644 --- a/mail/setup.py +++ b/mail/setup.py @@ -20,6 +20,10 @@ Setup file for leap.mail 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/mail/_version.py' @@ -27,7 +31,6 @@ versioneer.versionfile_build = 'leap/mail/_version.py' versioneer.tag_prefix = '' # tags are like 1.2.0 versioneer.parentdir_prefix = 'leap.mail-' -from pkg import utils trove_classifiers = [ 'Development Status :: 4 - Beta', @@ -63,9 +66,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 47eac7c85ce04e31da4516953353635281fb46b3 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Fri, 1 Apr 2016 13:07:18 -0400 Subject: [pkg] update to versioneer 0.16 --- mail/setup.py | 42 +++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 23 deletions(-) (limited to 'mail/setup.py') diff --git a/mail/setup.py b/mail/setup.py index 575a6ecd..e9c3e416 100644 --- a/mail/setup.py +++ b/mail/setup.py @@ -26,11 +26,6 @@ from pkg import utils import versioneer -versioneer.versionfile_source = 'src/leap/mail/_version.py' -versioneer.versionfile_build = 'leap/mail/_version.py' -versioneer.tag_prefix = '' # tags are like 1.2.0 -versioneer.parentdir_prefix = 'leap.mail-' - trove_classifiers = [ 'Development Status :: 4 - Beta', @@ -54,7 +49,7 @@ DOWNLOAD_BASE = ('https://github.com/leapcode/leap_mail/' '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 @@ -72,6 +67,22 @@ class freeze_debianver(Command): 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 @@ -85,24 +96,9 @@ 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 + version_full=VERSION_REVISION) + self.templatefun with open(versioneer.versionfile_source, 'w') as f: f.write(subst_template) -- cgit v1.2.3 From 84ceab1abb1863906b51f4b78885aa99c66bafc4 Mon Sep 17 00:00:00 2001 From: drebs Date: Tue, 26 Apr 2016 11:20:56 -0300 Subject: [bug] fix CHANGELOG.rst open in setup.py --- mail/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mail/setup.py') diff --git a/mail/setup.py b/mail/setup.py index e9c3e416..960cea14 100644 --- a/mail/setup.py +++ b/mail/setup.py @@ -136,7 +136,7 @@ setup( maintainer_email='kali@leap.se', description='Mail Services provided by Bitmask, the LEAP Client.', long_description=open('README.rst').read() + '\n\n\n' + - open('CHANGELOG').read(), + open('CHANGELOG.rst').read(), classifiers=trove_classifiers, namespace_packages=["leap"], package_dir={'': 'src'}, -- cgit v1.2.3 From 75941a7d0bc82738209d42d434042c76ab990dbe Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Wed, 18 May 2016 12:09:20 -0400 Subject: [pkg] update to new versioneer json format --- mail/setup.py | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) (limited to 'mail/setup.py') diff --git a/mail/setup.py b/mail/setup.py index 960cea14..ede620da 100644 --- a/mail/setup.py +++ b/mail/setup.py @@ -62,6 +62,7 @@ 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. @@ -74,14 +75,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): @@ -96,10 +103,11 @@ def get_versions(default={}, verbose=False): if proceed != "y": print("He. You scared. Aborting.") return - subst_template = self.template.format( - version=VERSION_SHORT, - version_full=VERSION_REVISION) + self.templatefun - with open(versioneer.versionfile_source, 'w') as f: + 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