Skip to content
This repository was archived by the owner on Jan 30, 2023. It is now read-only.

Commit 623cb21

Browse files
author
Matthias Koeppe
committed
Use script package 'check_dependencies' to install tox, pytest, etc.
1 parent b8f53f7 commit 623cb21

File tree

5 files changed

+20
-0
lines changed

5 files changed

+20
-0
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
mock
2+
tox
3+
pytest
4+
nose
5+
pbr
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#! /bin/sh
2+
# Because 'script' packages do not go through sage-spkg, SAGE_CHECK is not defined.
3+
# Working dir is SAGE_ROOT.
4+
echo "$0: SAGE_CHECK_PACKAGES=${SAGE_CHECK_PACKAGES} SAGE_CHECK=${SAGE_CHECK}"
5+
if [ "$SAGE_CHECK" == "yes" ]; then
6+
sage-python23 -m pip install -r build/pkgs/check_dependencies/check-requirements.txt
7+
fi

build/pkgs/check_dependencies/type

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
script

build/pkgs/pygments/spkg-check

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
py.test

src/bin/sage

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -936,6 +936,12 @@ install() {
936936
do
937937
# Check for options
938938
case "$PKG" in
939+
-c|--check)
940+
# This duplicates option handling in build/bin/sage-spkg,
941+
# but is needed for packages of type=script.
942+
INSTALL_OPTIONS="$INSTALL_OPTIONS $PKG"
943+
export SAGE_CHECK=yes
944+
continue;;
939945
-*)
940946
INSTALL_OPTIONS="$INSTALL_OPTIONS $PKG"
941947
continue;;

0 commit comments

Comments
 (0)