diff options
| author | drebs <drebs@leap.se> | 2015-06-04 11:21:40 -0300 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2015-06-04 11:21:40 -0300 |
| commit | 293c71080e9a21115d248e46d1a706c53cc8ee37 (patch) | |
| tree | 3353672f1f770ef5f5c87ea7e3e27debe737a50b /common/setup.py | |
| parent | fa7708e256ba56cd1e9913993d68611b4ae95824 (diff) | |
| parent | 9fb1c47ca7da06d6feef6846b812aec28128ed78 (diff) | |
Merge tag '0.7.0'
Tag version 0.7.0.
Conflicts:
CHANGELOG
client/src/leap/soledad/client/__init__.py
client/src/leap/soledad/client/sqlcipher.py
client/src/leap/soledad/client/target.py
server/pkg/soledad-server
Diffstat (limited to 'common/setup.py')
| -rw-r--r-- | common/setup.py | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/common/setup.py b/common/setup.py index 365006b2..f4d8bc65 100644 --- a/common/setup.py +++ b/common/setup.py @@ -234,23 +234,6 @@ class cmd_develop(_cmd_develop): # 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"] @@ -262,7 +245,6 @@ class cmd_build(old_cmd_build): cmdclass["freeze_debianver"] = freeze_debianver cmdclass["build"] = cmd_build -cmdclass["sdist"] = cmd_sdist cmdclass["develop"] = cmd_develop @@ -288,9 +270,9 @@ 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.load_tests', + test_suite='leap.soledad.common.tests', install_requires=utils.parse_requirements(), tests_require=utils.parse_requirements( reqfiles=['pkg/requirements-testing.pip']), |