From 00ea4eb4593271e1df664e7f4ea49fd57e201364 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Wed, 5 Jul 2017 22:29:02 +0200 Subject: [PATCH 1/3] core: include extension settings in every case. see #1177 --- .travis.yml | 2 +- modoboa/core/commands/deploy.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index fbfb621d2..56c79f950 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,7 +41,7 @@ before_script: - ldapadd -h localhost:3389 -D cn=admin,dc=example,dc=com -w test -f test_data/base.ldif script: - - python ./tests.py + - coverage run --source ../modoboa ./tests.py - cd test_project - coverage run --source ../modoboa manage.py test modoboa.core modoboa.lib modoboa.admin modoboa.limits modoboa.relaydomains diff --git a/modoboa/core/commands/deploy.py b/modoboa/core/commands/deploy.py index 5a21e4fbf..79ea3f4e0 100644 --- a/modoboa/core/commands/deploy.py +++ b/modoboa/core/commands/deploy.py @@ -172,8 +172,6 @@ class DeployCommand(Command): include in the final configuration. """ - pip_args = ["install"] + [extension[0] for extension in extensions] - pip.main(pip_args) extra_settings = [] for extension in extensions: module = __import__(extension[1], locals(), globals(), []) @@ -225,7 +223,10 @@ class DeployCommand(Command): extensions = [(extension, extension.replace("-", "_")) for extension in extensions] if not parsed_args.dont_install_extensions: - extra_settings = self.install_extensions(extensions) + pip_args = ( + ["install"] + [extension[0] for extension in extensions]) + pip.main(pip_args) + extra_settings = self.find_extra_settings(extensions) extensions = [extension[1] for extension in extensions] bower_components_dir = os.path.realpath( From 7ba7895c1b66cfd252a0b5f1dfcfb8ec37c01e72 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Wed, 5 Jul 2017 23:05:14 +0200 Subject: [PATCH 2/3] Updated travis config. see #1177 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 56c79f950..6f69d3ec6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,7 +41,7 @@ before_script: - ldapadd -h localhost:3389 -D cn=admin,dc=example,dc=com -w test -f test_data/base.ldif script: - - coverage run --source ../modoboa ./tests.py + - coverage run --source modoboa ./tests.py - cd test_project - coverage run --source ../modoboa manage.py test modoboa.core modoboa.lib modoboa.admin modoboa.limits modoboa.relaydomains From 27f2eb059295996b3312e6dd0bf9598693fb5b5c Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Fri, 7 Jul 2017 09:24:00 +0200 Subject: [PATCH 3/3] Do not run coverage (useless for now). see #1177 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6f69d3ec6..fbfb621d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,7 +41,7 @@ before_script: - ldapadd -h localhost:3389 -D cn=admin,dc=example,dc=com -w test -f test_data/base.ldif script: - - coverage run --source modoboa ./tests.py + - python ./tests.py - cd test_project - coverage run --source ../modoboa manage.py test modoboa.core modoboa.lib modoboa.admin modoboa.limits modoboa.relaydomains