Skip to content

Commit 3be20ec

Browse files
author
Matthias Koeppe
committed
Merge remote-tracking branch 'upstream/develop' into t/34946/sage__algebras_combinat_matroids___replace_imports_from_sage___all_for_namespace_packages
2 parents 254431c + e310936 commit 3be20ec

File tree

3 files changed

+2
-41
lines changed

3 files changed

+2
-41
lines changed

.github/workflows/ci-linux.yml

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -162,41 +162,3 @@ jobs:
162162
["maximal"]
163163
docker_targets: "with-targets-optional"
164164
targets_optional: '$(echo $(export PATH=build/bin:$PATH && sage-package list :experimental: --has-file "spkg-install.in|spkg-install|requirements.txt" --no-file "huge|has_nonfree_dependencies" | grep -v sagemath_doc | grep ^[p-z]))'
165-
166-
local-ubuntu:
167-
168-
runs-on: ubuntu-latest
169-
strategy:
170-
fail-fast: false
171-
max-parallel: 1
172-
matrix:
173-
tox_system_factor: [conda-forge-ubuntu]
174-
tox_packages_factor: [minimal, standard, environment, environment-optional]
175-
env:
176-
TOX_ENV: local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
177-
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
178-
steps:
179-
- uses: actions/checkout@v3
180-
- name: Install test prerequisites
181-
run: |
182-
sudo DEBIAN_FRONTEND=noninteractive apt-get update
183-
sudo DEBIAN_FRONTEND=noninteractive apt-get install tox
184-
- name: Build and test with tox
185-
# We use a high parallelization on purpose in order to catch possible parallelization bugs in the build scripts.
186-
# For doctesting, we use a lower parallelization to avoid timeouts.
187-
run: |
188-
MAKE="make -j12" tox -e $TOX_ENV -- SAGE_NUM_THREADS=4 $TARGETS
189-
- name: Prepare logs artifact
190-
run: |
191-
mkdir -p "artifacts/$LOGS_ARTIFACT_NAME"; cp -r .tox/*/log "artifacts/$LOGS_ARTIFACT_NAME"
192-
if: always()
193-
- uses: actions/upload-artifact@v3
194-
with:
195-
path: artifacts
196-
name: ${{ env.LOGS_ARTIFACT_NAME }}
197-
if: always()
198-
- name: Print out logs for immediate inspection
199-
# and markup the output with GitHub Actions logging commands
200-
run: |
201-
.github/workflows/scan-logs.sh "artifacts/$LOGS_ARTIFACT_NAME"
202-
if: always()

src/sage/schemes/toric/sheaf/klyachko.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
(0, 0, 18, 16, 1)
2727
sage: Gtilde = G_sum.random_deformation()
2828
sage: V = Gtilde.wedge(2) * K # long time
29-
sage: V.cohomology(dim=True, weight=(0,0,0,0)) # long time
29+
sage: V.cohomology(dim=True, weight=(0,0,0,0)) # long time # random failure (see #32773)
3030
(0, 0, 3, 0, 0)
3131
3232
REFERENCES:
@@ -948,7 +948,7 @@ def random_deformation(self, epsilon=None):
948948
sage: V.cohomology(dim=True, weight=(0,))
949949
(1, 0)
950950
sage: Vtilde = V.random_deformation()
951-
sage: Vtilde.cohomology(dim=True, weight=(0,))
951+
sage: Vtilde.cohomology(dim=True, weight=(0,)) # random failure (see #32773)
952952
(1, 0)
953953
"""
954954
filt = self._filt.random_deformation(epsilon)

tox.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,6 @@ setenv =
272272
fedora-31: BASE_TAG=31
273273
fedora-32: BASE_TAG=32
274274
fedora-33: BASE_TAG=33
275-
fedora-33: IGNORE_MISSING_SYSTEM_PACKAGES=no
276275
fedora-34: BASE_TAG=34
277276
fedora-34: IGNORE_MISSING_SYSTEM_PACKAGES=no
278277
fedora-35: BASE_TAG=35

0 commit comments

Comments
 (0)