From cfebae8890078317085a299c74f123dbbe4783a7 Mon Sep 17 00:00:00 2001 From: Ivo Hedtke Date: Fri, 31 Jan 2025 14:29:29 +0100 Subject: [PATCH 1/5] Update to SCIP 9.2.1 --- conanfile.py | 4 ++-- include/scippp/parameters.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conanfile.py b/conanfile.py index f6f89ca3..ce977096 100644 --- a/conanfile.py +++ b/conanfile.py @@ -67,13 +67,13 @@ def set_version(self): try: self.version = git.run("describe --tags --dirty=-d").strip() except: - self.version = "1.3.0-alpha" + self.version = "1.3.0" def layout(self): cmake_layout(self) def requirements(self): - self.requires("scip/9.2.0", transitive_headers=True) + self.requires("scip/9.2.1", transitive_headers=True) if self.options.with_tests: self.requires("boost/[>=1.84.0 <2]") # required only for tests diff --git a/include/scippp/parameters.hpp b/include/scippp/parameters.hpp index f356a074..3d5ee90a 100644 --- a/include/scippp/parameters.hpp +++ b/include/scippp/parameters.hpp @@ -1,7 +1,7 @@ #pragma once // This file is automatically generated using gen_constexpr_parameters from the utils -// updated for SCIP 9.2.0 +// updated for SCIP 9.2.1 #include "scippp/param.hpp" #undef INFINITY From 13ad9981c882e04796286895958b97faa1760012 Mon Sep 17 00:00:00 2001 From: Ivo Hedtke Date: Fri, 31 Jan 2025 14:33:55 +0100 Subject: [PATCH 2/5] Update changelog --- changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index ce6c5a10..b2d7fb12 100644 --- a/changelog.md +++ b/changelog.md @@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed -- [PR27](https://github.com/scipopt/SCIPpp/pull/27) Update to SCIP 9.2.0. +- [PR37](https://github.com/scipopt/SCIPpp/pull/37) Update to SCIP 9.2.1. ## Added From 12b45636cd73a90fc999e230c223ace5770c8250 Mon Sep 17 00:00:00 2001 From: Ivo Hedtke Date: Fri, 31 Jan 2025 14:36:10 +0100 Subject: [PATCH 3/5] Use SCIP 9.2.1 in CI --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9757fc50..025f78ad 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -71,9 +71,9 @@ jobs: boost_version: 1.84.0 - name: Install SCIP run: | - wget https://github.com/scipopt/scip/releases/download/v920/SCIPOptSuite-9.2.0-Linux-ubuntu22.sh - chmod +x SCIPOptSuite-9.2.0-Linux-ubuntu22.sh - ./SCIPOptSuite-9.2.0-Linux-ubuntu22.sh --skip-license + wget https://github.com/scipopt/scip/releases/download/v921/SCIPOptSuite-9.2.1-Linux-ubuntu22.sh + chmod +x SCIPOptSuite-9.2.1-Linux-ubuntu22.sh + ./SCIPOptSuite-9.2.1-Linux-ubuntu22.sh --skip-license - name: Build SCIP++ run: | CMAKE_PREFIX_PATH=./lib/cmake/scip:./boost/boost/lib/cmake/Boost-1.84.0 cmake -DBUILD_TESTS=ON . From 2d76d6a7888aabe7dbc31c64a5f1886962469ce2 Mon Sep 17 00:00:00 2001 From: Ivo Hedtke Date: Wed, 8 Oct 2025 11:23:20 +0200 Subject: [PATCH 4/5] Update to SCIP 9.2.3 --- .github/workflows/main.yml | 6 +++--- changelog.md | 2 +- conanfile.py | 2 +- include/scippp/parameters.hpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 025f78ad..1fc003fc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -71,9 +71,9 @@ jobs: boost_version: 1.84.0 - name: Install SCIP run: | - wget https://github.com/scipopt/scip/releases/download/v921/SCIPOptSuite-9.2.1-Linux-ubuntu22.sh - chmod +x SCIPOptSuite-9.2.1-Linux-ubuntu22.sh - ./SCIPOptSuite-9.2.1-Linux-ubuntu22.sh --skip-license + wget https://github.com/scipopt/scip/releases/download/v923/SCIPOptSuite-9.2.3-Linux-ubuntu22.sh + chmod +x SCIPOptSuite-9.2.3-Linux-ubuntu22.sh + ./SCIPOptSuite-9.2.3-Linux-ubuntu22.sh --skip-license - name: Build SCIP++ run: | CMAKE_PREFIX_PATH=./lib/cmake/scip:./boost/boost/lib/cmake/Boost-1.84.0 cmake -DBUILD_TESTS=ON . diff --git a/changelog.md b/changelog.md index b2d7fb12..be8b76fb 100644 --- a/changelog.md +++ b/changelog.md @@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed -- [PR37](https://github.com/scipopt/SCIPpp/pull/37) Update to SCIP 9.2.1. +- [PR37](https://github.com/scipopt/SCIPpp/pull/37) Update to SCIP 9.2.3. ## Added diff --git a/conanfile.py b/conanfile.py index ce977096..b76c0e38 100644 --- a/conanfile.py +++ b/conanfile.py @@ -73,7 +73,7 @@ def layout(self): cmake_layout(self) def requirements(self): - self.requires("scip/9.2.1", transitive_headers=True) + self.requires("scip/9.2.3", transitive_headers=True) if self.options.with_tests: self.requires("boost/[>=1.84.0 <2]") # required only for tests diff --git a/include/scippp/parameters.hpp b/include/scippp/parameters.hpp index 3d5ee90a..62e1d721 100644 --- a/include/scippp/parameters.hpp +++ b/include/scippp/parameters.hpp @@ -1,7 +1,7 @@ #pragma once // This file is automatically generated using gen_constexpr_parameters from the utils -// updated for SCIP 9.2.1 +// updated for SCIP 9.2.3 #include "scippp/param.hpp" #undef INFINITY From b8da63fc45cd2aef4e7a19d33851cf875d04090e Mon Sep 17 00:00:00 2001 From: Ivo Hedtke Date: Wed, 8 Oct 2025 12:29:32 +0200 Subject: [PATCH 5/5] Prep release v1.3.0 --- changelog.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index be8b76fb..da04a7a7 100644 --- a/changelog.md +++ b/changelog.md @@ -4,6 +4,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] - [Doc:Unreleased] +## [1.3.0] - 2025-10-08 + ### Changed - [PR37](https://github.com/scipopt/SCIPpp/pull/37) Update to SCIP 9.2.3. @@ -84,7 +86,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 Initial release [Doc:Unreleased]: https://scipopt.github.io/SCIPpp/ -[Unreleased]: https://github.com/scipopt/SCIPpp/compare/1.2.0...main +[Unreleased]: https://github.com/scipopt/SCIPpp/compare/1.3.0...main +[1.3.0]: https://github.com/scipopt/SCIPpp/releases/tag/1.3.0 [1.2.0]: https://github.com/scipopt/SCIPpp/releases/tag/1.2.0 [1.1.0]: https://github.com/scipopt/SCIPpp/releases/tag/1.1.0 [1.0.2]: https://github.com/scipopt/SCIPpp/releases/tag/1.0.2