summaryrefslogtreecommitdiff
path: root/common/setup.py
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2015-02-11 14:03:29 -0400
committerKali Kaneko <kali@leap.se>2015-02-11 14:03:29 -0400
commit58256957af8329f49d983852063eeaec74179c4d (patch)
tree4d95bf772a8845669bf9b5c7b6dc26f58bfdaa59 /common/setup.py
parentfa8dacef003d30cd9b56f7e2b07baa3b387c1e20 (diff)
parent14f34b1f64a667bf4a146e8579f95c5d308a1f77 (diff)
Merge branch 'feature/async-api' into develop
Diffstat (limited to 'common/setup.py')
-rw-r--r--common/setup.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/common/setup.py b/common/setup.py
index 3650a15a..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`
@@ -267,7 +272,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']),