Use script package 'check_dependencies' to install tox, pytest, etc.

sagemath · Jan 13, 2020 · 623cb21 · 623cb21
1 parent b8f53f7
commit 623cb21
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 0 deletions.
diff --git a/build/pkgs/check_dependencies/check-requirements.txt b/build/pkgs/check_dependencies/check-requirements.txt
@@ -0,0 +1,5 @@
+mock
+tox
+pytest
+nose
+pbr
diff --git a/build/pkgs/check_dependencies/spkg-install b/build/pkgs/check_dependencies/spkg-install
@@ -0,0 +1,7 @@
+#! /bin/sh
+# Because 'script' packages do not go through sage-spkg, SAGE_CHECK is not defined.
+# Working dir is SAGE_ROOT.
+echo "$0: SAGE_CHECK_PACKAGES=${SAGE_CHECK_PACKAGES} SAGE_CHECK=${SAGE_CHECK}"
+if [ "$SAGE_CHECK" == "yes" ]; then
+    sage-python23 -m pip install -r build/pkgs/check_dependencies/check-requirements.txt
+fi
diff --git a/build/pkgs/check_dependencies/type b/build/pkgs/check_dependencies/type
@@ -0,0 +1 @@
+script
diff --git a/build/pkgs/pygments/spkg-check b/build/pkgs/pygments/spkg-check
@@ -0,0 +1 @@
+py.test
diff --git a/src/bin/sage b/src/bin/sage
@@ -936,6 +936,12 @@ install() {
     do
         # Check for options
         case "$PKG" in
+            -c|--check)
+                # This duplicates option handling in build/bin/sage-spkg,
+                # but is needed for packages of type=script.
+                INSTALL_OPTIONS="$INSTALL_OPTIONS $PKG"
+                export SAGE_CHECK=yes
+                continue;;
             -*)
                 INSTALL_OPTIONS="$INSTALL_OPTIONS $PKG"
                 continue;;