Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build/pkgs: Update scip to 9, scip_sdp to 4.4, soplex to 7, papilo to 2.2, pyscipopt to 5, onetbb to 2021.11 #37494

Merged
merged 52 commits into from
Apr 27, 2024
Merged

build/pkgs: Update scip to 9, scip_sdp to 4.4, soplex to 7, papilo to 2.2, pyscipopt to 5, onetbb to 2021.11 #37494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
9a19e59
.github/workflows/macos.yml: Install tox from PyPI, not homebrew
mkoeppe Feb 3, 2024
296fc20
.github/workflows/macos.yml: Add tests on M1 runners
mkoeppe Feb 4, 2024
76720ad
.github/workflows/macos.yml: Increase SAGE_NUM_THREADS to 6
mkoeppe Feb 4, 2024
deb02bc
.github/workflows/ci-macos.yml (local-nohomebrew): Increase SAGE_NUM_…
mkoeppe Feb 4, 2024
4c3e281
.github/workflows/ci-macos.yml (local-nohomebrew): Also test on M1
mkoeppe Feb 4, 2024
214c0eb
.github/workflows/ci-macos.yml (local-nohomebrew): Add self-destruct …
mkoeppe Feb 4, 2024
fd342f6
.github/workflows/macos.yml: Add input 'timeout'
mkoeppe Feb 4, 2024
7a921b3
.github/workflows/macos.yml: Use pipx to install tox
mkoeppe Feb 4, 2024
9694cd9
.github/workflows/macos.yml: Use tox via 'pipx run'
mkoeppe Feb 4, 2024
dc13076
.github/workflows/ci-macos.yml: Set timeout for stage 1 to 4 hours
mkoeppe Feb 4, 2024
468ead3
tox.ini (local-conda): Use 'uname -m' to determine arch for installer
mkoeppe Feb 5, 2024
d6ac96b
.github/workflows/macos.yml: Remove failing test of macos-14-minimal
mkoeppe Feb 5, 2024
db2814d
build/pkgs/dsdp/spkg-install.in: Increase verbosity
mkoeppe Feb 6, 2024
69738f7
src/bin/sage-env [macOS]: Detect ld-classic when full XCode is in use
mkoeppe Feb 6, 2024
4bdc404
.github/workflows/ci-macos.yml (dist): Do not use tag to bump the ver…
mkoeppe Feb 7, 2024
d70aae0
src/bin/sage-env: Do not set the ld-classic flag when LD is set
mkoeppe Feb 7, 2024
83348a2
build/pkgs/pyscipopt: Update to 4.4.0
mkoeppe Feb 19, 2024
de6e164
build/pkgs/pyscipopt: Add https://github.com/scipopt/PySCIPOpt/pull/7…
mkoeppe Feb 19, 2024
22fdd8c
build/pkgs/pyscipopt: Fix upstream_url
mkoeppe Feb 19, 2024
c6a82b7
.github/workflows/macos.yml: Pass inputs.extra_sage_packages to tox
mkoeppe Feb 20, 2024
7f8254b
.github/workflows/ci-linux.yml: Build 'default' with free_disk_space:…
mkoeppe Feb 15, 2024
40ae78b
.github/workflows/docker.yml: Build with 'make -j9', test with SAGE_N…
mkoeppe Feb 15, 2024
081c9ee
tox.ini: Add ubuntu-noble, fedora-40, linuxmint-21.3, gentoo-python3.12
mkoeppe Feb 15, 2024
504c4cd
tox -e update_docker_platforms
mkoeppe Feb 15, 2024
b08c727
.github/workflows/build.yml: Use 4 instead of 2 processors
mkoeppe Feb 15, 2024
06116c4
.github/workflows/doc-build*.yml: Use 4 instead of 2 processors
mkoeppe Feb 15, 2024
b2d7229
tox.ini (ubuntu-noble): Set IGNORE_MISSING_SYSTEM_PACKAGES=yes
mkoeppe Feb 15, 2024
992dc4d
build/pkgs/onetbb: Update to 2021.11.0
mkoeppe Feb 28, 2024
a80bbf9
build/pkgs/papilo: Update to 2.2.0
mkoeppe Feb 28, 2024
0d444bc
build/pkgs/scip: Update to 9.0.0
mkoeppe Feb 28, 2024
407cc17
build/pkgs/papilo: Remove patches
mkoeppe Feb 28, 2024
bb38053
build/pkgs/scip: Remove patches/no_rpath.patch
mkoeppe Feb 28, 2024
6c9a352
build/pkgs/scip/dependencies: Add bliss
mkoeppe Feb 28, 2024
76ef32c
build/pkgs/scip_sdp: Update to 4.3.0
mkoeppe Feb 28, 2024
ed0aae9
build/pkgs/scip_sdp/patches: Remove
mkoeppe Feb 28, 2024
ceffe71
Merge branch 'ci_linux_2024_02' into scip_9
mkoeppe Feb 28, 2024
09d6881
Merge branch 'ci-macos-2024' into scip_9
mkoeppe Feb 28, 2024
70df645
build/pkgs/scip: Add patch from https://github.com/scipopt/SCIP-SDP/i…
mkoeppe Feb 28, 2024
9a29147
build/pkgs/soplex: Update to 7.0.0
mkoeppe Feb 28, 2024
297cb51
build/pkgs/soplex/patches/no_rpath.patch: Remove
mkoeppe Feb 28, 2024
69e083d
Merge branch 'ci_upload_stats' into scip_9
mkoeppe Mar 3, 2024
b76407e
build/pkgs/scip_sdp/spkg-install.in: Use 'ctest --rerun-failed --outp…
mkoeppe Mar 3, 2024
6df0931
Merge remote-tracking branch 'upstream/develop' into scip_9
mkoeppe Mar 3, 2024
1b95968
build/pkgs/{soplex,scip}: Re-add rebased rpath patches
mkoeppe Mar 4, 2024
afe2532
Merge branch 'pyscipopt-cython3' into scip_9
mkoeppe Mar 5, 2024
171a380
build/pkgs/pyscipopt: Update to 5.0.0
mkoeppe Mar 5, 2024
d2f7adb
build/pkgs/pyscipopt/patches/792.patch: Remove
mkoeppe Mar 5, 2024
0bd791d
Merge tag '10.3.rc2' into scip_9
mkoeppe Mar 5, 2024
961a7c4
build/pkgs/onetbb/patches/gcc13-154cc73ca4d359621202399cc0c3c91058e56…
mkoeppe Mar 6, 2024
615db23
src/sage/numerical/backends/scip_backend.pyx: Fix typo in doctest
mkoeppe Mar 6, 2024
79ea486
Merge remote-tracking branch 'upstream/develop' into scip_9
mkoeppe Apr 13, 2024
1f28d78
build/pkgs/pyscipopt/patches/792.patch: Remove
mkoeppe Apr 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build/pkgs/onetbb/checksums.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tarball=onetbb-VERSION.tar.gz
sha1=b991f5d882aba2182871cfe011614cc43b92aa3c
md5=ba4ecedc4949f673a34b35de738a72fc
cksum=211900655
sha1=740e86b703f42446ddde392b73a9db3dc0f5f4cd
md5=b301151120b08a17e98dcdda6e4f6011
cksum=3287903962
upstream_url=https://github.com/oneapi-src/oneTBB/archive/refs/tags/vVERSION.tar.gz
2 changes: 1 addition & 1 deletion build/pkgs/onetbb/package-version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2021.9.0
2021.11.0
36 changes: 0 additions & 36 deletions build/pkgs/onetbb/patches/gcc13-154cc73ca4d359621202399cc0c3c91058e56e79.patch
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions build/pkgs/papilo/checksums.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tarball=papilo-VERSION.tar.gz
sha1=85d599ac9936aa1ddf687e04273b995522909de5
md5=c41f5aa615ffc9914f8ca924947aa8cb
cksum=1535425476
sha1=069f64ff25cfb08c9b2a416d1d215bd5b907c877
md5=d58b7c991ac1c4a863de92a404409ca8
cksum=1552180280
upstream_url=https://github.com/scipopt/papilo/archive/refs/tags/vVERSION.tar.gz
2 changes: 1 addition & 1 deletion build/pkgs/papilo/package-version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.1
2.2.0
26 changes: 0 additions & 26 deletions build/pkgs/papilo/patches/0001-CMakeLists.txt-Do-not-require-boost-program_options-.patch
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions build/pkgs/papilo/patches/import_memory_multiprecision.patch
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions build/pkgs/pyscipopt/checksums.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tarball=PySCIPOpt-VERSION.tar.gz
sha1=5ae7f3d7e9d8b344ee9a4413154ae80a5ee137de
md5=32a4dced7e74a1c290b32ef0da751129
cksum=2258510906
sha1=713e32cc0ff112500c4f43487614094ece4a8bbf
md5=ee425a362744a4475228510b48781be9
cksum=1541742154
upstream_url=https://pypi.io/packages/source/p/pyscipopt/PySCIPOpt-VERSION.tar.gz
2 changes: 1 addition & 1 deletion build/pkgs/pyscipopt/package-version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.4.0
5.0.0
Loading
Loading