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

Jump to bottom

Add timsort/1.2.2 and timsort/2.0.2 #4242

Merged
merged 1 commit into from
Jan 14, 2021
Merged

Add timsort/1.2.2 and timsort/2.0.2 #4242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 6 additions & 0 deletions recipes/timsort/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,15 @@ sources:
"1.2.1":
sha256: 4f32285926330c97290b102c92c4ae8c308f46f70488d383595ae5f191e1de55
url: https://github.com/timsort/cpp-TimSort/archive/v1.2.1.tar.gz
"1.2.2":
sha256: 594a5e59248accd1caa6a9e0f145d91ed9cf5bf1044d46684df1e866a534ee76
url: https://github.com/timsort/cpp-TimSort/archive/v1.2.2.tar.gz
"2.0.0":
sha256: 6cb23b0efb83e1d4f6eab58cddd35b36ca49cd927a46294575b9c0d304a2e833
url: https://github.com/timsort/cpp-TimSort/archive/v2.0.0.tar.gz
"2.0.1":
sha256: 5c7fe16ca8ead3a86691cb64c373b9ca634add6b6539254baa58f4e254e865c6
url: https://github.com/timsort/cpp-TimSort/archive/v2.0.1.tar.gz
"2.0.2":
sha256: df15ac2cea751e573979ff97966f2b3d5d9c35a819c43d9944756974e069b2d7
url: https://github.com/timsort/cpp-TimSort/archive/v2.0.2.tar.gz
4 changes: 2 additions & 2 deletions recipes/timsort/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from conans import ConanFile, tools

required_conan_version = ">=1.28.0"
required_conan_version = ">=1.32.0"

class TimsortConan(ConanFile):
name = "timsort"
Expand All @@ -18,7 +18,7 @@ class TimsortConan(ConanFile):
def _source_subfolder(self):
return "source_subfolder"

def configure(self):
def validate(self):
if self.settings.compiler.cppstd:
if tools.Version(self.version) >= "2.0.0":
tools.check_min_cppstd(self, 11)
Expand Down
4 changes: 4 additions & 0 deletions recipes/timsort/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@ versions:
folder: all
"1.2.1":
folder: all
"1.2.2":
folder: all
"2.0.0":
folder: all
"2.0.1":
folder: all
"2.0.2":
folder: all