Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
119 commits
Select commit Hold shift + click to select a range
6eacfa1
Initial commit
lasote Dec 1, 2015
c7862b5
Python 3 support and CI
lasote Mar 18, 2016
1d8e4b1
Versin compare fix
lasote Mar 21, 2016
ab3e41e
Reverted version check
lasote Mar 21, 2016
faca806
Fixed output testing issues and improved version detection
lasote Mar 21, 2016
190a028
Merge branch 'release/0.9.0'
lasote May 3, 2016
fa1f2a7
capturing traceback for offending line report
memsharded Aug 27, 2016
961939a
Merge branch 'release/0.11.1'
lasote Aug 31, 2016
9d22c14
Merge tag '0.11.1' into develop
lasote Aug 31, 2016
0056863
Merge branch 'release/0.12.0'
lasote Sep 13, 2016
65448f9
Merge tag '0.12.0' into develop
lasote Sep 13, 2016
b2ec8ae
fixing migrations with no settings.yml. Fixing Version parsing and co…
memsharded Sep 14, 2016
d529ee1
Better version compare in order to allow a 0.12.1-dev0 client operate…
lasote Sep 20, 2016
9d4d9fd
Merge branch 'release/0.13.0'
lasote Oct 3, 2016
705af5c
Merge tag '0.13.0' into develop
lasote Oct 3, 2016
3467748
Feature/better upload (#795)
lasote Dec 27, 2016
43f96b3
Moved retry to uploader_downloader, removed UploadException, changed …
lasote Jan 3, 2017
5296756
Release/0.18 better retries and exception handling (#828)
lasote Jan 3, 2017
175d4a3
Merge branch 'release/0.18' of github.com:conan-io/conan into release…
lasote Jan 3, 2017
00c14a3
Merge tag '0.18.0' into develop
lasote Jan 3, 2017
d58ef71
Feature/improve semver (#927)
memsharded Jan 31, 2017
c46f3b4
Merge branch 'release/0.19.0'
lasote Jan 31, 2017
f5e5471
Merge tag '0.19.0' into develop
lasote Jan 31, 2017
c5e05b2
added new version modes, fixed string versions (#1108)
memsharded Mar 16, 2017
2395801
Merge branch 'release/0.21.0'
lasote Mar 21, 2017
eeb9764
Merge tag '0.21.0' into develop
lasote Mar 21, 2017
fb69ace
Merge branch 'release/0.22.0'
lasote Apr 18, 2017
6e4ba95
Merge tag '0.22.0' into develop
lasote Apr 18, 2017
628c471
Feature/exception messages (#1301)
lasote May 19, 2017
d0c3fdb
Merge branch 'release/0.23.0'
lasote Jun 1, 2017
ec59d46
minor style fixes (#1698)
memsharded Sep 4, 2017
52d16cc
Feature/full traceback (#1703)
lasote Sep 11, 2017
8e54ad0
Better catches
lasote Jan 29, 2018
ce6b5b2
improved messages, fix manifest exceptions (#2665)
memsharded Mar 27, 2018
aa3ea86
Feature/refactor get package (#2722)
memsharded Apr 16, 2018
e3aea90
Feature/improve output (#2728)
lasote Apr 23, 2018
429da79
Fix version class for greater than comparison (#2927)
danimtb May 25, 2018
636886c
Fixed build property in Version class (#3219)
danimtb Jul 16, 2018
22e143d
Add ConanInvalidConfiguration exception and handle error codes. (#3517)
jgsogo Sep 24, 2018
524251d
v2 refactor (#4512)
lasote Feb 15, 2019
d8f5b23
[CLI] Accept a PackageReference in the command 'get' (preferred) (#4494)
jgsogo Feb 18, 2019
1dd75f1
fix develop (#4560)
memsharded Feb 18, 2019
ef577a4
Fail nicely without revisions and only_v2 (#4663)
lasote Mar 6, 2019
b3c9ad7
Merge branch 'release/1.13.0'
lasote Mar 7, 2019
2bb8ca8
Merge tag '1.13.0' into develop
lasote Mar 7, 2019
560eae1
Merge branch 'release/1.14.0'
lasote Mar 28, 2019
b05f806
Merge tag '1.14.0' into develop
lasote Mar 28, 2019
20f770a
print a message for unknown errors building the API (#4869)
jgsogo Mar 31, 2019
86bd2c5
Merge branch 'release/1.14.1'
lasote Apr 1, 2019
6ad9bea
Merge tag '1.14.1' into develop
lasote Apr 1, 2019
0fbc897
Some docstrings for version class (#4274)
danimtb Apr 2, 2019
044bbe9
Merge branch 'release/1.15.0'
lasote May 6, 2019
1a18827
Merge tag '1.15.0' into develop
lasote May 6, 2019
5353291
Merge branch 'release/1.16.0'
lasote Jun 4, 2019
8dc9d51
Better ref representation (#5509)
lasote Jul 19, 2019
9d9f5cd
Optional user/channel (#5381)
lasote Jul 24, 2019
df25942
Fix print stderr on failure at `check_output` tool. (#5548)
lasote Jul 29, 2019
3a7c417
Merge branch 'release/1.18.0'
lasote Jul 30, 2019
03cac1d
Merge tag '1.18.0' into develop
lasote Jul 30, 2019
8c9fcd2
Merge branch 'release/1.19.0'
lasote Sep 30, 2019
e52842f
Merge tag '1.19.0' into develop
lasote Sep 30, 2019
9d5161d
Requirement override using build metadata (#5903)
lasote Oct 15, 2019
cd197be
Merge branch 'release/1.19.2'
lasote Oct 16, 2019
ab0fd41
Merged 1.19.2
lasote Oct 16, 2019
b2cdeac
Merge pull request #1 from conan-io/develop
nicememory Oct 21, 2019
2c5eae4
Merge branch 'release/1.20.0'
lasote Nov 4, 2019
559f576
Merge tag '1.20.0' into develop
lasote Nov 4, 2019
3629cdf
Merge pull request #6037 from nicememory/improving_error_message
memsharded Nov 7, 2019
8c675e5
Merge branch 'release/1.21.0'
lasote Dec 10, 2019
5f7d7b2
Add 'CONAN_V2_MODE' to start testing Conan v2 deprecated features (#6…
memsharded Mar 4, 2020
dab7e05
Merge branch 'release/1.23.0'
czoido Mar 10, 2020
7ec660e
Remove disabled_revisions mode from 2.0: Remove support api v1 (#8412)
czoido Feb 2, 2021
01a0e0e
Remove disabled_revisions mode from 2.0: Clean enabled_revisions (#8428)
czoido Feb 5, 2021
1720db1
Introducing ConanErrorConfiguration exception (#9268)
memsharded Jul 21, 2021
90a5097
Implement --update flows for revisions in conan cache 2.0 (#9191)
czoido Aug 30, 2021
8730046
Remove CppInfo and update to NewCppInfo (#9657)
czoido Oct 15, 2021
77c20f7
Add return code 7 (Invalid system requirements) (#9905)
n-bes Nov 2, 2021
b4aa374
merged develop
memsharded Nov 2, 2021
553c652
removing python 2 legacy (#9927)
memsharded Nov 3, 2021
f5555f8
Removed PackageReference in favor of PkgReference (#9933)
lasote Nov 3, 2021
4a81db5
some new Version improvements for build and pre-releases (#9930)
memsharded Nov 3, 2021
c769b3a
RecipeReference + Interfaces renaming and improving (#9982)
lasote Nov 8, 2021
1edbc9c
Remove legacy activation of environment (#10007)
memsharded Nov 15, 2021
83d76db
introducing new version_range model (#9970)
memsharded Nov 16, 2021
f5fd9e6
fixing version equality (#10036)
memsharded Nov 18, 2021
3c9c947
Fixing some comparisons in new Version model (#10051)
memsharded Nov 19, 2021
523433f
remove legacy Version classes, use new one (#10052)
memsharded Nov 22, 2021
6a778d3
[develop2] remove dep to node-semver (#10058)
memsharded Nov 25, 2021
eef8bf3
minor cleanings and refactors (#10135)
memsharded Dec 7, 2021
5a44eec
fix version ranges pre-releases (#10149)
memsharded Dec 9, 2021
6edc7d8
checking tilde with prerelease excluded too (#10151)
memsharded Dec 9, 2021
e251243
moving _compilers to tools.build.flags and other minor cleanings (#10…
memsharded Dec 20, 2021
4c7f417
[develop2] minor refactors and cleaning BinaryInstaller (#10577)
memsharded Feb 17, 2022
5719b0f
remove conanfile attrs improvements (#10844)
memsharded Mar 21, 2022
d49a589
fix tools.scm.Version construction from non-str (#11119)
memsharded Apr 28, 2022
e6b2509
merged develop
memsharded May 2, 2022
b61525b
removed CalledProcessError exception (#11195)
memsharded May 9, 2022
28d17d3
[develop2] Try to revert ``check_min_cppstd`` to use ``self.settings`…
memsharded Nov 18, 2022
b02d902
Add better error UX when spaces are found in required_conan_version (…
AbrilRBS Dec 12, 2022
4b7c5d3
[develop2] display tracebacks in test errors (#12928)
memsharded Jan 19, 2023
6b6add3
[bugfix] `Version` int comparison (#12934)
franramirez688 Jan 20, 2023
a471260
merged develop
memsharded Jan 20, 2023
50ed1a7
[develop2] Improve error messages for wrong methods (#12962)
memsharded Jan 24, 2023
5e5846d
[develop2] Fix MesonToolchain wrong cppstd in apple-clang (#13172)
memsharded Feb 20, 2023
e5c842f
Add ConanVersionRange class and test #101
johnmhoran Feb 23, 2023
570f4ad
Fix import formatting #101
johnmhoran Feb 23, 2023
d71d003
Change scheme from conan to conan1 #101
johnmhoran Feb 23, 2023
0c3283b
Add test and fix failing tests #101
johnmhoran Feb 23, 2023
231039b
Fix 'gitlab_scheme'-related test failures #101
johnmhoran Feb 24, 2023
f6dda4c
verbose tracebacks (#13226)
memsharded Feb 27, 2023
c3d57ce
Change references from 'conan1' to 'conan' #101
johnmhoran Mar 1, 2023
ad674bf
Restructure conan version and tests
TG1999 Mar 1, 2023
d0edd52
Reuse conan code from https://github.com/conan-io/conan
TG1999 Mar 1, 2023
308d645
Modify imports according to restructured code
TG1999 Mar 1, 2023
ce76f0e
Fix formatting errors
TG1999 Mar 1, 2023
2290ed2
Adjust conan code according to univers #101
johnmhoran Mar 1, 2023
48dc602
Use conan 2.0 as default conan version
TG1999 Mar 2, 2023
1e56074
Add .ABOUT, .NOTICE files #101
johnmhoran Mar 8, 2023
01ff53e
Add .ABOUT, .NOTICE files for Conan test files #101
johnmhoran Mar 8, 2023
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
12 changes: 12 additions & 0 deletions src/univers/version_range.py
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,11 @@ def from_native(cls, string):
return cls(constraints=constraints)


class Conan1VersionRange(NpmVersionRange):
scheme = "conan1"
version_class = versions.SemverVersion


class GemVersionRange(VersionRange):
"""
A version range implementation for Rubygems.
Expand Down Expand Up @@ -1100,6 +1105,11 @@ class MattermostVersionRange(VersionRange):
def from_gitlab_native(gitlab_scheme, string):
purl_scheme = PURL_TYPE_BY_GITLAB_SCHEME[gitlab_scheme]
vrc = RANGE_CLASS_BY_SCHEMES[purl_scheme]
supported_native_implementations = [
Conan1VersionRange,
]
if vrc in supported_native_implementations:
return vrc.from_native(string)
constraint_items = []
constraints = []
split = " "
Expand Down Expand Up @@ -1223,6 +1233,7 @@ def build_range_from_github_advisory_constraint(scheme: str, string: str):
"nginx": NginxVersionRange,
"openssl": OpensslVersionRange,
"mattermost": MattermostVersionRange,
"conan1": Conan1VersionRange,
}

PURL_TYPE_BY_GITLAB_SCHEME = {
Expand All @@ -1233,4 +1244,5 @@ def build_range_from_github_advisory_constraint(scheme: str, string: str):
"nuget": "nuget",
"pypi": "pypi",
"packagist": "composer",
"conan": "conan1",
}
Loading