Skip to content

Commit

Permalink
Change references from 'conan1' to 'conan' #101
Browse files Browse the repository at this point in the history
Reference: #101

Signed-off-by: John M. Horan <johnmhoran@gmail.com>
  • Loading branch information
johnmhoran committed Mar 1, 2023
1 parent 231039b commit c3d57ce
Show file tree
Hide file tree
Showing 3 changed files with 864 additions and 864 deletions.
10 changes: 5 additions & 5 deletions src/univers/version_range.py
Original file line number Diff line number Diff line change
Expand Up @@ -377,8 +377,8 @@ def from_native(cls, string):
return cls(constraints=constraints)


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


Expand Down Expand Up @@ -1106,7 +1106,7 @@ 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,
ConanVersionRange,
]
if vrc in supported_native_implementations:
return vrc.from_native(string)
Expand Down Expand Up @@ -1233,7 +1233,7 @@ def build_range_from_github_advisory_constraint(scheme: str, string: str):
"nginx": NginxVersionRange,
"openssl": OpensslVersionRange,
"mattermost": MattermostVersionRange,
"conan1": Conan1VersionRange,
"conan": ConanVersionRange,
}

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

0 comments on commit c3d57ce

Please sign in to comment.