From 9a658c81619af892a4b29e0122cd1c1ba2e428e4 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Fri, 4 Mar 2016 11:27:55 -0400 Subject: [pkg] move to versioneer 0.15 --- setup.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 8463c172..e85c4564 100755 --- a/setup.py +++ b/setup.py @@ -41,10 +41,6 @@ except ImportError: from pkg import utils import versioneer -versioneer.versionfile_source = 'src/leap/bitmask/_version.py' -versioneer.versionfile_build = 'leap/bitmask/_version.py' -versioneer.tag_prefix = '' # tags are like 1.2.0 -versioneer.parentdir_prefix = 'leap.bitmask-' # The following import avoids the premature unloading of the `util` submodule @@ -78,7 +74,7 @@ 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 @@ -108,12 +104,13 @@ class freeze_debianver(Command): # of this file. version_version = '{version}' -version_full = '{version_full}' +version_revisionid = '{version_revision}' """ templatefun = r""" def get_versions(default={}, verbose=False): - return {'version': version_version, 'full': version_full} + return {'version': version_version, + 'full-revisionid': version_revisionid} """ def initialize_options(self): @@ -130,7 +127,7 @@ def get_versions(default={}, verbose=False): return subst_template = self.template.format( version=VERSION_SHORT, - version_full=VERSION_FULL) + self.templatefun + version_full=VERSION_REVISION) + self.templatefun with open(versioneer.versionfile_source, 'w') as f: f.write(subst_template) @@ -264,7 +261,7 @@ cmdclass["hash_binaries"] = cmd_binary_hash # next two classes need to augment the versioneer modified ones -versioneer_build = cmdclass['build'] +versioneer_build = cmdclass['build_py'] versioneer_sdist = cmdclass['sdist'] -- cgit v1.2.3 From 3d2df02b549a32c15b2bb369a33789abadb60c92 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Fri, 4 Mar 2016 11:44:18 -0400 Subject: [bug] fix some version handling errors --- setup.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index e85c4564..fc9c36c9 100755 --- a/setup.py +++ b/setup.py @@ -24,7 +24,8 @@ import hashlib import sys import os import re -import sys + +from distutils.command.build import build as _build if not sys.version_info[0] == 2: print("[ERROR] Sorry, Python 3 is not supported (yet). " @@ -259,16 +260,16 @@ BITMASK_ROOT = "{bitmask}" cmdclass["hash_binaries"] = cmd_binary_hash -# next two classes need to augment the versioneer modified ones +# sdist class need to augment the versioneer modified ones -versioneer_build = cmdclass['build_py'] +#_build = cmdclass['build_py'] versioneer_sdist = cmdclass['sdist'] -class cmd_build(versioneer_build): +class cmd_build(_build): def run(self): - versioneer_build.run(self) + _build.run(self) copy_reqs(self.build_lib) -- cgit v1.2.3 From 054ceb6225ef9c32f3d24870bf3e8085bbe0c432 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Mon, 28 Mar 2016 12:25:29 -0400 Subject: [pkg] update freeze_deb command --- setup.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index fc9c36c9..15327bf1 100755 --- a/setup.py +++ b/setup.py @@ -105,13 +105,13 @@ class freeze_debianver(Command): # of this file. version_version = '{version}' -version_revisionid = '{version_revision}' +full_revisionid = '{full_revisionid}' """ templatefun = r""" def get_versions(default={}, verbose=False): return {'version': version_version, - 'full-revisionid': version_revisionid} + 'full-revisionid': full_revisionid} """ def initialize_options(self): @@ -128,8 +128,9 @@ def get_versions(default={}, verbose=False): return subst_template = self.template.format( version=VERSION_SHORT, - version_full=VERSION_REVISION) + self.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) -- cgit v1.2.3 From fe96e2eef29a538b856f0d8b4bbf3940e42364c1 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Fri, 1 Apr 2016 12:55:00 -0400 Subject: [pkg] update to versioneer 0.16 --- setup.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 15327bf1..5bf5d186 100755 --- a/setup.py +++ b/setup.py @@ -26,6 +26,7 @@ import os import re from distutils.command.build import build as _build +from setuptools import Command if not sys.version_info[0] == 2: print("[ERROR] Sorry, Python 3 is not supported (yet). " @@ -84,11 +85,6 @@ 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): @@ -99,7 +95,7 @@ class freeze_debianver(Command): user_options = [] template = r""" # This file was generated by the `freeze_debianver` command in setup.py -# Using 'versioneer.py' (0.7+) from +# 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. @@ -145,12 +141,12 @@ def freeze_pkg_ver(path, version_short, version_full): with open(path, 'w') as f: f.write(subst_template) - if sys.argv[:1] == '--sumo': IS_SUMO = True else: IS_SUMO = False +cmdclass = versioneer.get_cmdclass() cmdclass["freeze_debianver"] = freeze_debianver parsed_reqs = utils.parse_requirements() @@ -263,7 +259,6 @@ cmdclass["hash_binaries"] = cmd_binary_hash # sdist class need to augment the versioneer modified ones -#_build = cmdclass['build_py'] versioneer_sdist = cmdclass['sdist'] -- cgit v1.2.3 From 42e4458f3f37d50725a37a7e22835ab677cc24aa Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Thu, 7 Apr 2016 11:09:05 -0400 Subject: [style] pep8 --- setup.py | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 5bf5d186..62e9b115 100755 --- a/setup.py +++ b/setup.py @@ -20,37 +20,43 @@ Setup file for bitmask. """ from __future__ import print_function +import glob import hashlib -import sys import os +import platform import re +import shutil +import sys from distutils.command.build import build as _build from setuptools import Command +from setuptools.command.develop import develop as _develop -if not sys.version_info[0] == 2: - print("[ERROR] Sorry, Python 3 is not supported (yet). " - "Try running with python2: python2 setup.py ...") - exit() - -try: - from setuptools import setup, find_packages -except ImportError: - from pkg import distribute_setup - distribute_setup.use_setuptools() - from setuptools import setup, find_packages from pkg import utils import versioneer - # The following import avoids the premature unloading of the `util` submodule # when running tests, which would cause an error when nose finishes tests and # calls the exit function of the multiprocessing module. from multiprocessing import util assert(util) + +try: + from setuptools import setup, find_packages +except ImportError: + from pkg import distribute_setup + distribute_setup.use_setuptools() + from setuptools import setup, find_packages + +if not sys.version_info[0] == 2: + print("[ERROR] Sorry, Python 3 is not supported (yet). " + "Try running with python2: python2 setup.py ...") + exit() + + setup_root = os.path.dirname(__file__) sys.path.insert(0, os.path.join(setup_root, "src")) @@ -167,8 +173,6 @@ else: leap_launcher = 'bitmask=leap.bitmask.app:start_app' -from setuptools.command.develop import develop as _develop - def copy_reqs(path, withsrc=False): # add a copy of the processed requirements to the package @@ -365,10 +369,6 @@ class cmd_sdist(versioneer_sdist): pass -import shutil -import glob - - def _get_leap_versions(): versions = {} with open("pkg/leap_versions.txt") as vf: @@ -457,7 +457,6 @@ def copy_recursively(source_folder, destination_folder): cmdclass["build"] = cmd_build cmdclass["sdist"] = cmd_sdist -import platform _system = platform.system() IS_LINUX = _system == "Linux" IS_MAC = _system == "Darwin" -- cgit v1.2.3 From 5fc9a8c68216bcdd7a4d847e75bac428aafda5e4 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Mon, 11 Apr 2016 17:49:01 -0400 Subject: [bug] hash the installed binaries this was the cause for the previous alpha releases keep insisting on re-installing the helper files. - Resolves: #7989 - Releases: 0.9.2 --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 62e9b115..8dc5a694 100755 --- a/setup.py +++ b/setup.py @@ -219,6 +219,7 @@ class cmd_binary_hash(Command): pass def run(self, *args): + # TODO check gnupg binary too. OPENVPN_BIN = os.environ.get('OPENVPN_BIN', None) BITMASK_ROOT = os.environ.get('BITMASK_ROOT', None) -- cgit v1.2.3 From 033bb6e2a0112e909d3c77df3d93ec6c99b729c9 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Sat, 16 Apr 2016 20:45:28 -0400 Subject: [pkg] fix lingering var name after versioneer upgrade --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 8dc5a694..8f38ca7c 100755 --- a/setup.py +++ b/setup.py @@ -143,7 +143,7 @@ def freeze_pkg_ver(path, version_short, version_full): """ subst_template = freeze_debianver.template.format( version=version_short, - version_full=version_full) + freeze_debianver.templatefun + full_revisionid=version_full) + freeze_debianver.templatefun with open(path, 'w') as f: f.write(subst_template) -- cgit v1.2.3 From cea88f895f3fe2fadd2a59f9301e84cb13020dd4 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Fri, 4 Mar 2016 11:44:18 -0400 Subject: [cmd] fix build cmdclass --- setup.py | 1 - 1 file changed, 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 8f38ca7c..44e55709 100755 --- a/setup.py +++ b/setup.py @@ -32,7 +32,6 @@ from distutils.command.build import build as _build from setuptools import Command from setuptools.command.develop import develop as _develop - from pkg import utils import versioneer -- cgit v1.2.3 From 6fd1c73db49c5e1e08cf7963017470511fef0059 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Fri, 4 Mar 2016 11:44:41 -0400 Subject: [feature] add bitmask_cli entrypoint --- setup.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 44e55709..3e720971 100755 --- a/setup.py +++ b/setup.py @@ -170,9 +170,6 @@ else: reqfiles=["pkg/requirements-leap.pip"]) -leap_launcher = 'bitmask=leap.bitmask.app:start_app' - - def copy_reqs(path, withsrc=False): # add a copy of the processed requirements to the package _reqpath = ('leap', 'bitmask', 'util', 'reqs.txt') @@ -480,6 +477,10 @@ if IS_LINUX: extra_options = {} +gui_launcher = 'bitmask=leap.bitmask.app:start_app' +bitmask_cli = 'bitmask_cli=leap.bitmask.cli.bitmask_cli:main' + + setup( name="leap.bitmask", package_dir={"": "src"}, @@ -515,7 +516,7 @@ setup( zip_safe=False, platforms="all", entry_points={ - 'console_scripts': [leap_launcher] + 'console_scripts': [gui_launcher, bitmask_cli] }, **extra_options ) -- cgit v1.2.3 From b3f5538984502d97c77a9666f39c8d5b8f4a5c31 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Tue, 8 Mar 2016 11:36:37 -0400 Subject: [feature] add bitmaskd entrypoint --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 3e720971..24ed98aa 100755 --- a/setup.py +++ b/setup.py @@ -479,6 +479,7 @@ extra_options = {} gui_launcher = 'bitmask=leap.bitmask.app:start_app' bitmask_cli = 'bitmask_cli=leap.bitmask.cli.bitmask_cli:main' +bitmaskd = 'bitmaskd=leap.bitmask.core.launcher:run_bitmaskd' setup( @@ -516,7 +517,7 @@ setup( zip_safe=False, platforms="all", entry_points={ - 'console_scripts': [gui_launcher, bitmask_cli] + 'console_scripts': [gui_launcher, bitmask_cli, bitmaskd] }, **extra_options ) -- cgit v1.2.3