From cbf9ea06cebaf0a52ca958dd071c66952e70f1c8 Mon Sep 17 00:00:00 2001 From: drebs Date: Tue, 19 Aug 2014 15:35:00 -0300 Subject: Include ddocs in sdist (#5896). --- common/setup.py | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'common/setup.py') diff --git a/common/setup.py b/common/setup.py index 6ee166ef..3650a15a 100644 --- a/common/setup.py +++ b/common/setup.py @@ -228,23 +228,6 @@ class cmd_develop(_cmd_develop): build_ddocs_py() -# versioneer powered -old_cmd_sdist = cmdclass["sdist"] - - -class cmd_sdist(old_cmd_sdist): - """ - Generate 'src/leap/soledad/common/ddocs.py' which contains couch design - documents scripts. - """ - def run(self): - old_cmd_sdist.run(self) - - def make_release_tree(self, base_dir, files): - old_cmd_sdist.make_release_tree(self, base_dir, files) - build_ddocs_py(basedir=base_dir) - - # versioneer powered old_cmd_build = cmdclass["build"] @@ -257,7 +240,6 @@ class cmd_build(old_cmd_build): cmdclass["freeze_debianver"] = freeze_debianver cmdclass["build"] = cmd_build -cmdclass["sdist"] = cmd_sdist cmdclass["develop"] = cmd_develop -- cgit v1.2.3 From d0a0e92550bcc148fa236add5360ed581109ae6b Mon Sep 17 00:00:00 2001 From: drebs Date: Tue, 16 Dec 2014 15:33:46 -0200 Subject: Use Twisted trial for running tests. --- common/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'common/setup.py') diff --git a/common/setup.py b/common/setup.py index 3650a15a..92f4827d 100644 --- a/common/setup.py +++ b/common/setup.py @@ -267,7 +267,7 @@ setup( namespace_packages=["leap", "leap.soledad"], packages=find_packages('src', exclude=['leap.soledad.common.tests']), package_dir={'': 'src'}, - test_suite='leap.soledad.common.tests.load_tests', + test_suite='leap.soledad.common.tests', install_requires=utils.parse_requirements(), tests_require=utils.parse_requirements( reqfiles=['pkg/requirements-testing.pip']), -- cgit v1.2.3 From 661ee9eb1ce29056f219a2a95688840cebcf889a Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Fri, 23 Jan 2015 14:54:08 -0400 Subject: Bail out ddocs installation if the path doesn't exist. Fix: #6671 --- common/setup.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'common/setup.py') diff --git a/common/setup.py b/common/setup.py index 92f4827d..b0ab8352 100644 --- a/common/setup.py +++ b/common/setup.py @@ -155,6 +155,11 @@ def build_ddocs_py(basedir=None, with_src=True): dest_prefix = join(basedir, *dest_common_path) ddocs_prefix = join(prefix, 'ddocs') + + if not isdir(ddocs_prefix): + print "No ddocs/ folder, bailing out..." + return + ddocs = {} # design docs are represented by subdirectories of `ddocs_prefix` -- cgit v1.2.3 From 22adcae07584773a100bf304162113a9326a3866 Mon Sep 17 00:00:00 2001 From: drebs Date: Thu, 19 Mar 2015 10:32:34 -0300 Subject: [fix] exclude all tests from package Previous to this modification, leap.soledad.common.tests.u1db_tests was being installed and its files were being included in the debian package. By excluding *.tests and *.tests.* from find_packages() in setup.py, we make sure that no test file will be installed not included in the final debian package. --- common/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'common/setup.py') diff --git a/common/setup.py b/common/setup.py index b0ab8352..f4d8bc65 100644 --- a/common/setup.py +++ b/common/setup.py @@ -270,7 +270,7 @@ setup( ), classifiers=trove_classifiers, namespace_packages=["leap", "leap.soledad"], - packages=find_packages('src', exclude=['leap.soledad.common.tests']), + packages=find_packages('src', exclude=['*.tests', '*.tests.*']), package_dir={'': 'src'}, test_suite='leap.soledad.common.tests', install_requires=utils.parse_requirements(), -- cgit v1.2.3 From 82c8989ddbcc57befca806495b7040efd0cb0d4e Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Wed, 22 Jul 2015 12:36:41 -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 --- common/setup.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'common/setup.py') diff --git a/common/setup.py b/common/setup.py index f4d8bc65..49d94dad 100644 --- a/common/setup.py +++ b/common/setup.py @@ -250,6 +250,22 @@ cmdclass["develop"] = cmd_develop # 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.soledad.common', version=VERSION, @@ -273,7 +289,7 @@ setup( packages=find_packages('src', exclude=['*.tests', '*.tests.*']), package_dir={'': 'src'}, test_suite='leap.soledad.common.tests', - install_requires=utils.parse_requirements(), + install_requires=requirements, tests_require=utils.parse_requirements( reqfiles=['pkg/requirements-testing.pip']), extras_require={ -- cgit v1.2.3 From ee9ab32cd3cbe6a4fa73401a45faff6a36d16acf Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Wed, 19 Aug 2015 15:22:55 -0400 Subject: [style] pep8 cleanups --- common/setup.py | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'common/setup.py') diff --git a/common/setup.py b/common/setup.py index 49d94dad..383745dc 100644 --- a/common/setup.py +++ b/common/setup.py @@ -17,9 +17,18 @@ """ setup file for leap.soledad.common """ +import binascii +import json +from os import listdir +from os.path import realpath, dirname, isdir, join, isfile, basename import re + from setuptools import setup from setuptools import find_packages +from setuptools import Command +from setuptools.command.develop import develop as _cmd_develop + +from pkg import utils import versioneer versioneer.versionfile_source = 'src/leap/soledad/common/_version.py' @@ -27,7 +36,6 @@ versioneer.versionfile_build = 'leap/soledad/common/_version.py' versioneer.tag_prefix = '' # tags are like 1.2.0 versioneer.parentdir_prefix = 'leap.soledad.common-' -from pkg import utils trove_classifiers = ( "Development Status :: 3 - Alpha", @@ -59,9 +67,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. @@ -107,12 +112,6 @@ def get_versions(default={}, verbose=False): # Couch backend design docs file generation. # -from os import listdir -from os.path import realpath, dirname, isdir, join, isfile, basename -import json -import binascii - - old_cmd_sdist = cmdclass["sdist"] @@ -219,9 +218,6 @@ def build_ddocs_py(basedir=None, with_src=True): print "Wrote design docs in %s" % (dest_prefix + '/' + ddoc_filename,) -from setuptools.command.develop import develop as _cmd_develop - - class cmd_develop(_cmd_develop): def run(self): # versioneer: -- cgit v1.2.3