Skip to content

Commit d8d2cdf

Browse files
Update files from markdown-code-runner
1 parent 1366a26 commit d8d2cdf

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

README.md

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,8 @@ positional arguments:
550550
Subcommands
551551
merge Combine multiple (or a single) `requirements.yaml` or
552552
`pyproject.toml` files into a single Conda installable
553-
`environment.yaml` file.
553+
`environment.yaml` file or Pixi installable
554+
`pixi.toml` file.
554555
install Automatically install all dependencies from one or
555556
more `requirements.yaml` or `pyproject.toml` files.
556557
This command first installs dependencies with Conda,
@@ -603,30 +604,33 @@ See `unidep merge -h` for more information:
603604
<!-- ⚠️ This content is auto-generated by `markdown-code-runner`. -->
604605
```bash
605606
usage: unidep merge [-h] [-o OUTPUT] [-n NAME] [--stdout]
606-
[--selector {sel,comment}] [-d DIRECTORY] [--depth DEPTH]
607-
[-v]
607+
[--selector {sel,comment}] [--pixi] [-d DIRECTORY]
608+
[--depth DEPTH] [-v]
608609
[-p {linux-64,linux-aarch64,linux-ppc64le,osx-64,osx-arm64,win-64}]
609610
[--skip-dependency SKIP_DEPENDENCY]
610611
[--ignore-pin IGNORE_PIN] [--overwrite-pin OVERWRITE_PIN]
611612

612613
Combine multiple (or a single) `requirements.yaml` or `pyproject.toml` files
613-
into a single Conda installable `environment.yaml` file. Example usage:
614-
`unidep merge --directory . --depth 1 --output environment.yaml` to search for
615-
`requirements.yaml` or `pyproject.toml` files in the current directory and its
616-
subdirectories and create `environment.yaml`. These are the defaults, so you
617-
can also just run `unidep merge`.
614+
into a single Conda installable `environment.yaml` file or Pixi installable
615+
`pixi.toml` file. Example usage: `unidep merge --directory . --depth 1
616+
--output environment.yaml` to search for `requirements.yaml` or
617+
`pyproject.toml` files in the current directory and its subdirectories and
618+
create `environment.yaml`. These are the defaults, so you can also just run
619+
`unidep merge`.
618620

619621
options:
620622
-h, --help show this help message and exit
621623
-o, --output OUTPUT Output file for the conda environment, by default
622-
`environment.yaml`
624+
`environment.yaml` or `pixi.toml` if `--pixi` is used
623625
-n, --name NAME Name of the conda environment, by default `myenv`
624626
--stdout Output to stdout instead of a file
625627
--selector {sel,comment}
626628
The selector to use for the environment markers, if
627629
`sel` then `- numpy # [linux]` becomes `sel(linux):
628630
numpy`, if `comment` then it remains `- numpy #
629631
[linux]`, by default `sel`
632+
--pixi Generate a `pixi.toml` file instead of
633+
`environment.yaml`
630634
-d, --directory DIRECTORY
631635
Base directory to scan for `requirements.yaml` or
632636
`pyproject.toml` file(s), by default `.`

0 commit comments

Comments
 (0)