From 2ec4556ac4228179ecb3671e852f1b5685067109 Mon Sep 17 00:00:00 2001 From: Bruno Wagner Date: Thu, 10 Mar 2016 15:17:49 -0300 Subject: [setup] Added dirspec url to requirements I also added a conditional to the setup.py so that python setup.py develop can be used even with the dirspec url --- setup.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index d62f2a6..22a4a59 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,10 @@ versioneer.versionfile_build = 'leap/common/_version.py' versioneer.tag_prefix = '' # tags are like 1.2.0 versioneer.parentdir_prefix = 'leap.common-' -parsed_reqs = utils.parse_requirements() +requirements = utils.parse_requirements() + +dependency_links = [requirement for requirement in requirements if requirement.startswith('http')] +requirements = [requirement for requirement in requirements if requirement not in dependency_links] tests_requirements = [ 'mock', @@ -134,8 +137,8 @@ setup( # packages=find_packages('src', exclude=['leap.common.tests']), packages=find_packages('src'), test_suite='leap.common.tests', - install_requires=parsed_reqs, - # dependency_links=dependency_links, + install_requires=requirements, + dependency_links=dependency_links, tests_require=tests_requirements, include_package_data=True, zip_safe=False, -- cgit v1.2.3 From 77ff0a10eb83263fdfb94e0bc9b1a38fd7e434f8 Mon Sep 17 00:00:00 2001 From: Bruno Wagner Date: Thu, 10 Mar 2016 16:04:57 -0300 Subject: [setup] Added docs on how to run the tests Also added dirspec directly to the setuptools for now, because it needs the dependency along with the url, but pip would break if it had both --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 22a4a59..1e77828 100644 --- a/setup.py +++ b/setup.py @@ -33,6 +33,7 @@ requirements = utils.parse_requirements() dependency_links = [requirement for requirement in requirements if requirement.startswith('http')] requirements = [requirement for requirement in requirements if requirement not in dependency_links] +requirements.append('dirspec') tests_requirements = [ 'mock', -- cgit v1.2.3 From 334fe8d2d38466ad309e1214d003f977f603dfb9 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Fri, 1 Apr 2016 17:33:26 -0400 Subject: [pkg] update to versioneer 0.16 --- setup.py | 61 +++++++++++++++++++++++++++++++------------------------------ 1 file changed, 31 insertions(+), 30 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 1e77828..0d4c281 100644 --- a/setup.py +++ b/setup.py @@ -20,19 +20,16 @@ setup file for leap.common import re from setuptools import setup, find_packages from setuptools import Command +import versioneer from pkg import utils -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-' requirements = utils.parse_requirements() - -dependency_links = [requirement for requirement in requirements if requirement.startswith('http')] -requirements = [requirement for requirement in requirements if requirement not in dependency_links] +dependency_links = [requirement for requirement + in requirements if requirement.startswith('http')] +requirements = [requirement for requirement + in requirements if requirement not in dependency_links] requirements.append('dirspec') tests_requirements = [ @@ -53,11 +50,11 @@ trove_classifiers = [ "Topic :: Utilities" ] -DOWNLOAD_BASE = ('https://github.com/leapcode/leap_pycommon/' +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 @@ -66,15 +63,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 @@ -88,34 +100,23 @@ 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) + try: long_description = open('README.rst').read() + '\n\n\n' + \ open('CHANGELOG').read() except Exception: long_description = "" +cmdclass = versioneer.get_cmdclass() cmdclass["freeze_debianver"] = freeze_debianver + setup( name='leap.common', version=VERSION, -- cgit v1.2.3 From 34e4eec7bb30e1be52aac1665321394a5ef080f0 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Wed, 18 May 2016 11:48:03 -0400 Subject: [pkg] setup: use new versioneer json format --- setup.py | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 0d4c281..e23ca7d 100644 --- a/setup.py +++ b/setup.py @@ -78,14 +78,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""" - -def get_versions(default={}, verbose=False): - return {'version': version_version, - 'full-revisionid': full_revisionid} +import json +import sys + +version_json = ''' +{ + "dirty": false, + "error": null, + "full-revisionid": "FULL_REVISIONID", + "version": "VERSION_STRING" +} +''' # END VERSION_JSON + +def get_versions(): + return json.loads(version_json) """ def initialize_options(self): @@ -100,14 +106,13 @@ 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) - try: long_description = open('README.rst').read() + '\n\n\n' + \ open('CHANGELOG').read() -- cgit v1.2.3 From 40e5d40c7c725709ac3fd770e6070fbe02e4b7e0 Mon Sep 17 00:00:00 2001 From: drebs Date: Wed, 6 Jul 2016 08:46:33 +0200 Subject: [pkg] remove dependency on dirspec This commit removes the dep introduced in 5e12233 by just importing some tiny bit of dirspec code. The previous change was introduced because: * pyxdg did not account for Mac OS specifics, i.e. using ~/Library/ directory structure instead of .config (see: https://leap.se/code/issues/3574). * dirspec does the correct thing for xdg on Mac OS. * u1db depends on dirspec anyway. The problem is that dirspec is not maintained and published on pypi, what forces us to download it from an URL and add exceptions to be able to pip install it. As we are removing dependence on u1db on other modules, we can also remove it here. To workaround the Mac OS problem, we just add some code from dirspec to ensure we get the correct directory on Mac OS. --- setup.py | 1 - 1 file changed, 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index e23ca7d..4269718 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,6 @@ dependency_links = [requirement for requirement in requirements if requirement.startswith('http')] requirements = [requirement for requirement in requirements if requirement not in dependency_links] -requirements.append('dirspec') tests_requirements = [ 'mock', -- cgit v1.2.3