[sagemath] 06/06: Add new dependencies to pruner and debian/control: backports_ssl_match_hostname, certifi, jsonschema, mathjax
Tobias Hansen
thansen at moszumanska.debian.org
Sun Mar 8 17:41:02 UTC 2015
This is an automated email from the git hooks/post-receive script.
thansen pushed a commit to branch master
in repository sagemath.
commit 03aca07d8a93c09b7689fd64346964519469af35
Author: Tobias Hansen <tobias.han at gmx.de>
Date: Sun Mar 8 17:20:30 2015 +0000
Add new dependencies to pruner and debian/control:
backports_ssl_match_hostname, certifi, jsonschema, mathjax
Remove old dependency: sqlalchemy
---
debian/control | 4 ++-
debian/pruner/configure.ac | 31 +++++++++++++++++------
debian/pruner/m4/python_module.m4 | 52 +++++++++++++++++++++++++++++++++++++++
debian/pruner/pruner.py.in | 5 +++-
4 files changed, 82 insertions(+), 10 deletions(-)
diff --git a/debian/control b/debian/control
index 0c06cc0..6d669b5 100644
--- a/debian/control
+++ b/debian/control
@@ -44,6 +44,7 @@ Build-Depends:
libgpg-error-dev,
libgsl0-dev,
libiml-dev,
+ libjs-mathjax,
liblapack-dev,
liblfunction-dev,
liblinboxsage-dev (>= 1.3.2),
@@ -73,11 +74,13 @@ Build-Depends:
pari-galdata,
pari-seadata,
python2.7-dev,
+ python-backports.ssl-match-hostname,
python-crypto,
python-cvxopt,
python-docutils,
python-gd,
python-gnutls,
+ python-jsonschema,
python-matplotlib,
python-moinmoin,
python-mpmath,
@@ -91,7 +94,6 @@ Build-Depends:
python-scipy,
python-setuptools,
python-sphinx,
- python-sqlalchemy,
python-sympy,
python-tornado,
python-twisted,
diff --git a/debian/pruner/configure.ac b/debian/pruner/configure.ac
index 262bb39..a84f106 100644
--- a/debian/pruner/configure.ac
+++ b/debian/pruner/configure.ac
@@ -14,6 +14,14 @@ PKG_PROG_PKG_CONFIG
AC_CHECK_HEADER(atlas/clapack.h, HAS_ATLAS="True", HAS_ATLAS="False")
AC_SUBST(HAS_ATLAS)
+AC_CHECK_PYTHON_MODULE_NAMESPACE(ssl_match_hostname, backports)
+if test "x${PYTHON_ssl_match_hostname}" = "x1"; then
+ HAS_BACKPORTS_SSL_MATCH_HOSTNAME="True"
+else
+ HAS_BACKPORTS_SSL_MATCH_HOSTNAME="False"
+fi
+AC_SUBST(HAS_BACKPORTS_SSL_MATCH_HOSTNAME)
+
AC_CHECK_HEADER(gc.h, HAS_BOEHM_GC="True", HAS_BOEHM_GC="False")
AC_SUBST(HAS_BOEHM_GC)
@@ -28,6 +36,10 @@ AC_SUBST(HAS_BZIP2)
HAS_CDDLIB="False"
AC_SUBST(HAS_CDDLIB)
+# FIXME(certifi): Let's assume certifi is not used for now.
+HAS_CERTIFI="True"
+AC_SUBST(HAS_CERTIFI)
+
# FIXME(cephes): we shouldn't need it
HAS_CEPHES="True"
AC_SUBST(HAS_CEPHES)
@@ -169,6 +181,14 @@ AC_SUBST(HAS_JINJA2)
HAS_JMOL="False"
AC_SUBST(HAS_JMOL)
+AC_CHECK_PYTHON_MODULE(jsonschema)
+if test "x${PYTHON_jsonschema}" = "x1"; then
+ HAS_JSONSCHEMA="True"
+else
+ HAS_JSONSCHEMA="False"
+fi
+AC_SUBST(HAS_JSONSCHEMA)
+
AC_LANG_PUSH([C++])
AC_CHECK_HEADER(Lfunction/L.h, HAS_LCALC="True", HAS_LCALC="False")
AC_LANG_POP([C++])
@@ -206,6 +226,9 @@ AC_CHECK_HEADERS(m4rie/m4rie.h, HAS_M4RIE="True", HAS_M4RIE="False")
AC_LANG_POP([C++])
AC_SUBST(HAS_M4RIE)
+AC_CHECK_FILE(/usr/share/javascript/mathjax/MathJax.js, HAS_MATHJAX="True", HAS_MATHJAX="False")
+AC_SUBST(HAS_MATHJAX)
+
AC_CHECK_PYTHON_MODULE(matplotlib)
if test "x${PYTHON_matplotlib}" = "x1"; then
HAS_MATPLOTLIB="True"
@@ -433,14 +456,6 @@ else
fi
AC_SUBST(HAS_SPHINX)
-AC_CHECK_PYTHON_MODULE(sqlalchemy)
-if test "x${PYTHON_sqlalchemy}" = "x1"; then
- HAS_SQLALCHEMY="True"
-else
- HAS_SQLALCHEMY="False"
-fi
-AC_SUBST(HAS_SQLALCHEMY)
-
AC_CHECK_HEADERS(sqlite3.h, HAS_SQLITE="True", HAS_SQLITE="False")
AC_SUBST(HAS_SQLITE)
diff --git a/debian/pruner/m4/python_module.m4 b/debian/pruner/m4/python_module.m4
index 28b82dc..791895d 100644
--- a/debian/pruner/m4/python_module.m4
+++ b/debian/pruner/m4/python_module.m4
@@ -59,3 +59,55 @@ AC_DEFUN([AC_CHECK_PYTHON_MODULE],[
AC_SUBST([PYTHON_]MODULE_NAME)
fi
])
+
+AC_DEFUN([AC_CHECK_PYTHON_MODULE_NAMESPACE],[
+ # AC_CHECK_PYTHON_MODULE(MODULE_NAME, NAMESPACE [,VERSION_VARIABLE])
+
+ # the python module name
+ MODULE_NAME=$1
+ # the namespace
+ NAMESPACE=$2
+ # the python variable that contains the module's version
+ # If this is not set the version will not be retrieved from the module.
+ # Example: __version__.
+ VERSION_VARIABLE=$1.$3
+
+ # check for the python binary defined in $PYTHON
+ # fall back to "python"
+ if test -z $PYTHON;
+ then
+ PYTHON="python"
+ fi
+
+ AC_MSG_CHECKING(for python module $MODULE_NAME)
+
+ if test -z "$3"
+ then
+ $PYTHON -c "from $NAMESPACE import $MODULE_NAME" 2>/dev/null
+ if test $? -eq 0
+ then
+ eval PYTHON_${MODULE_NAME}=1
+ AC_MSG_RESULT(found)
+ else
+ eval PYTHON_${MODULE_NAME}=0
+ AC_MSG_RESULT(not found)
+ fi
+ AC_SUBST([PYTHON_]MODULE_NAME)
+ else
+ VERSION=`$PYTHON -c "from $NAMESPACE import $MODULE_NAME; print $VERSION_VARIABLE" 2>/dev/null`
+ if test $? -eq 0
+ then
+ eval PYTHON_${MODULE_NAME}_VERSION=$VERSION
+ eval PYTHON_${MODULE_NAME}=1
+
+ AC_MSG_RESULT([found ($VERSION)])
+ else
+ eval PYTHON_${MODULE_NAME}=0
+ eval PYTHON_${MODULE_NAME}_VERSION=0
+
+ AC_MSG_RESULT(not found)
+ fi
+ AC_SUBST([PYTHON_]MODULE_NAME_VERSION)
+ AC_SUBST([PYTHON_]MODULE_NAME)
+ fi
+])
diff --git a/debian/pruner/pruner.py.in b/debian/pruner/pruner.py.in
index a3453b7..bdf7925 100644
--- a/debian/pruner/pruner.py.in
+++ b/debian/pruner/pruner.py.in
@@ -28,11 +28,13 @@ mkdir_if_needed ('@SAGE_ROOT@/local/include')
dico = {
'atlas': @HAS_ATLAS@,
+ 'backports_ssl_match_hostname': @HAS_BACKPORTS_SSL_MATCH_HOSTNAME@,
'boehm_gc': @HAS_BOEHM_GC@,
'boost_cropped': @HAS_BOOST@,
'bzip2': @HAS_BZIP2@,
'cddlib': @HAS_CDDLIB@,
'cephes': @HAS_CEPHES@,
+ 'certifi': @HAS_CERTIFI@,
'cliquer': @HAS_CLIQUER@,
'combinatorial_designs': @HAS_COMBINATORIAL_DESIGNS@,
'conway_polynomials': @HAS_CONWAY_POLYNOMIALS@,
@@ -65,6 +67,7 @@ dico = {
'ipython': @HAS_IPYTHON@,
'jinja2': @HAS_JINJA2@,
'jmol': @HAS_JMOL@,
+ 'jsonschema': @HAS_JSONSCHEMA@,
'lcalc': @HAS_LCALC@,
'libgap': @HAS_LIBGAP@,
'libpng': @HAS_LIBPNG@,
@@ -72,6 +75,7 @@ dico = {
'lrcalc': @HAS_LRCALC@,
'm4ri': @HAS_M4RI@,
'm4rie': @HAS_M4RIE@,
+ 'mathjax': @HAS_MATHJAX@,
'matplotlib': @HAS_MATPLOTLIB@,
'maxima': @HAS_MAXIMA@,
'mpc': @HAS_MPC@,
@@ -117,7 +121,6 @@ dico = {
'singular': @HAS_SINGULAR@,
'six': @HAS_SIX@,
'sphinx': @HAS_SPHINX@,
- #'sqlalchemy': @HAS_SQLALCHEMY@,
'sqlite': @HAS_SQLITE@,
'symmetrica': @HAS_SYMMETRICA@,
'sympow': @HAS_SYMPOW@,
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagemath.git
More information about the debian-science-commits
mailing list