[GNUnet-SVN] [taler-bank] branch master updated: set PYTHONPATH only for tests

[gnunet]

This is an automated email from the git hooks/post-receive script.

marcello pushed a commit to branch master
in repository bank.

The following commit(s) were added to refs/heads/master by this push:
     new 3fd2bd8  set PYTHONPATH only for tests
3fd2bd8 is described below

commit 3fd2bd86c2c9812aa8b4ebf086fbd5f6e28a220a
Author: Marcello Stanisci <address@hidden>
AuthorDate: Wed Dec 27 11:49:15 2017 +0100

    set PYTHONPATH only for tests
---
 Makefile.am | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index d108fef..bc94a1c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,20 +38,21 @@ FMT="\n\n%s\n%s\n"
 SEPARATOR=`printf "%s%s" \
   "----------------------------------------------" \
   "------------------------"`
-PYTHONPATH_FOR_TESTS=`printf "%s"` \
-  "@prefix@/lib/address@hidden@/site-packages"
+PYTHONPATH_APPEND=`printf "%s" \
+  "@prefix@/lib/address@hidden@/site-packages"`
 
 check:
-       @export PYTHONPATH="${PYTHONPATH_FOR_TESTS}:${PYTHONPATH}"
        @export DJANGO_SETTINGS_MODULE="talerbank.settings" \
          TALER_PREFIX="@prefix@" \
          TALER_CONFIG_FILE="bank-check.conf" \
+         PYTHONPATH="${PYTHONPATH_APPEND}:${PYTHONPATH}" \
          && python3 -m django test --no-input talerbank.app.tests
        @printf ${FMT} ${SEPARATOR} \
            "Testing against non existent config file"
        @export DJANGO_SETTINGS_MODULE="talerbank.settings" \
          TALER_PREFIX="@prefix@" \
          TALER_CONFIG_FILE="non-existent.conf" \
+         PYTHONPATH="${PYTHONPATH_APPEND}:${PYTHONPATH}" \
          && python3 \
            -m django test \
            --no-input talerbank.app.tests ; \
@@ -60,7 +61,8 @@ check:
            "Testing against bad db string"
        @export DJANGO_SETTINGS_MODULE="talerbank.settings" \
          TALER_PREFIX="@prefix@" \
-         export TALER_BANK_ALTDB="bad db string" \
+         TALER_BANK_ALTDB="bad db string" \
+         PYTHONPATH="${PYTHONPATH_APPEND}:${PYTHONPATH}" \
          && python3 \
            -m django test \
            --no-input \
@@ -71,6 +73,7 @@ check:
        @export DJANGO_SETTINGS_MODULE="talerbank.settings" \
          TALER_PREFIX="@prefix@" \
          TALER_CONFIG_FILE="bank-check-alt-badamount.conf" \
+         PYTHONPATH="${PYTHONPATH_APPEND}:${PYTHONPATH}" \
          && python3 \
            -m django test \
            --no-input \
@@ -81,6 +84,7 @@ check:
          DJANGO_SETTINGS_MODULE="talerbank.settings" \
          TALER_PREFIX="@prefix@" \
          TALER_CONFIG_FILE="bank-check-alt-nocurrency.conf" \
+         PYTHONPATH="${PYTHONPATH_APPEND}:${PYTHONPATH}" \
          && python3 \
            -m django test \
            --no-input \
@@ -91,15 +95,16 @@ check:
        @export DJANGO_SETTINGS_MODULE="talerbank.settings" \
          TALER_PREFIX="@prefix@" \
          TALER_BANK_ALTDB="postgres:///idontexist" \
+         PYTHONPATH="${PYTHONPATH_APPEND}:${PYTHONPATH}" \
          && python3 ./taler-bank-manage serve-uwsgi ; \
          test 4 = $$?
 
 # install into prefix
 install-exec-hook:
-       @pip3 install . --install-option="address@hidden@" \
-         @DEBIAN_PIP3_SYSTEM@
+       @pip3 install . @DEBIAN_PIP3_SYSTEM@ \
+         --target="${PYTHONPATH_APPEND}"
        @# force update when sources changed
-       @pip3 install . --install-option="address@hidden@" \
+       @pip3 install . --target="${PYTHONPATH_APPEND}" \
          @DEBIAN_PIP3_SYSTEM@ --upgrade --no-deps
 
 pylint:

-- 
To stop receiving notification emails like this one, please contact
address@hidden