From 256a298c11f66ee025b1bf85a5e0fba13620e96c Mon Sep 17 00:00:00 2001 From: kali Date: Mon, 23 Jul 2012 10:14:22 -0700 Subject: fix typo on package name --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 2bda6b66..0ee6a1b5 100755 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ setup_root = os.path.dirname(__file__) sys.path.insert(0, os.path.join(setup_root, "src")) setup( - name='eip-client', + name='leap-client', package_dir={"": "src"}, version=version, description="the internet encryption toolkit", -- cgit v1.2.3 From 6fcbd68152689f98d9c5b7526eee2e1e9b7dd0a2 Mon Sep 17 00:00:00 2001 From: kali Date: Wed, 22 Aug 2012 04:52:31 +0900 Subject: minor tweaks to setup + env test --- setup.py | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 0ee6a1b5..95559571 100755 --- a/setup.py +++ b/setup.py @@ -33,8 +33,24 @@ setup( # XXX FIXME DEPS # deps: pyqt - # test_deps: nose + # build_deps: pyqt-utils + # XXX fixme move resource reloading + # to this setup script. + + # XXX should implement a parse_requirements + # and get them from the pip reqs. workaround needed + # for argparse and <=2.6 + install_requires=[ + # -*- Extra requirements: -*- + ], + test_suite='nose.collector', + + # XXX change to parse_test_requirements and + # get them from pip reqs. + test_requires=[ + "nose", + "mock"], keywords='leap, client, qt, encryption', author='leap project', @@ -46,9 +62,8 @@ setup( exclude=['ez_setup', 'setup', 'examples', 'tests']), include_package_data=True, zip_safe=False, - install_requires=[ - # -*- Extra requirements: -*- - ], + + # XXX platform switch data_files=[ ("share/man/man1", ["docs/leap.1"]), -- cgit v1.2.3 From 56df9203b022aed19f1fb0fa3a6483dc34c3c72e Mon Sep 17 00:00:00 2001 From: kali Date: Thu, 23 Aug 2012 23:55:49 +0900 Subject: added requests to requirements.pip and setup --- setup.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 95559571..ee082f88 100755 --- a/setup.py +++ b/setup.py @@ -43,6 +43,8 @@ setup( # for argparse and <=2.6 install_requires=[ # -*- Extra requirements: -*- + "configuration", + "requests", ], test_suite='nose.collector', -- cgit v1.2.3 From 605717159e03b68105d708a153f668274d11daae Mon Sep 17 00:00:00 2001 From: kali Date: Thu, 6 Sep 2012 04:59:43 +0900 Subject: classifiers + long description --- setup.py | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index ee082f88..d907ab58 100755 --- a/setup.py +++ b/setup.py @@ -15,21 +15,46 @@ except ImportError: from setuptools import setup, find_packages import os -# get version from somewhere else -version = '0.1' +# XXX get version from somewhere else +version = '0.1.0' setup_root = os.path.dirname(__file__) sys.path.insert(0, os.path.join(setup_root, "src")) +trove_classifiers = [ + "Development Status :: 3 - Alpha", + "Environment :: X11 Applications :: Qt", + "Intended Audience :: End Users/Desktop", + ("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 :: System :: Networking", + "Topic :: Utilities" +] + setup( name='leap-client', package_dir={"": "src"}, version=version, description="the internet encryption toolkit", - long_description="""\ -""", - classifiers=[], # Get strings from - # http://pypi.python.org/pypi?%3Aaction=list_classifiers + long_description=( + "Desktop Client for the LEAP Platform." + "\n" + "LEAP (LEAP Encryption Access Project) develops " + "a multi-year plan to secure everyday communication, breaking down" + "into discrete services, to be rolled out one at a time.\n" + "The client for the current phase gives support to the EIP Service." + "EIP (the Encrypted Internet Proxy) provides circumvention, location " + "anonymization, and traffic " + "encryption in a hassle-free, automatically self-configuring fashion, " + "and has an enhanced level of security." + ), + classifiers=trove_classifiers, # XXX FIXME DEPS # deps: pyqt -- cgit v1.2.3 From 7274c4dfc0e827b201a85567540fda8af972bf70 Mon Sep 17 00:00:00 2001 From: kali Date: Thu, 6 Sep 2012 05:33:24 +0900 Subject: pkg.utils.parse_requirements used in setup renamed setup-->pkg because name collision --- setup.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index d907ab58..eea9b801 100755 --- a/setup.py +++ b/setup.py @@ -15,6 +15,8 @@ except ImportError: from setuptools import setup, find_packages import os +from pkg import utils + # XXX get version from somewhere else version = '0.1.0' @@ -63,14 +65,7 @@ setup( # XXX fixme move resource reloading # to this setup script. - # XXX should implement a parse_requirements - # and get them from the pip reqs. workaround needed - # for argparse and <=2.6 - install_requires=[ - # -*- Extra requirements: -*- - "configuration", - "requests", - ], + install_requires=utils.parse_requirements(), test_suite='nose.collector', # XXX change to parse_test_requirements and @@ -95,10 +90,10 @@ setup( ("share/man/man1", ["docs/leap.1"]), ("share/polkit-1/actions", - ["setup/linux/polkit/net.openvpn.gui.leap.policy"]) + ["pkg/linux/polkit/net.openvpn.gui.leap.policy"]) ], platforms="all", - scripts=["setup/scripts/leap"], + scripts=["pkg/scripts/leap"], entry_points=""" # -*- Entry points: -*- """, -- cgit v1.2.3 From 877c98a0add6fb3bce3e503098d120377012f6ec Mon Sep 17 00:00:00 2001 From: kali Date: Thu, 6 Sep 2012 05:54:03 +0900 Subject: add git version script --- setup.py | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index eea9b801..19df86e3 100755 --- a/setup.py +++ b/setup.py @@ -16,9 +16,7 @@ except ImportError: import os from pkg import utils - -# XXX get version from somewhere else -version = '0.1.0' +from pkg import version setup_root = os.path.dirname(__file__) sys.path.insert(0, os.path.join(setup_root, "src")) @@ -42,7 +40,7 @@ trove_classifiers = [ setup( name='leap-client', package_dir={"": "src"}, - version=version, + version=version.get_git_version(), description="the internet encryption toolkit", long_description=( "Desktop Client for the LEAP Platform." @@ -57,14 +55,6 @@ setup( "and has an enhanced level of security." ), classifiers=trove_classifiers, - - # XXX FIXME DEPS - # deps: pyqt - - # build_deps: pyqt-utils - # XXX fixme move resource reloading - # to this setup script. - install_requires=utils.parse_requirements(), test_suite='nose.collector', @@ -74,8 +64,8 @@ setup( "nose", "mock"], - keywords='leap, client, qt, encryption', - author='leap project', + keywords='leap, client, qt, encryption, proxy', + author='The LEAP project', author_email='info@leap.se', url='http://leap.se', license='GPL', -- cgit v1.2.3 From 212f9588e458d5c864134caa8dafbef164631671 Mon Sep 17 00:00:00 2001 From: kali Date: Thu, 6 Sep 2012 06:12:08 +0900 Subject: bootstrap setuptools + version fix also test_requires using parse_requirements --- setup.py | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 19df86e3..1e265cd5 100755 --- a/setup.py +++ b/setup.py @@ -6,12 +6,8 @@ import sys try: from setuptools import setup, find_packages except ImportError: - #FIXME old? - #use distribute_setup instead?? - #http://packages.python.org/distribute/setuptools.html#using-setuptools-without-bundling-it - import ez_setup - #XXX move ez_setup somewhere else? - ez_setup.use_setuptools() + from pkg import distribute_setup + distribute_setup.use_setuptools() from setuptools import setup, find_packages import os @@ -57,13 +53,8 @@ setup( classifiers=trove_classifiers, install_requires=utils.parse_requirements(), test_suite='nose.collector', - - # XXX change to parse_test_requirements and - # get them from pip reqs. - test_requires=[ - "nose", - "mock"], - + test_requires=utils.parse_requirements( + reqfiles=['pkg/test-requirements.pip']), keywords='leap, client, qt, encryption, proxy', author='The LEAP project', author_email='info@leap.se', @@ -75,7 +66,7 @@ setup( include_package_data=True, zip_safe=False, - # XXX platform switch + # add platform switch data_files=[ ("share/man/man1", ["docs/leap.1"]), -- cgit v1.2.3 From 77f4686d43443d08f3b1bb1bb364d24dd127c8ce Mon Sep 17 00:00:00 2001 From: kali Date: Sat, 8 Sep 2012 01:53:14 +0900 Subject: workaround for broken git version if no tag exists --- setup.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 1e265cd5..47e28d53 100755 --- a/setup.py +++ b/setup.py @@ -33,10 +33,16 @@ trove_classifiers = [ "Topic :: Utilities" ] +try: + version = version.get_git_version() +except ValueError: + # workaround since that needs a tag. + version = "0.1.0" + setup( name='leap-client', package_dir={"": "src"}, - version=version.get_git_version(), + version=version, description="the internet encryption toolkit", long_description=( "Desktop Client for the LEAP Platform." -- cgit v1.2.3 From ea13e9a04786fbb6c461690097361e48e8ca94ce Mon Sep 17 00:00:00 2001 From: kali Date: Thu, 13 Sep 2012 03:22:31 +0900 Subject: add versioneer --- setup.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 47e28d53..256d5105 100755 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- - +from __future__ import print_function import sys try: @@ -12,7 +12,11 @@ except ImportError: import os from pkg import utils -from pkg import version +import versioneer +versioneer.versionfile_source = 'src/leap/_version.py' +versioneer.versionfile_build = 'leap/_version.py' +versioneer.tag_prefix = '' # tags are like 1.2.0 +versioneer.parentdir_prefix = 'leap_client-' setup_root = os.path.dirname(__file__) sys.path.insert(0, os.path.join(setup_root, "src")) @@ -33,16 +37,11 @@ trove_classifiers = [ "Topic :: Utilities" ] -try: - version = version.get_git_version() -except ValueError: - # workaround since that needs a tag. - version = "0.1.0" - setup( name='leap-client', package_dir={"": "src"}, - version=version, + version=versioneer.get_version(), + cmdclass=versioneer.get_cmdclass(), description="the internet encryption toolkit", long_description=( "Desktop Client for the LEAP Platform." @@ -64,7 +63,7 @@ setup( keywords='leap, client, qt, encryption, proxy', author='The LEAP project', author_email='info@leap.se', - url='http://leap.se', + url='https://leap.se', license='GPL', packages=find_packages( 'src', -- cgit v1.2.3 From 0d35f2a82bf15504ace2135af3e0c66ae1c16874 Mon Sep 17 00:00:00 2001 From: kali Date: Tue, 18 Sep 2012 11:11:43 +0900 Subject: do_branding command added to setup --- setup.py | 149 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 143 insertions(+), 6 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 256d5105..74775dd0 100755 --- a/setup.py +++ b/setup.py @@ -12,11 +12,17 @@ except ImportError: import os from pkg import utils +from pkg import branding import versioneer versioneer.versionfile_source = 'src/leap/_version.py' versioneer.versionfile_build = 'leap/_version.py' versioneer.tag_prefix = '' # tags are like 1.2.0 -versioneer.parentdir_prefix = 'leap_client-' +#versioneer.parentdir_prefix = 'leap_client-' +versioneer.parentdir_prefix = branding.APP_PREFIX + +branding.brandingfile = 'src/leap/_branding.py' +branding.brandingfile_build = 'leap/_branding.py' +branding.cert_path = 'src/leap/certs' setup_root = os.path.dirname(__file__) sys.path.insert(0, os.path.join(setup_root, "src")) @@ -37,11 +43,139 @@ trove_classifiers = [ "Topic :: Utilities" ] +BRANDING_OPTS = """ +# Do NOT manually edit this file! +# This file has been written from pkg/branding/config.py data by leap setup.py +# script. + +BRANDING = { + 'short_name': "%(short_name)s", + 'provider_domain': "%(provider_domain)s", + 'provider_ca_file': "%(provider_ca_file)s"} +""" + + +def write_to_branding_file(filename, branding_dict): + f = open(filename, "w") + f.write(BRANDING_OPTS % branding_dict) + f.close() + + +def copy_pemfile_to_certdir(frompath, topath): + with open(frompath, "r") as cert_f: + cert_s = cert_f.read() + with open(topath, "w") as f: + f.write(cert_s) + + +def do_branding(targetfile=branding.brandingfile): + if branding.BRANDED_BUILD: + opts = branding.BRANDED_OPTS + print("DOING BRANDING FOR LEAP") + certpath = opts['provider_ca_path'] + shortname = opts['short_name'] + tocertfile = shortname + '-cacert.pem' + topath = os.path.join( + branding.cert_path, + tocertfile) + copy_pemfile_to_certdir( + certpath, + topath) + opts['provider_ca_file'] = tocertfile + write_to_branding_file( + targetfile, + opts) + else: + print('not running branding because BRANDED_BUILD set to False') + + +from setuptools import Command + + +class DoBranding(Command): + description = "copy the branding info the the top level package" + user_options = [] + + def initialize_options(self): + pass + + def finalize_options(self): + pass + + def run(self): + do_branding() + +from distutils.command.build import build as _build +from distutils.command.sdist import sdist as _sdist + + +class cmd_build(_build): + def run(self): + #versioneer.cmd_build(self) + _build.run(self) + + # versioneer + versions = versioneer.get_versions(verbose=True) + # now locate _version.py in the new build/ directory and replace it + # with an updated value + target_versionfile = os.path.join( + self.build_lib, + versioneer.versionfile_build) + print("UPDATING %s" % target_versionfile) + os.unlink(target_versionfile) + f = open(target_versionfile, "w") + f.write(versioneer.SHORT_VERSION_PY % versions) + f.close() + + # branding + target_brandingfile = os.path.join( + self.build_lib, + branding.brandingfile_build) + do_branding(targetfile=target_brandingfile) + + +class cmd_sdist(_sdist): + def run(self): + # versioneer: + versions = versioneer.get_versions(verbose=True) + self._versioneer_generated_versions = versions + # unless we update this, the command will keep using the old version + self.distribution.metadata.version = versions["version"] + + # branding: + do_branding() + return _sdist.run(self) + + def make_release_tree(self, base_dir, files): + _sdist.make_release_tree(self, base_dir, files) + # now locate _version.py in the new base_dir directory (remembering + # that it may be a hardlink) and replace it with an updated value + target_versionfile = os.path.join( + base_dir, versioneer.versionfile_source) + print("UPDATING %s" % target_versionfile) + os.unlink(target_versionfile) + f = open(target_versionfile, "w") + f.write( + versioneer.SHORT_VERSION_PY % self._versioneer_generated_versions) + f.close() + + +cmdclass = versioneer.get_cmdclass() +cmdclass["branding"] = DoBranding +cmdclass["build"] = cmd_build +cmdclass["sdist"] = cmd_sdist + +launcher_name = branding.get_shortname() +if launcher_name: + leap_launcher = 'leap-%s-client=leap.app:main' % launcher_name +else: + leap_launcher = 'leap=leap.app:main' + setup( - name='leap-client', + name=branding.get_name(), package_dir={"": "src"}, version=versioneer.get_version(), - cmdclass=versioneer.get_cmdclass(), + cmdclass=cmdclass, description="the internet encryption toolkit", long_description=( "Desktop Client for the LEAP Platform." @@ -79,8 +213,11 @@ setup( ["pkg/linux/polkit/net.openvpn.gui.leap.policy"]) ], platforms="all", - scripts=["pkg/scripts/leap"], - entry_points=""" + #scripts=["pkg/scripts/leap"], + entry_points = { + 'console_scripts': [leap_launcher] + }, + #entry_points=""" # -*- Entry points: -*- - """, + #""", ) -- cgit v1.2.3 From 7ba328fb9ce68b108c9e3d8670f9aabc883be99c Mon Sep 17 00:00:00 2001 From: kali Date: Tue, 9 Oct 2012 01:14:07 +0900 Subject: fix missing polkit policy file install --- setup.py | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 74775dd0..e1566752 100755 --- a/setup.py +++ b/setup.py @@ -159,11 +159,38 @@ class cmd_sdist(_sdist): versioneer.SHORT_VERSION_PY % self._versioneer_generated_versions) f.close() +from distutils.command.install_data import install_data as _install_data + + +class cmd_post_install(_install_data): + """ + workaround for installing non-package data + outside of the bounds of our internal data + Debian or other packaging should igore this. + """ + # We could use a environmental flag. + def run(self): + _install_data.run(self) + # is this the real life? + # is this just fantasy? + if not hasattr(sys, 'real_prefix'): + # looks like we are NOT + # running inside a virtualenv... + # let's install data. + # XXX should add platform switch + import shutil + print("Now installing policykit file...") + shutil.copyfile( + "pkg/linux/polkit/net.openvpn.gui.leap.policy", + "/usr/share/polkit-1/actions" + "/net.openvpn.gui.leap.policy") cmdclass = versioneer.get_cmdclass() cmdclass["branding"] = DoBranding cmdclass["build"] = cmd_build cmdclass["sdist"] = cmd_sdist +cmdclass["install_data"] = cmd_post_install + launcher_name = branding.get_shortname() if launcher_name: @@ -205,7 +232,7 @@ setup( include_package_data=True, zip_safe=False, - # add platform switch + # not being used since setuptools does not like it. data_files=[ ("share/man/man1", ["docs/leap.1"]), @@ -213,11 +240,7 @@ setup( ["pkg/linux/polkit/net.openvpn.gui.leap.policy"]) ], platforms="all", - #scripts=["pkg/scripts/leap"], entry_points = { 'console_scripts': [leap_launcher] }, - #entry_points=""" - # -*- Entry points: -*- - #""", ) -- cgit v1.2.3 From 205324734626a5dece03fc871448d0f71bbfb46d Mon Sep 17 00:00:00 2001 From: kali Date: Wed, 24 Oct 2012 04:25:46 +0900 Subject: removed branding info from branding config file So we officially can say this is a generic client now. Branding config file is still at pkg/branding/config.py Note that with this change the package is called now leap-client so you will have to remove old installs of leap-foo-client in your path (from previous branded builds). Changing the package name was an AWFUL and painful idea, and we will not do that again. (launcher is another story). Lesson learned. --- setup.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index e1566752..c280860d 100755 --- a/setup.py +++ b/setup.py @@ -187,8 +187,12 @@ class cmd_post_install(_install_data): cmdclass = versioneer.get_cmdclass() cmdclass["branding"] = DoBranding -cmdclass["build"] = cmd_build -cmdclass["sdist"] = cmd_sdist + +# Uncomment this to have the branding command run automatically +# on the build and sdist commands. +#cmdclass["build"] = cmd_build +#cmdclass["sdist"] = cmd_sdist + cmdclass["install_data"] = cmd_post_install @@ -196,7 +200,7 @@ launcher_name = branding.get_shortname() if launcher_name: leap_launcher = 'leap-%s-client=leap.app:main' % launcher_name else: - leap_launcher = 'leap=leap.app:main' + leap_launcher = 'leap-client=leap.app:main' setup( name=branding.get_name(), -- cgit v1.2.3 From b093b632049e1cf4c61d714c025831fb8d373ed7 Mon Sep 17 00:00:00 2001 From: kali Date: Fri, 25 Jan 2013 01:54:18 +0900 Subject: fix manpage path --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index c280860d..db95c1ac 100755 --- a/setup.py +++ b/setup.py @@ -239,7 +239,7 @@ setup( # not being used since setuptools does not like it. data_files=[ ("share/man/man1", - ["docs/leap.1"]), + ["docs/man/leap.1"]), ("share/polkit-1/actions", ["pkg/linux/polkit/net.openvpn.gui.leap.policy"]) ], -- cgit v1.2.3 From d7a84c54ea631eec457d92839bf16d1ec027cb3b Mon Sep 17 00:00:00 2001 From: kali Date: Wed, 30 Jan 2013 05:38:03 +0900 Subject: remove copy data hook from setup --- setup.py | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index db95c1ac..e73690ae 100755 --- a/setup.py +++ b/setup.py @@ -159,32 +159,6 @@ class cmd_sdist(_sdist): versioneer.SHORT_VERSION_PY % self._versioneer_generated_versions) f.close() -from distutils.command.install_data import install_data as _install_data - - -class cmd_post_install(_install_data): - """ - workaround for installing non-package data - outside of the bounds of our internal data - Debian or other packaging should igore this. - """ - # We could use a environmental flag. - def run(self): - _install_data.run(self) - # is this the real life? - # is this just fantasy? - if not hasattr(sys, 'real_prefix'): - # looks like we are NOT - # running inside a virtualenv... - # let's install data. - # XXX should add platform switch - import shutil - print("Now installing policykit file...") - shutil.copyfile( - "pkg/linux/polkit/net.openvpn.gui.leap.policy", - "/usr/share/polkit-1/actions" - "/net.openvpn.gui.leap.policy") - cmdclass = versioneer.get_cmdclass() cmdclass["branding"] = DoBranding @@ -193,9 +167,6 @@ cmdclass["branding"] = DoBranding #cmdclass["build"] = cmd_build #cmdclass["sdist"] = cmd_sdist -cmdclass["install_data"] = cmd_post_install - - launcher_name = branding.get_shortname() if launcher_name: leap_launcher = 'leap-%s-client=leap.app:main' % launcher_name @@ -237,6 +208,7 @@ setup( zip_safe=False, # not being used since setuptools does not like it. + # XXX it should be only for linux! data_files=[ ("share/man/man1", ["docs/man/leap.1"]), -- cgit v1.2.3 From 3daf4e945194dc55c718db6eed89f1a3fcc68cd9 Mon Sep 17 00:00:00 2001 From: kali Date: Wed, 30 Jan 2013 05:39:05 +0900 Subject: cosmetic fixes --- setup.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index e73690ae..64c2a4f5 100755 --- a/setup.py +++ b/setup.py @@ -196,11 +196,11 @@ setup( test_suite='nose.collector', test_requires=utils.parse_requirements( reqfiles=['pkg/test-requirements.pip']), - keywords='leap, client, qt, encryption, proxy', - author='The LEAP project', + keywords='LEAP, client, qt, encryption, proxy, openvpn', + author='The LEAP Encryption Access Project', author_email='info@leap.se', url='https://leap.se', - license='GPL', + license='GPLv3+', packages=find_packages( 'src', exclude=['ez_setup', 'setup', 'examples', 'tests']), @@ -216,7 +216,7 @@ setup( ["pkg/linux/polkit/net.openvpn.gui.leap.policy"]) ], platforms="all", - entry_points = { + entry_points={ 'console_scripts': [leap_launcher] }, ) -- cgit v1.2.3 From 15e8cf89db0ba3f4921a9ffcae72a0bc4cbf4b69 Mon Sep 17 00:00:00 2001 From: kali Date: Wed, 30 Jan 2013 14:46:56 +0900 Subject: rename manpage I am also commiting the manpage itself temporarily, we should leave only the .rst in the repo! --- setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 64c2a4f5..67d8ea5c 100755 --- a/setup.py +++ b/setup.py @@ -200,7 +200,7 @@ setup( author='The LEAP Encryption Access Project', author_email='info@leap.se', url='https://leap.se', - license='GPLv3+', + license='GPL-3+', packages=find_packages( 'src', exclude=['ez_setup', 'setup', 'examples', 'tests']), @@ -208,10 +208,10 @@ setup( zip_safe=False, # not being used since setuptools does not like it. - # XXX it should be only for linux! + # looks like debhelper is honoring it... data_files=[ ("share/man/man1", - ["docs/man/leap.1"]), + ["docs/man/leap-client.1"]), ("share/polkit-1/actions", ["pkg/linux/polkit/net.openvpn.gui.leap.policy"]) ], -- cgit v1.2.3 From c61432701ad325172658970f21abb9e970b46117 Mon Sep 17 00:00:00 2001 From: kali Date: Thu, 7 Feb 2013 00:29:37 +0900 Subject: remove generated manpage --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 67d8ea5c..a7016b94 100755 --- a/setup.py +++ b/setup.py @@ -210,8 +210,8 @@ setup( # not being used since setuptools does not like it. # looks like debhelper is honoring it... data_files=[ - ("share/man/man1", - ["docs/man/leap-client.1"]), + # ("share/man/man1", + # ["docs/man/leap-client.1"]), ("share/polkit-1/actions", ["pkg/linux/polkit/net.openvpn.gui.leap.policy"]) ], -- cgit v1.2.3