Skip to content

Commit

Permalink
Merge branch 'main' into info_command
Browse files Browse the repository at this point in the history
  • Loading branch information
tdejager authored Jul 10, 2023
2 parents a81cef9 + 86facd1 commit 2d0fbd4
Show file tree
Hide file tree
Showing 47 changed files with 24,815 additions and 20,462 deletions.
19 changes: 18 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,23 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [0.0.6] - 2023-06-30

### Highlights
Improving the reliability is important to us, so we added an integration testing framework, we can now test as close as possible to the CLI level using `cargo`.

### Details

#### Added
- An integration test harness, to test as close as possible to the user experience but in rust. ([#138](https://github.com/prefix-dev/pixi/pull/138), [#140](https://github.com/prefix-dev/pixi/pull/140), [#156](https://github.com/prefix-dev/pixi/pull/156))
- Add different levels of dependencies in preparation for `pixi build`, allowing `host-` and `build-` `dependencies` ([#149](https://github.com/prefix-dev/pixi/pull/149))

#### Fixed
- Use correct folder name on pixi init ([#144](https://github.com/prefix-dev/pixi/pull/144))
- Fix windows cli installer ([#152](https://github.com/prefix-dev/pixi/pull/152))
- Fix global install path variable ([#147](https://github.com/prefix-dev/pixi/pull/147))
- Fix macOS binary notarization ([#153](https://github.com/prefix-dev/pixi/pull/153))

## [0.0.5] - 2023-06-26

Fixing Windows installer build in CI. ([#145](https://github.com/prefix-dev/pixi/pull/145))
Expand All @@ -24,7 +41,7 @@ helped a lot.

#### Added

- Platform specific dependencies and helpfull error reporting on `pixi.toml` issues([#111](https://github.com/prefix-dev/pixi/pull/111))
- Platform specific dependencies and helpful error reporting on `pixi.toml` issues([#111](https://github.com/prefix-dev/pixi/pull/111))
- Windows installer, which is very useful for users that want to start using pixi on windows. ([#114](https://github.com/prefix-dev/pixi/pull/114))
- `shell` command to use the pixi environment without `pixi run`. ([#116](https://github.com/prefix-dev/pixi/pull/116))
- Verbosity options using `-v, -vv, -vvv` ([#118](https://github.com/prefix-dev/pixi/pull/118))
Expand Down
113 changes: 88 additions & 25 deletions Cargo.lock

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

9 changes: 6 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pixi"
version = "0.0.5"
version = "0.0.6"
description = "A package management and workflow tool"
edition = "2021"
authors = ["pixi contributors <hi@prefix.dev>"]
Expand All @@ -22,6 +22,8 @@ clap = { version = "4.2.4", default-features = false, features = ["derive", "usa
clap-verbosity-flag = "2.0.1"
clap_complete = "4.2.1"
console = { version = "0.15.5", features = ["windows-console-colors"] }
deno_task_shell = { git = "https://github.com/prefix-dev/deno_task_shell" }
# deno_task_shell = { path = "../deno_task_shell" }
dirs = "5.0.1"
dunce = "1.0.4"
futures = "0.3.28"
Expand All @@ -37,7 +39,7 @@ rattler_conda_types = { default-features = false, git = "https://github.com/mamb
rattler_networking = { default-features = false, git = "https://github.com/mamba-org/rattler", branch = "main" }
rattler_repodata_gateway = { default-features = false, git = "https://github.com/mamba-org/rattler", branch = "main", features = ["sparse"] }
rattler_shell = { default-features = false, git = "https://github.com/mamba-org/rattler", branch = "main", features = ["sysinfo"] }
rattler_solve = { default-features = false, git = "https://github.com/mamba-org/rattler", branch = "main" }
rattler_solve = { default-features = false, git = "https://github.com/mamba-org/rattler", branch = "main", features = ["libsolv_c"] }
rattler_virtual_packages = { default-features = false, git = "https://github.com/mamba-org/rattler", branch = "main" }
#rattler = { default-features = false, path="../rattler/crates/rattler" }
#rattler_conda_types = { default-features = false, path="../rattler/crates/rattler_conda_types" }
Expand All @@ -53,7 +55,7 @@ serde_spanned = "0.6.2"
serde_with = { version = "3.0.0", features = ["indexmap"] }
shlex = "1.1.0"
tempfile = "3.5.0"
tokio = { version = "1.27.0", features = ["macros", "rt-multi-thread"] }
tokio = { version = "1.27.0", features = ["macros", "rt-multi-thread", "signal"] }
toml_edit = { version = "0.19.10", features = ["serde"] }
tracing = "0.1.37"
tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
Expand All @@ -62,3 +64,4 @@ url = "2.4.0"
[dev-dependencies]
rattler_digest = { default-features = false, git = "https://github.com/mamba-org/rattler", branch = "main" }
serde_json = "1.0.96"
tokio = { version = "1.27.0", features = ["rt"] }
6 changes: 4 additions & 2 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,8 @@ Options:
Initialize a new project and navigate to the project directory

```
pixi init myproject && cd myproject
pixi init myproject
cd myproject
```

Add the dependencies you want to use
Expand All @@ -185,6 +186,7 @@ Activate a shell in the environment
```shell
pixi shell
cowpy "Thanks for using pixi"
exit
```

For more information check [the documentation](getting_started.md#basics-of-the-configuration-file)
Expand All @@ -199,7 +201,7 @@ pixi global install cowpy
```

For more examples
check [the documentation](./examples.md#global-package-installation-in-isolation)
check [the documentation](./cli.md)

<a name="contributing"></a>
# Contributing 😍
Expand Down
Loading

0 comments on commit 2d0fbd4

Please sign in to comment.