[GNUnet-SVN] [taler-bank] branch master updated (f5099e8 -> 169c419)

[gnunet]

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

ng0 pushed a change to branch master
in repository bank.

    from f5099e8  Revert "Attempt to detect more valid pip executables."
     new b71b064  Attempt to detect more valid pip executables. Tested with 
pip3.7
     new 169c419  configure: Use python module loading for checking for the 
various python modules we use.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 configure.ac | 39 ++++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/configure.ac b/configure.ac
index d70c52a..3a92cde 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,26 +27,26 @@ PC_PYTHON_CHECK_HEADERS([pyheaders=1])
 # Get Python version
 PC_PYTHON_CHECK_VERSION()
 
-#
-# Check for pip3
-#
-
-AC_MSG_CHECKING([pip3])
-pip3 --version >/dev/null
-if test $? -ne 0;
-  then
-  AC_MSG_ERROR([Please install pip3>=6.0])
-fi
+# Get python executable name
+m4_define_default([_AM_PYTHON_INTERPRETER_LIST],[python3 python3.4 python3.5 
python3.6 python3.7 python])
+AM_PATH_PYTHON([3.4],, [:])
+AC_SUBST([PYTHON])
+AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
 
-PIP_VERSION=$(pip3 --version | $AWK '{ print $2 }')
-
-AC_MSG_RESULT([$PIP_VERSION])
+#
+# Check for pip3.
+# Since it is either pip3 or pip[3.4,3.5,3.6,3.7],
+# we check using python module loading.
+PIP_EXE="$PYTHON -m pip"
+PIP_VERSION=$($PIP_EXE -V | grep -v "No module named" | tr -d '\n' | $AWK '{ 
print $2 }')
+AC_MSG_RESULT([pip3 version: $PIP_VERSION])
 
 AX_COMPARE_VERSION([$PIP_VERSION],[lt],[6.0], [AC_MSG_ERROR([Please install 
pip3>=6.0])])
 
 # On Debian systems, we may need to pass "--system" to pip3 to get
 # to the desired installation target directory
-pip3 install --help | grep '\-\-system' >> /dev/null
+AC_MSG_CHECKING([for pip3 --system])
+$PIP_EXE install --help | grep '\-\-system' >> /dev/null
 if test $? -ne 0;
 then
    DEBIAN_PIP3_SYSTEM=""
@@ -85,11 +85,16 @@ fi
 # Check for pylint
 #
 
-AC_MSG_CHECKING([pip3])
-pylint --version >/dev/null
+PYLINT_EXE="$PYTHON -m pylint --version"
+AC_MSG_CHECKING([for pylint])
+# If module load does not return 'No module named', we have test == 0.
+# This implies having a grep implementation which supports the -v
+# switch to be 'invert-match' (select non-matching lines), which the
+# standard implementations support.
+$PYLINT_EXE | grep -v "No module named" >/dev/null
 if test $? -ne 0;
   then
-  AC_MSG_NOTICE([WARNING: pylint NOT found.])
+  AC_MSG_WARN([pylint NOT found.])
 else
   AC_MSG_NOTICE([NOTICE: pylint found, make sure plugin 'pylint-django' is 
installed.])
 fi

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