From 959f56e773dc0922ee927f720ac459d3b7809b89 Mon Sep 17 00:00:00 2001 From: toge Date: Thu, 1 Jun 2023 00:30:10 +0900 Subject: [PATCH 1/5] glaze: add version 1.2.4 --- recipes/glaze/all/conandata.yml | 3 +++ recipes/glaze/all/conanfile.py | 4 ++-- recipes/glaze/config.yml | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/recipes/glaze/all/conandata.yml b/recipes/glaze/all/conandata.yml index 165fceb314bfd..b428c8ae44192 100644 --- a/recipes/glaze/all/conandata.yml +++ b/recipes/glaze/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "1.2.4": + url: "https://github.com/stephenberry/glaze/archive/v1.2.4.tar.gz" + sha256: "5ad95e6f15c0ad73bfb38c612276ba6f461672c5711dc3652d21b3dce69c92b8" "1.2.3": url: "https://github.com/stephenberry/glaze/archive/v1.2.3.tar.gz" sha256: "003cd3922795319253f080b328dd5c957bc8f446cc2a8145324c2748f4acf10f" diff --git a/recipes/glaze/all/conanfile.py b/recipes/glaze/all/conanfile.py index 7f723fc2acd6a..ebeac4a36cf36 100644 --- a/recipes/glaze/all/conanfile.py +++ b/recipes/glaze/all/conanfile.py @@ -40,11 +40,11 @@ def layout(self): def requirements(self): if Version(self.version) < "0.2.4": - self.requires("fmt/9.1.0") + self.requires("fmt/10.0.0") self.requires("frozen/1.1.1") self.requires("nanorange/cci.20200706") if Version(self.version) < "0.2.3": - self.requires("fast_float/4.0.0") + self.requires("fast_float/5.0.0") if "0.1.5" <= Version(self.version) < "0.2.3": self.requires("dragonbox/1.1.3") diff --git a/recipes/glaze/config.yml b/recipes/glaze/config.yml index 779e5b74adbe2..7b03a02c236c7 100644 --- a/recipes/glaze/config.yml +++ b/recipes/glaze/config.yml @@ -1,4 +1,6 @@ versions: + "1.2.4": + folder: all "1.2.3": folder: all "1.2.2": From 30e1846478b049dce3cc81effac9de95876351b0 Mon Sep 17 00:00:00 2001 From: toge Date: Thu, 1 Jun 2023 17:45:10 +0900 Subject: [PATCH 2/5] drop support apple-clang for glaze<1.0 --- recipes/glaze/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/glaze/all/conanfile.py b/recipes/glaze/all/conanfile.py index ebeac4a36cf36..f88c602bea074 100644 --- a/recipes/glaze/all/conanfile.py +++ b/recipes/glaze/all/conanfile.py @@ -28,7 +28,7 @@ def _compilers_minimum_version(self): "Visual Studio": "16", "msvc": "192", "gcc": "12", - "clang": "12" if Version(self.version) > "1.0.0" else "13", + "clang": "12" if Version(self.version) > "1.0.0" else "14", "apple-clang": "13.1", } From ceafb52cef21b529629c1f575695da80729fca82 Mon Sep 17 00:00:00 2001 From: toge Date: Thu, 1 Jun 2023 23:42:16 +0900 Subject: [PATCH 3/5] fix validateion --- recipes/glaze/all/conanfile.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/recipes/glaze/all/conanfile.py b/recipes/glaze/all/conanfile.py index f88c602bea074..9a15ceeefa1ed 100644 --- a/recipes/glaze/all/conanfile.py +++ b/recipes/glaze/all/conanfile.py @@ -28,7 +28,7 @@ def _compilers_minimum_version(self): "Visual Studio": "16", "msvc": "192", "gcc": "12", - "clang": "12" if Version(self.version) > "1.0.0" else "14", + "clang": "12" if Version(self.version) > "1.0.0" else "13", "apple-clang": "13.1", } @@ -55,16 +55,10 @@ def validate(self): if self.settings.get_safe("compiler.cppstd"): check_min_cppstd(self, self._minimum_cpp_standard) - def loose_lt_semver(v1, v2): - lv1 = [int(v) for v in v1.split(".")] - lv2 = [int(v) for v in v2.split(".")] - min_length = min(len(lv1), len(lv2)) - return lv1[:min_length] < lv2[:min_length] - minimum_version = self._compilers_minimum_version.get(str(self.settings.compiler), False) - if minimum_version and loose_lt_semver(str(self.settings.compiler.version), minimum_version): + if minimum_version and Version(self.settings.compiler.version) < minimum_version: raise ConanInvalidConfiguration( - f"{self.name} {self.version} requires C++{self._minimum_cpp_standard}, which your compiler does not support.", + f"{self.ref} requires C++{self._min_cppstd}, which your compiler does not support." ) def source(self): From eb61825f09656a7af04250b2b3655220b4c86c7a Mon Sep 17 00:00:00 2001 From: toge Date: Fri, 2 Jun 2023 00:16:41 +0900 Subject: [PATCH 4/5] rename _min_cppstd --- recipes/glaze/all/conanfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/glaze/all/conanfile.py b/recipes/glaze/all/conanfile.py index 9a15ceeefa1ed..cf738ce161e1d 100644 --- a/recipes/glaze/all/conanfile.py +++ b/recipes/glaze/all/conanfile.py @@ -19,7 +19,7 @@ class GlazeConan(ConanFile): settings = "os", "arch", "compiler", "build_type" @property - def _minimum_cpp_standard(self): + def _min_cppstd(self): return 20 @property @@ -53,7 +53,7 @@ def package_id(self): def validate(self): if self.settings.get_safe("compiler.cppstd"): - check_min_cppstd(self, self._minimum_cpp_standard) + check_min_cppstd(self, self._min_cppstd) minimum_version = self._compilers_minimum_version.get(str(self.settings.compiler), False) if minimum_version and Version(self.settings.compiler.version) < minimum_version: From 5a42768f513f35982864211ab6680770607fdf40 Mon Sep 17 00:00:00 2001 From: toge Date: Wed, 7 Jun 2023 16:13:34 +0900 Subject: [PATCH 5/5] update 1.2.5 --- recipes/glaze/all/conandata.yml | 6 +++--- recipes/glaze/config.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/glaze/all/conandata.yml b/recipes/glaze/all/conandata.yml index b428c8ae44192..6b8554764d505 100644 --- a/recipes/glaze/all/conandata.yml +++ b/recipes/glaze/all/conandata.yml @@ -1,7 +1,7 @@ sources: - "1.2.4": - url: "https://github.com/stephenberry/glaze/archive/v1.2.4.tar.gz" - sha256: "5ad95e6f15c0ad73bfb38c612276ba6f461672c5711dc3652d21b3dce69c92b8" + "1.2.5": + url: "https://github.com/stephenberry/glaze/archive/v1.2.5.tar.gz" + sha256: "bc3ff0b24c8c71557e7aabc5a2bfedd51acea92548c208c3a51815848d2b2c5a" "1.2.3": url: "https://github.com/stephenberry/glaze/archive/v1.2.3.tar.gz" sha256: "003cd3922795319253f080b328dd5c957bc8f446cc2a8145324c2748f4acf10f" diff --git a/recipes/glaze/config.yml b/recipes/glaze/config.yml index 7b03a02c236c7..0e6c10eefcb35 100644 --- a/recipes/glaze/config.yml +++ b/recipes/glaze/config.yml @@ -1,5 +1,5 @@ versions: - "1.2.4": + "1.2.5": folder: all "1.2.3": folder: all