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

Commit 286b39c

Browse files
author
Matthias Koeppe
committed
Merge #31163
2 parents 7c84f31 + b485d46 commit 286b39c

File tree

12 files changed

+75
-68
lines changed

12 files changed

+75
-68
lines changed

‎.github/workflows/tox-experimental.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ jobs:
4747
TOX_ENV: docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
4848
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
4949
DOCKER_TARGETS: configured with-targets with-targets-optional
50-
TARGETS_OPTIONAL: "$( echo $(PATH=build/bin:$PATH build/bin/sage-package list :experimental: | grep -v database_stein_watkins\\$ | grep -v polytopes_db_4d | grep '^[${{ matrix.targets_pattern }}]' ) )"
50+
# Test all non-dummy experimental packages, but do not test huge packages
51+
# and do not test packages that require external software
52+
TARGETS_OPTIONAL: "$( echo $(export PATH=build/bin:$PATH && sage-package list :experimental: --has-file spkg-install.in && sage-package list :experimental: --has-file spkg-install && sage-package list :experimental: --has-file requirements.txt | grep -v ^_ | grep -v database_stein_watkins\\$ | grep -v polytopes_db_4d | grep -v cplex | grep -v gurobi | grep '^[${{ matrix.targets_pattern }}]' ) )"
5153
steps:
5254
- uses: actions/checkout@v2
5355
with:
@@ -146,7 +148,9 @@ jobs:
146148
env:
147149
TOX_ENV: local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
148150
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}-${{ matrix.os }}-xcode_${{ matrix.xcode_version_factor }}
149-
TARGETS_OPTIONAL: "$( echo $(PATH=build/bin:$PATH build/bin/sage-package list :experimental: | grep -v database_stein_watkins\\$ | grep -v polytopes_db_4d | grep '^[${{ matrix.targets_pattern }}]' ) )"
151+
# Test all non-dummy experimental packages, but do not test huge packages
152+
# and do not test packages that require external software
153+
TARGETS_OPTIONAL: "$( echo $(export PATH=build/bin:$PATH && sage-package list :experimental: --has-file spkg-install.in && sage-package list :experimental: --has-file spkg-install && sage-package list :experimental: --has-file requirements.txt | grep -v ^_ | grep -v database_stein_watkins\\$ | grep -v polytopes_db_4d | grep -v cplex | grep -v gurobi | grep '^[${{ matrix.targets_pattern }}]' ) )"
150154
steps:
151155
- uses: actions/checkout@v2
152156
- name: Select Xcode version

‎.github/workflows/tox-optional.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ jobs:
4747
TOX_ENV: docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
4848
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
4949
DOCKER_TARGETS: configured with-targets with-targets-optional
50-
# Test all optional packages, but do not test huge packages,
50+
# Test all non-dummy optional packages, but do not test huge packages
5151
# and do not test packages that require external software
52-
TARGETS_OPTIONAL: "$( echo $(PATH=build/bin:$PATH build/bin/sage-package list :optional: | grep -v database_stein_watkins\\$ | grep -v polytopes_db_4d | grep -v cplex | grep -v gurobi | grep '^[${{ matrix.targets_pattern }}]' ) )"
52+
TARGETS_OPTIONAL: "$( echo $(export PATH=build/bin:$PATH && (sage-package list :optional: --has-file spkg-install.in && sage-package list :optional: --has-file spkg-install && sage-package list :optional: --has-file requirements.txt) | grep -v ^_ | grep -v database_stein_watkins\\$ | grep -v polytopes_db_4d | grep -v cplex | grep -v gurobi | grep '^[${{ matrix.targets_pattern }}]' ) )"
5353
steps:
5454
- uses: actions/checkout@v2
5555
with:
@@ -148,9 +148,9 @@ jobs:
148148
env:
149149
TOX_ENV: local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
150150
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}-${{ matrix.os }}-xcode_${{ matrix.xcode_version_factor }}
151-
# Test all optional packages, but do not test huge packages
151+
# Test all non-dummy optional packages, but do not test huge packages
152152
# and do not test packages that require external software
153-
TARGETS_OPTIONAL: "$( echo $(PATH=build/bin:$PATH build/bin/sage-package list :optional: | grep -v database_stein_watkins\\$ | grep -v polytopes_db_4d | grep -v cplex | grep -v gurobi | grep '^[${{ matrix.targets_pattern }}]' ) )"
153+
TARGETS_OPTIONAL: "$( echo $(export PATH=build/bin:$PATH && (sage-package list :optional: --has-file spkg-install.in && sage-package list :optional: --has-file spkg-install && sage-package list :optional: --has-file requirements.txt) | grep -v ^_ | grep -v database_stein_watkins\\$ | grep -v polytopes_db_4d | grep -v cplex | grep -v gurobi | grep '^[${{ matrix.targets_pattern }}]' ) )"
154154
steps:
155155
- uses: actions/checkout@v2
156156
- name: Select Xcode version

‎bootstrap‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,13 @@ AS_VAR_SET_IF([SAGE_ENABLE_$pkgname], [], [AS_VAR_SET([SAGE_ENABLE_$pkgname], [y
9797
case "$pkgname" in
9898
_*) ;;
9999
*) spkg_configures="$spkg_configures
100-
AC_SUBST(SAGE_ENABLE_$pkgname, [if_installed])
101-
SAGE_SPKG_ENABLE([$pkgname], [$pkgtype], [$(head -n1 build/pkgs/$pkgname/SPKG.rst 2>/dev/null || echo $pkgname)])" ;;
100+
AC_SUBST(SAGE_ENABLE_$pkgname, [if_installed])"
101+
if [ -f build/pkgs/$pkgname/spkg-install -o -f build/pkgs/$pkgname/spkg-install.in ]; then
102+
# Trac #31163: Not just an optional dummy package
103+
spkg_configures="$spkg_configures
104+
SAGE_SPKG_ENABLE([$pkgname], [$pkgtype], [$(head -n1 build/pkgs/$pkgname/SPKG.rst 2>/dev/null || echo $pkgname)])"
105+
fi
106+
;;
102107
esac
103108
fi
104109
done

‎build/bin/sage-spkg-info‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ if [ $have_repology = yes ]; then
5757
systems="$systems repology"
5858
fi
5959
for system in $systems; do
60+
system_package_file="$PKG_DISTROS"/$system.txt
6061
system_packages="$(echo $(sed 's/#.*//;' $system_package_file))"
6162
case $system in
6263
debian)

‎build/make/Makefile.in‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -630,16 +630,29 @@ $$($(4))/$(SPKG_INST_RELDIR)/$(1)-$(2): $(3)
630630
$(1): $$($(4))/$(SPKG_INST_RELDIR)/$(1)-$(2)
631631

632632
$(1)-$(4)-no-deps:
633-
$(AM_V_at)cd '$$(SAGE_ROOT)/build/pkgs/$(1)' && \
633+
@if [ -x '$$(SAGE_ROOT)/build/pkgs/$(1)/spkg-install' ]; then \
634+
$(AM_V_at)cd '$$(SAGE_ROOT)/build/pkgs/$(1)' && \
634635
. '$$(SAGE_ROOT)/src/bin/sage-src-env-config' && \
635636
. '$$(SAGE_ROOT)/src/bin/sage-env-config' && \
636637
. '$$(SAGE_ROOT)/src/bin/sage-env' && \
637638
. '$$(SAGE_ROOT)/build/bin/sage-build-env-config' && \
638639
. '$$(SAGE_ROOT)/build/bin/sage-build-env' && \
639640
SAGE_SPKG_WHEELS=$$($(4))/var/lib/sage/wheels \
640641
SAGE_INST_LOCAL=$$($(4)) \
641-
sage-logger -p '$$(SAGE_ROOT)/build/pkgs/$(1)/spkg-install' '$$(SAGE_LOGS)/$(1)-$(2).log'
642-
touch "$$($(4))/$(SPKG_INST_RELDIR)/$(1)-$(2)"
642+
sage-logger -p '$$(SAGE_ROOT)/build/pkgs/$(1)/spkg-install' '$$(SAGE_LOGS)/$(1)-$(2).log' && \
643+
touch "$$($(4))/$(SPKG_INST_RELDIR)/$(1)-$(2)"; \
644+
else \
645+
echo; \
646+
echo "Error: $(1) is a dummy script package that the Sage distribution uses"; \
647+
echo "to provide information about equivalent system packages."; \
648+
echo "It cannot be installed using the Sage distribution."; \
649+
echo "Please install it manually, for example using the system packages"; \
650+
echo "recommended at the end of a run of './configure'"; \
651+
echo "See below for package-specific information."; \
652+
echo; \
653+
$$(SAGE_ROOT)/build/bin/sage-spkg-info $(1); \
654+
exit 1; \
655+
fi
643656

644657
$(1)-no-deps: $(1)-$(4)-no-deps
645658

‎build/pkgs/graphviz/spkg-install‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎build/pkgs/libxml2/spkg-install‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎build/pkgs/llvm/spkg-install‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎build/pkgs/pandoc/spkg-install‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎build/pkgs/perl_cpan_polymake_prereq/spkg-install‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)