Skip to content

Commit

Permalink
Merge branch 'main' into feat/editable-installs
Browse files Browse the repository at this point in the history
  • Loading branch information
@tdejager
tdejager committed Mar 28, 2024
2 parents 4948526 + 8f485c6 commit aafe11f
Show file tree
Hide file tree
Showing 28 changed files with 1,886 additions and 507 deletions.
58 changes: 30 additions & 28 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

41 changes: 21 additions & 20 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", rev = "7a5571fa5c4fa72a26b0754f3273f1d75f3fa7d2" }
distribution-types = { git = "https://github.com/astral-sh/uv", rev = "7a5571fa5c4fa72a26b0754f3273f1d75f3fa7d2" }
distribution-filename = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
distribution-types = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
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", rev = "7a5571fa5c4fa72a26b0754f3273f1d75f3fa7d2" }
install-wheel-rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
is_executable = "1.0.1"
itertools = "0.12.1"
lazy_static = "1.4.0"
Expand All @@ -71,10 +71,11 @@ 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", rev = "7a5571fa5c4fa72a26b0754f3273f1d75f3fa7d2" }
pep508_rs = { git = "https://github.com/astral-sh/uv", rev = "7a5571fa5c4fa72a26b0754f3273f1d75f3fa7d2" }
platform-tags = { git = "https://github.com/astral-sh/uv", rev = "7a5571fa5c4fa72a26b0754f3273f1d75f3fa7d2" }
pypi-types = { git = "https://github.com/astral-sh/uv", rev = "7a5571fa5c4fa72a26b0754f3273f1d75f3fa7d2" }
pep440_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
pep508_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
platform-tags = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
pypi-types = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
pyproject-toml = "0.10.0"
rattler = { version = "0.19.4", default-features = false, features = [
"cli-tools",
] }
Expand All @@ -93,7 +94,7 @@ rattler_solve = { version = "0.20.3", default-features = false, features = [
] }
rattler_virtual_packages = { version = "0.19.4", default-features = false }
regex = "1.10.3"
requirements-txt = { git = "https://github.com/astral-sh/uv", rev = "7a5571fa5c4fa72a26b0754f3273f1d75f3fa7d2" }
requirements-txt = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
reqwest = { version = "0.11.27", default-features = false }
reqwest-middleware = "0.2.5"
reqwest-retry = "0.4.0"
Expand All @@ -120,16 +121,16 @@ 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-build = { git = "https://github.com/astral-sh/uv", rev = "7a5571fa5c4fa72a26b0754f3273f1d75f3fa7d2" }
uv-cache = { git = "https://github.com/astral-sh/uv", rev = "7a5571fa5c4fa72a26b0754f3273f1d75f3fa7d2" }
uv-client = { git = "https://github.com/astral-sh/uv", rev = "7a5571fa5c4fa72a26b0754f3273f1d75f3fa7d2" }
uv-dispatch = { git = "https://github.com/astral-sh/uv", rev = "7a5571fa5c4fa72a26b0754f3273f1d75f3fa7d2" }
uv-distribution = { git = "https://github.com/astral-sh/uv", rev = "7a5571fa5c4fa72a26b0754f3273f1d75f3fa7d2" }
uv-installer = { git = "https://github.com/astral-sh/uv", rev = "7a5571fa5c4fa72a26b0754f3273f1d75f3fa7d2" }
uv-interpreter = { git = "https://github.com/astral-sh/uv", rev = "7a5571fa5c4fa72a26b0754f3273f1d75f3fa7d2" }
uv-normalize = { git = "https://github.com/astral-sh/uv", rev = "7a5571fa5c4fa72a26b0754f3273f1d75f3fa7d2" }
uv-resolver = { git = "https://github.com/astral-sh/uv", rev = "7a5571fa5c4fa72a26b0754f3273f1d75f3fa7d2" }
uv-traits = { git = "https://github.com/astral-sh/uv", rev = "7a5571fa5c4fa72a26b0754f3273f1d75f3fa7d2" }
uv-build = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
uv-cache = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
uv-client = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
uv-dispatch = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
uv-distribution = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
uv-installer = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
uv-interpreter = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
uv-normalize = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
uv-resolver = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
uv-traits = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
xxhash-rust = "0.8.10"
zip = { version = "0.6.6", default-features = false, features = [
"deflate",
Expand Down Expand Up @@ -158,8 +159,8 @@ toml = "0.8.12"
[patch.crates-io]
# For pyproject-toml
# If you change this also change the versions in the the patch section for uv
pep440_rs = { git = "https://github.com/astral-sh/uv", rev = "7a5571fa5c4fa72a26b0754f3273f1d75f3fa7d2" }
pep508_rs = { git = "https://github.com/astral-sh/uv", rev = "7a5571fa5c4fa72a26b0754f3273f1d75f3fa7d2" }
pep440_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
pep508_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }

# deno_task_shell = { path = "../deno_task_shell" }
rattler = { git = "https://github.com/baszalmstra/rattler", rev = "e5aaed3e2551399985e3c11a87c2c0aedb31b0d3" }
Expand Down
2 changes: 1 addition & 1 deletion docs/advanced/advanced_tasks.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ To add a task to run the `bar.py` file, use:
pixi task add bar "python bar.py" --cwd scripts
```

This will add the following line to `pixi.toml`:
This will add the following line to [manifest file](../configuration.md):
```toml title="pixi.toml"
[tasks]
bar = { cmd = "python bar.py", cwd = "scripts" }
Expand Down
5 changes: 2 additions & 3 deletions docs/advanced/explain_info_command.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,11 @@ The size of the previously mentioned "Cache dir" in Mebibytes.
## Project info

Everything below `Project` is info about the project you're currently in.
This info is only available if your path has a manifest file (`pixi.toml`).
This info is only available if your path has a [manifest file](../configuration.md).

### Manifest file

The path to the manifest file that describes the project.
For now, this can only be `pixi.toml`.
The path to the [manifest file](../configuration.md) that describes the project.

### Last updated

Expand Down
9 changes: 9 additions & 0 deletions docs/advanced/github_actions.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,15 @@ On self-hosted runners, you also might want to alter the default pixi install lo

1. `${{ runner.temp }}\Scripts\pixi.exe` on Windows

### Using the `pyproject.toml` as a manifest file for pixi.
You can use the pyproject.toml, but it is not the default manifest file for pixi, so it's not picked up automatically, yet.
```yaml
- uses: prefix-dev/[email protected]
with:
manifest-path: pyproject.toml
- run: pixi run test
```

## More examples

If you want to see more examples, you can take a look at the [GitHub Workflows of the `setup-pixi` repository](https://github.com/prefix-dev/setup-pixi/blob/main/.github/workflows/test.yml).
Loading

0 comments on commit aafe11f

Please sign in to comment.