-
Notifications
You must be signed in to change notification settings - Fork 546
py-thinc: added versions 8.1.10 and 8.3.10; and increased readability of complex dependencies #3397
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.
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
base: develop
Are you sure you want to change the base?
Changes from all commits
68a3507
5b19675
d086815
0603c29
7055660
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -16,20 +16,61 @@ class PyThinc(PythonPackage): | |||||
|
|
||||||
| license("MIT") | ||||||
|
|
||||||
| version("8.3.10", sha256="5a75109f4ee1c968fc055ce651a17cb44b23b000d9e95f04a4d047ab3cb3e34e") | ||||||
| version("8.1.10", sha256="6c4a48d7da07e044e84a68cbb9b22f32f8490995a2bab0bfc60e412d14afb991") | ||||||
| version("7.4.1", sha256="0139fa84dc9b8d88af15e648fc4ae13d899b8b5e49cb26a8f4a0604ee9ad8a9e") | ||||||
| version("7.4.0", sha256="523e9be1bfaa3ed1d03d406ce451b6b4793a9719d5b83d2ea6b3398b96bc58b8") | ||||||
|
|
||||||
| depends_on("c", type="build") # generated | ||||||
| depends_on("cxx", type="build") # generated | ||||||
|
|
||||||
| # @8.1.10 minimum python version is 3.6. Set minimum version to 3.7 due to spack missing | ||||||
| # py-contextvars and 3.6 being deprecated in spack. | ||||||
| depends_on("python@3.7:", type=("build", "run"), when="@8.1.10") | ||||||
| depends_on("python@3.10:3.14", type=("build", "run"), when="@8.3.10:") | ||||||
|
|
||||||
| depends_on("py-setuptools", type="build") | ||||||
| depends_on("py-murmurhash@0.28:1.0", type=("build", "run")) | ||||||
| depends_on("py-cymem@2.0.2:2.0", type=("build", "run")) | ||||||
| depends_on("py-preshed@1.0.1:3.0", type=("build", "run")) | ||||||
| depends_on("py-blis@0.4.0:0.4", type=("build", "run")) | ||||||
| depends_on("py-wasabi@0.0.9:1.0", type=("build", "run")) | ||||||
| depends_on("py-srsly@0.0.6:1.0", type=("build", "run")) | ||||||
| depends_on("py-catalogue@0.0.7:1.0", type=("build", "run")) | ||||||
| depends_on("py-numpy@1.7:", type=("build", "run")) | ||||||
| depends_on("py-plac@0.9.6:1.1", type=("build", "run")) | ||||||
| depends_on("py-tqdm@4.10:4", type=("build", "run")) | ||||||
|
|
||||||
| depends_on("py-cython@0.25:2", type="build", when="@8.1.10") | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This change would seem to conflict with line 35. Can you explain what is intended here? |
||||||
| depends_on("py-cython@3", type="build", when="@8.3.10:") | ||||||
tldahlgren marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
|
|
||||||
| with default_args(type=("build", "run")): | ||||||
| depends_on("py-blis@0.4.0:0.4", when="@:7.4.1") | ||||||
| depends_on("py-blis@0.7.8:0.7", when="@8.1.10") | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This change would seem to conflict with line 40. Can you explain what is intended here? |
||||||
| depends_on("py-blis@1.3", when="@8.3.10:") | ||||||
|
|
||||||
| depends_on("py-murmurhash@0.28:1.0", when="@:7.4.1") | ||||||
| depends_on("py-murmurhash@1.0.2:1.0", when="@8.1.10:") | ||||||
|
|
||||||
| depends_on("py-cymem@2.0.2:2.0") | ||||||
|
|
||||||
| depends_on("py-preshed@1.0.1:3.0", when="@:7.4.1") | ||||||
| depends_on("py-preshed@3.0.2:3.0", when="@8.1.10:") | ||||||
|
|
||||||
| depends_on("py-wasabi@0.0.9:1.0", when="@:7.4.1") | ||||||
| depends_on("py-wasabi@0.8.1:1.1", when="@8.1.10:") | ||||||
|
|
||||||
| depends_on("py-srsly@0.0.6:1.0", when="@:7.4.1") | ||||||
| depends_on("py-srsly@2.4:2", when="@8.1.10:") | ||||||
|
|
||||||
| depends_on("py-catalogue@0.0.7:1.0", when="@:7.4.1") | ||||||
| depends_on("py-catalogue@2.0.4:2.0", when="@8.1.10:") | ||||||
|
|
||||||
| depends_on("py-confection@0.0.1:0", when="@8.1.10:") | ||||||
|
|
||||||
| depends_on("py-numpy@1.7:", when="@:7.4.1") | ||||||
| depends_on("py-numpy@1.15:", when="@8.1.10") | ||||||
| depends_on("py-numpy@2:", when="@8.3.10:") | ||||||
|
|
||||||
| depends_on("py-pydantic@1.7.4:1.7,1.9:1.10", when="@8.1.10") | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This change would seem to conflict with line 66. Can you explain what is intended here?
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There isn't a problem with overlap. The concretizer handles it. What adding the colon allows is it ensures the dependency applies should someone decide (someday) to add a patch release between it and the next minor release.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. AFAIK that's only true if the dependency version ranges don't have an upper bound. Here, the concretizer would have to find a version of py-pydantic that is both <= 1.10 and of major version 2; an impossible task.
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I thought your question was why I suggested appending the colon to the
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Maybe I could do something like |
||||||
| depends_on("py-pydantic@2", when="@8.3.10:") | ||||||
|
|
||||||
| depends_on("py-packaging@20:", when="@8.1.10:") | ||||||
|
|
||||||
| # depends_on("py-dataclasses@0.6:0", when="@8.1.10:^python@:3.6") | ||||||
| depends_on("py-typing-extensions@3.7.4.1:4.4", when="@8.1.10:^python@:3.7") | ||||||
| # depends_on("py-contextvars@2.4:2", when="@8.1.10:^python@3.6") | ||||||
|
|
||||||
| # Historical | ||||||
| depends_on("py-plac@0.9.6:1.1", when="@:7.4.1") | ||||||
| depends_on("py-tqdm@4.10:4", when="@:7.4.1") | ||||||
Uh oh!
There was an error while loading. Please reload this page.