From 856b03dc26f372f0131790d1ffadf3b445543206 Mon Sep 17 00:00:00 2001 From: Ivo Hedtke Date: Tue, 4 Jun 2024 18:18:18 +0200 Subject: [PATCH] (#24055) [scippp] add version 1.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add SCIP++ 1.2.0 * Fix version string * Move version mapping to conandata to be trimmed per version * typo --------- Co-authored-by: Rubén Rincón Blanco --- recipes/scippp/all/conandata.yml | 7 +++++++ recipes/scippp/all/conanfile.py | 2 +- recipes/scippp/config.yml | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/recipes/scippp/all/conandata.yml b/recipes/scippp/all/conandata.yml index 88b2816d64354..39c343801470f 100644 --- a/recipes/scippp/all/conandata.yml +++ b/recipes/scippp/all/conandata.yml @@ -1,7 +1,14 @@ sources: + "1.2.0": + url: "https://github.com/scipopt/SCIPpp/archive/refs/tags/1.2.0.tar.gz" + sha256: "8fa4b819734b9841eda1ec1c9266fb07144be490c3f24be46271c538ab18da61" "1.1.0": url: "https://github.com/scipopt/SCIPpp/archive/refs/tags/1.1.0.tar.gz" sha256: "808b58e8ddd873ec403c021f9255004120e58d7ec6fb4b7d99ff6f21950ff8fb" "1.0.2": url: "https://github.com/scipopt/SCIPpp/archive/refs/tags/1.0.2.tar.gz" sha256: "d51dfd0f1ca1b57619f7c82e32d5390d99d5cdaee98ae1ace99ec05a394dcee3" +scip_mapping: + "1.2.0": "9.0.1" + "1.1.0": "8.0.4" + "1.0.2": "8.0.4" diff --git a/recipes/scippp/all/conanfile.py b/recipes/scippp/all/conanfile.py index 77b8d49bdb43c..55ee8105f9224 100644 --- a/recipes/scippp/all/conanfile.py +++ b/recipes/scippp/all/conanfile.py @@ -76,7 +76,7 @@ def configure(self): def requirements(self): # see https://github.com/scipopt/SCIPpp/blob/1.0.0/conanfile.py#L25 - self.requires("scip/8.0.4", transitive_headers=True) + self.requires(f"scip/{self.conan_data['scip_mapping'][self.version]}", transitive_headers=True) def generate(self): tc = CMakeToolchain(self) diff --git a/recipes/scippp/config.yml b/recipes/scippp/config.yml index a59308932f1d8..eb9a4f6036cd3 100644 --- a/recipes/scippp/config.yml +++ b/recipes/scippp/config.yml @@ -1,4 +1,6 @@ versions: + "1.2.0": + folder: all "1.1.0": folder: all "1.0.2":