Skip to content

Commit

Permalink
feat: pypi source dependencies (prefix-dev#985)
Browse files Browse the repository at this point in the history 
Co-authored-by: Pavel Zwerschke <[email protected]>
Co-authored-by: Bas Zalmstra <[email protected]>
Co-authored-by: nichmor <[email protected]>
Co-authored-by: Bas Zalmstra <[email protected]>
Co-authored-by: Wolf Vollprecht <[email protected]>
  • Loading branch information
@tdejager @pavelzw
@baszalmstra @nichmor @wolfv
6 people committed Mar 22, 2024
1 parent 7894c24 commit c55708b
Show file tree
Hide file tree
Showing 34 changed files with 2,879 additions and 1,222 deletions.
297 changes: 118 additions & 179 deletions Cargo.lock
View file

Large diffs are not rendered by default.

132 changes: 66 additions & 66 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ crossbeam-channel = "0.5.12"
deno_task_shell = "0.14.4"
dialoguer = "0.11.0"
dirs = "5.0.1"
distribution-filename = { git = "https://github.com/astral-sh/uv", tag = "0.1.16" }
distribution-types = { git = "https://github.com/astral-sh/uv", tag = "0.1.16" }
distribution-filename = { git = "https://github.com/astral-sh/uv", tag = "0.1.23" }
distribution-types = { git = "https://github.com/astral-sh/uv", tag = "0.1.23" }
dunce = "1.0.4"
flate2 = "1.0.28"
futures = "0.3.30"
Expand All @@ -57,7 +57,7 @@ ignore = "0.4.22"
indexmap = { version = "2.2.5", features = ["serde"] }
indicatif = "0.17.8"

install-wheel-rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.16" }
install-wheel-rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.23" }
is_executable = "1.0.1"
itertools = "0.12.1"
lazy_static = "1.4.0"
Expand All @@ -71,26 +71,27 @@ miette = { version = "7.2.0", features = [
] }
minijinja = { version = "1.0.14", features = ["builtins"] }
once_cell = "1.19.0"
pep440_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.16" }
pep508_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.16" }
platform-host = { git = "https://github.com/astral-sh/uv", tag = "0.1.16" }
platform-tags = { git = "https://github.com/astral-sh/uv", tag = "0.1.16" }
pypi-types = { git = "https://github.com/astral-sh/uv", tag = "0.1.16" }
rattler = { version = "0.19.4", default-features = false, features = ["cli-tools"] }
rattler_conda_types = { version = "0.20.2", default-features = false }
pep440_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.23" }
pep508_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.23" }
platform-tags = { git = "https://github.com/astral-sh/uv", tag = "0.1.23" }
pypi-types = { git = "https://github.com/astral-sh/uv", tag = "0.1.23" }
rattler = { version = "0.19.4", default-features = false, features = [
"cli-tools",
] }
rattler_conda_types = { version = "0.20.3", default-features = false }
rattler_digest = { version = "0.19.2", default-features = false }
rattler_lock = { version = "0.20.2", default-features = false }
rattler_networking = { version = "0.19.2", default-features = false }
rattler_repodata_gateway = { version = "0.19.3", default-features = false, features = [
rattler_lock = { version = "0.21.0", default-features = false }
rattler_networking = { version = "0.20.0", default-features = false }
rattler_repodata_gateway = { version = "0.19.4", default-features = false, features = [
"sparse",
] }
rattler_shell = { version = "0.19.3", default-features = false, features = [
rattler_shell = { version = "0.19.4", default-features = false, features = [
"sysinfo",
] }
rattler_solve = { version = "0.20.2", default-features = false, features = [
rattler_solve = { version = "0.20.3", default-features = false, features = [
"resolvo",
] }
rattler_virtual_packages = { version = "0.19.3", default-features = false }
rattler_virtual_packages = { version = "0.19.4", default-features = false }
regex = "1.10.3"
reqwest = { version = "0.11.27", default-features = false }
reqwest-middleware = "0.2.5"
Expand Down Expand Up @@ -118,15 +119,15 @@ toml_edit = { version = "0.22.8", features = ["serde"] }
tracing = "0.1.40"
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
url = "2.5.0"
uv-cache = { git = "https://github.com/astral-sh/uv", tag = "0.1.16" }
uv-client = { git = "https://github.com/astral-sh/uv", tag = "0.1.16" }
uv-dispatch = { git = "https://github.com/astral-sh/uv", tag = "0.1.16" }
uv-distribution = { git = "https://github.com/astral-sh/uv", tag = "0.1.16" }
uv-installer = { git = "https://github.com/astral-sh/uv", tag = "0.1.16" }
uv-interpreter = { git = "https://github.com/astral-sh/uv", tag = "0.1.16" }
uv-normalize = { git = "https://github.com/astral-sh/uv", tag = "0.1.16" }
uv-resolver = { git = "https://github.com/astral-sh/uv", tag = "0.1.16" }
uv-traits = { git = "https://github.com/astral-sh/uv", tag = "0.1.16" }
uv-cache = { git = "https://github.com/astral-sh/uv", tag = "0.1.23" }
uv-client = { git = "https://github.com/astral-sh/uv", tag = "0.1.23" }
uv-dispatch = { git = "https://github.com/astral-sh/uv", tag = "0.1.23" }
uv-distribution = { git = "https://github.com/astral-sh/uv", tag = "0.1.23" }
uv-installer = { git = "https://github.com/astral-sh/uv", tag = "0.1.23" }
uv-interpreter = { git = "https://github.com/astral-sh/uv", tag = "0.1.23" }
uv-normalize = { git = "https://github.com/astral-sh/uv", tag = "0.1.23" }
uv-resolver = { git = "https://github.com/astral-sh/uv", tag = "0.1.23" }
uv-traits = { git = "https://github.com/astral-sh/uv", tag = "0.1.23" }
xxhash-rust = "0.8.10"
zip = { version = "0.6.6", default-features = false, features = [
"deflate",
Expand Down Expand Up @@ -154,47 +155,46 @@ toml = "0.8.12"

[patch.crates-io]
# For pyproject-toml
# If you change this also change the versions in the the patch section for astral
pep440_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.16" }
pep508_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.16" }
#deno_task_shell = { path = "../deno_task_shell" }
# If you change this also change the versions in the the patch section for uv
pep440_rs = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" }
pep508_rs = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" }

# rattler = { git = "https://github.com/mamba-org/rattler", rev = "e3784e0bc65b98f3cf3dcb7e2b8924113f3ec463" }
# rattler_conda_types = { git = "https://github.com/mamba-org/rattler", rev = "e3784e0bc65b98f3cf3dcb7e2b8924113f3ec463" }
# rattler_digest = { git = "https://github.com/mamba-org/rattler", rev = "e3784e0bc65b98f3cf3dcb7e2b8924113f3ec463" }
# rattler_lock = { git = "https://github.com/mamba-org/rattler", rev = "e3784e0bc65b98f3cf3dcb7e2b8924113f3ec463" }
# rattler_networking = { git = "https://github.com/mamba-org/rattler", rev = "e3784e0bc65b98f3cf3dcb7e2b8924113f3ec463" }
# rattler_repodata_gateway = { git = "https://github.com/mamba-org/rattler", rev = "e3784e0bc65b98f3cf3dcb7e2b8924113f3ec463" }
# rattler_shell = { git = "https://github.com/mamba-org/rattler", rev = "e3784e0bc65b98f3cf3dcb7e2b8924113f3ec463" }
# rattler_solve = { git = "https://github.com/mamba-org/rattler", rev = "e3784e0bc65b98f3cf3dcb7e2b8924113f3ec463" }
# rattler_virtual_packages = { git = "https://github.com/mamba-org/rattler", rev = "e3784e0bc65b98f3cf3dcb7e2b8924113f3ec463" }
# Change these lines if you want a patched version of uv
[patch.'https://github.com/astral-sh/uv']
pep440_rs = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" }
pep508_rs = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" }
uv-cache = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" }
uv-client = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" }
uv-dispatch = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" }
uv-distribution = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" }
uv-installer = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" }
uv-interpreter = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" }
uv-normalize = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" }
uv-resolver = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" }
uv-traits = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" }
distribution-filename = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" }
distribution-types = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" }
install-wheel-rs = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" }
platform-tags = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" }
pypi-types = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" }
requirements-txt = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" }

#rattler = { path = "../rattler/crates/rattler" }
#rattler_conda_types = { path = "../rattler/crates/rattler_conda_types" }
#rattler_digest = { path = "../rattler/crates/rattler_digest" }
#rattler_networking = { path = "../rattler/crates/rattler_networking" }
#rattler_repodata_gateway = { path = "../rattler/crates/rattler_repodata_gateway" }
#rattler_shell = { path = "../rattler/crates/rattler_shell" }
#rattler_solve = { path = "../rattler/crates/rattler_solve" }
#rattler_virtual_packages = { path = "../rattler/crates/rattler_virtual_packages" }
#rattler_lock = { path = "../rattler/crates/rattler_lock" }
# deno_task_shell = { path = "../deno_task_shell" }
# rattler = { git = "https://github.com/mamba-org/rattler", rev = "2fb7fc1f60b250985e0674b22c5d42fd31798826" }
# rattler_conda_types = { git = "https://github.com/mamba-org/rattler", rev = "2fb7fc1f60b250985e0674b22c5d42fd31798826" }
# rattler_digest = { git = "https://github.com/mamba-org/rattler", rev = "2fb7fc1f60b250985e0674b22c5d42fd31798826" }
# rattler_lock = { git = "https://github.com/mamba-org/rattler", rev = "2fb7fc1f60b250985e0674b22c5d42fd31798826" }
# rattler_networking = { git = "https://github.com/mamba-org/rattler", rev = "2fb7fc1f60b250985e0674b22c5d42fd31798826" }
# rattler_repodata_gateway = { git = "https://github.com/mamba-org/rattler", rev = "2fb7fc1f60b250985e0674b22c5d42fd31798826" }
# rattler_shell = { git = "https://github.com/mamba-org/rattler", rev = "2fb7fc1f60b250985e0674b22c5d42fd31798826" }
# rattler_solve = { git = "https://github.com/mamba-org/rattler", rev = "2fb7fc1f60b250985e0674b22c5d42fd31798826" }
# rattler_virtual_packages = { git = "https://github.com/mamba-org/rattler", rev = "2fb7fc1f60b250985e0674b22c5d42fd31798826" }

# Change these lines if you want a patched version of astral
# [patch.'https://github.com/astral-sh/uv']
# pep440_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.16" }
# pep508_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.16" }
# uv-cache = { git = "https://github.com/astral-sh/uv", tag = "0.1.16" }
# uv-client = { git = "https://github.com/astral-sh/uv", tag = "0.1.16" }
# uv-dispatch = { git = "https://github.com/astral-sh/uv", tag = "0.1.16" }
# uv-distribution = { git = "https://github.com/astral-sh/uv", tag = "0.1.16" }
# uv-installer = { git = "https://github.com/astral-sh/uv", tag = "0.1.16" }
# uv-interpreter = { git = "https://github.com/astral-sh/uv", tag = "0.1.16" }
# uv-normalize = { git = "https://github.com/astral-sh/uv", tag = "0.1.16" }
# uv-resolver = { git = "https://github.com/astral-sh/uv", tag = "0.1.16" }
# uv-traits = { git = "https://github.com/astral-sh/uv", tag = "0.1.16" }
# distribution-filename = { git = "https://github.com/astral-sh/uv", tag = "0.1.16" }
# distribution-types = { git = "https://github.com/astral-sh/uv", tag = "0.1.16" }
# install-wheel-rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.16" }
# platform-host = { git = "https://github.com/astral-sh/uv", tag = "0.1.16" }
# platform-tags = { git = "https://github.com/astral-sh/uv", tag = "0.1.16" }
# pypi-types = { git = "https://github.com/astral-sh/uv", tag = "0.1.16" }
# rattler_conda_types = { path = "../rattler/crates/rattler_conda_types" }
# rattler_digest = { path = "../rattler/crates/rattler_digest" }
# rattler_networking = { path = "../rattler/crates/rattler_networking" }
# rattler_repodata_gateway = { path = "../rattler/crates/rattler_repodata_gateway" }
# rattler_shell = { path = "../rattler/crates/rattler_shell" }
# rattler_solve = { path = "../rattler/crates/rattler_solve" }
# rattler_virtual_packages = { path = "../rattler/crates/rattler_virtual_packages" }
# rattler_lock = { path = "../rattler/crates/rattler_lock" }
2 changes: 2 additions & 0 deletions examples/pypi-source-deps/.gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# GitHub syntax highlighting
pixi.lock linguist-language=YAML
2 changes: 2 additions & 0 deletions examples/pypi-source-deps/.gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# pixi environments
.pixi
7 changes: 7 additions & 0 deletions examples/pypi-source-deps/minimal-project/minimal_project/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import importlib.metadata

try:
__version__ = importlib.metadata.version(__name__)
except importlib.metadata.PackageNotFoundError:
__version__ = "unknown"
raise Exception(f"Could not determine version of {__name__}")
2 changes: 2 additions & 0 deletions examples/pypi-source-deps/minimal-project/minimal_project/module.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
def hello():
print('Hello World!')
8 changes: 8 additions & 0 deletions examples/pypi-source-deps/minimal-project/pyproject.toml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[project]
name = "minimal_project"
version = "0.1"
description = "just says hello"

[build-system]
requires = ["hatchling"]
build-backend = "hatchling.build"
Loading

0 comments on commit c55708b

Please sign in to comment.