Skip to content

Commit 316a7d3

Browse files
[pre-commit.ci] pre-commit autoupdate (#221)
* [pre-commit.ci] pre-commit autoupdate updates: - [github.com/astral-sh/ruff-pre-commit: v0.8.6 → v0.9.4](astral-sh/ruff-pre-commit@v0.8.6...v0.9.4) * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Update files from markdown-code-runner --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
1 parent 231e569 commit 316a7d3

File tree

4 files changed

+31
-31
lines changed

4 files changed

+31
-31
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ repos:
77
- id: end-of-file-fixer
88
- id: mixed-line-ending
99
- repo: https://github.com/astral-sh/ruff-pre-commit
10-
rev: "v0.8.6"
10+
rev: "v0.9.4"
1111
hooks:
1212
- id: ruff
1313
args: ["--fix"]

README.md

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -420,8 +420,7 @@ See [example](example/) for more information or check the output of `unidep -h`
420420
<!-- ⚠️ This content is auto-generated by `markdown-code-runner`. -->
421421
```bash
422422
usage: unidep [-h]
423-
{merge,install,install-all,conda-lock,pip-compile,pip,conda,version}
424-
...
423+
{merge,install,install-all,conda-lock,pip-compile,pip,conda,version} ...
425424

426425
Unified Conda and Pip requirements management.
427426

@@ -498,23 +497,22 @@ can also just run `unidep merge`.
498497

499498
options:
500499
-h, --help show this help message and exit
501-
-o OUTPUT, --output OUTPUT
502-
Output file for the conda environment, by default
500+
-o, --output OUTPUT Output file for the conda environment, by default
503501
`environment.yaml`
504-
-n NAME, --name NAME Name of the conda environment, by default `myenv`
502+
-n, --name NAME Name of the conda environment, by default `myenv`
505503
--stdout Output to stdout instead of a file
506504
--selector {sel,comment}
507505
The selector to use for the environment markers, if
508506
`sel` then `- numpy # [linux]` becomes `sel(linux):
509507
numpy`, if `comment` then it remains `- numpy #
510508
[linux]`, by default `sel`
511-
-d DIRECTORY, --directory DIRECTORY
509+
-d, --directory DIRECTORY
512510
Base directory to scan for `requirements.yaml` or
513511
`pyproject.toml` file(s), by default `.`
514512
--depth DEPTH Maximum depth to scan for `requirements.yaml` or
515513
`pyproject.toml` files, by default 1
516514
-v, --verbose Print verbose output
517-
-p {linux-64,linux-aarch64,linux-ppc64le,osx-64,osx-arm64,win-64}, --platform {linux-64,linux-aarch64,linux-ppc64le,osx-64,osx-arm64,win-64}
515+
-p, --platform {linux-64,linux-aarch64,linux-ppc64le,osx-64,osx-arm64,win-64}
518516
The platform(s) to get the requirements for. Multiple
519517
platforms can be specified. By default, the current
520518
platform (`linux-64`) is used.
@@ -555,8 +553,9 @@ usage: unidep install [-h] [-v] [-e] [--skip-local] [--skip-pip]
555553
[--skip-conda] [--skip-dependency SKIP_DEPENDENCY]
556554
[--no-dependencies]
557555
[--conda-executable {conda,mamba,micromamba}]
558-
[-n CONDA_ENV_NAME | --conda-env-prefix CONDA_ENV_PREFIX]
559-
[--dry-run] [--ignore-pin IGNORE_PIN]
556+
[-n CONDA_ENV_NAME |
557+
--conda-env-prefix CONDA_ENV_PREFIX] [--dry-run]
558+
[--ignore-pin IGNORE_PIN]
560559
[--overwrite-pin OVERWRITE_PIN] [-f CONDA_LOCK_FILE]
561560
[--no-uv]
562561
files [files ...]
@@ -601,7 +600,7 @@ options:
601600
installed.
602601
--conda-executable {conda,mamba,micromamba}
603602
The conda executable to use
604-
-n CONDA_ENV_NAME, --conda-env-name CONDA_ENV_NAME
603+
-n, --conda-env-name CONDA_ENV_NAME
605604
Name of the conda environment, if not provided, the
606605
currently active environment name is used, unless
607606
`--conda-env-prefix` is provided
@@ -619,7 +618,7 @@ options:
619618
e.g., `--overwrite-pin 'numpy=1.19.2'`. This option
620619
can be repeated to overwrite the pins of multiple
621620
packages.
622-
-f CONDA_LOCK_FILE, --conda-lock-file CONDA_LOCK_FILE
621+
-f, --conda-lock-file CONDA_LOCK_FILE
623622
Path to the `conda-lock.yml` file to use for creating
624623
the new environment. Assumes that the lock file
625624
contains all dependencies. Must be used with `--conda-
@@ -647,8 +646,9 @@ usage: unidep install [-h] [-v] [-e] [--skip-local] [--skip-pip]
647646
[--skip-conda] [--skip-dependency SKIP_DEPENDENCY]
648647
[--no-dependencies]
649648
[--conda-executable {conda,mamba,micromamba}]
650-
[-n CONDA_ENV_NAME | --conda-env-prefix CONDA_ENV_PREFIX]
651-
[--dry-run] [--ignore-pin IGNORE_PIN]
649+
[-n CONDA_ENV_NAME |
650+
--conda-env-prefix CONDA_ENV_PREFIX] [--dry-run]
651+
[--ignore-pin IGNORE_PIN]
652652
[--overwrite-pin OVERWRITE_PIN] [-f CONDA_LOCK_FILE]
653653
[--no-uv]
654654
files [files ...]
@@ -693,7 +693,7 @@ options:
693693
installed.
694694
--conda-executable {conda,mamba,micromamba}
695695
The conda executable to use
696-
-n CONDA_ENV_NAME, --conda-env-name CONDA_ENV_NAME
696+
-n, --conda-env-name CONDA_ENV_NAME
697697
Name of the conda environment, if not provided, the
698698
currently active environment name is used, unless
699699
`--conda-env-prefix` is provided
@@ -711,7 +711,7 @@ options:
711711
e.g., `--overwrite-pin 'numpy=1.19.2'`. This option
712712
can be repeated to overwrite the pins of multiple
713713
packages.
714-
-f CONDA_LOCK_FILE, --conda-lock-file CONDA_LOCK_FILE
714+
-f, --conda-lock-file CONDA_LOCK_FILE
715715
Path to the `conda-lock.yml` file to use for creating
716716
the new environment. Assumes that the lock file
717717
contains all dependencies. Must be used with `--conda-
@@ -773,18 +773,18 @@ options:
773773
--check-input-hash Check existing input hashes in lockfiles before
774774
regenerating lock files. This flag is directly passed
775775
to `conda-lock`.
776-
-d DIRECTORY, --directory DIRECTORY
776+
-d, --directory DIRECTORY
777777
Base directory to scan for `requirements.yaml` or
778778
`pyproject.toml` file(s), by default `.`
779779
--depth DEPTH Maximum depth to scan for `requirements.yaml` or
780780
`pyproject.toml` files, by default 1
781-
-f FILE, --file FILE A single `requirements.yaml` or `pyproject.toml` file
781+
-f, --file FILE A single `requirements.yaml` or `pyproject.toml` file
782782
to use, or folder that contains that file. This is an
783783
alternative to using `--directory` which searches for
784784
all `requirements.yaml` or `pyproject.toml` files in
785785
the directory and its subdirectories.
786786
-v, --verbose Print verbose output
787-
-p {linux-64,linux-aarch64,linux-ppc64le,osx-64,osx-arm64,win-64}, --platform {linux-64,linux-aarch64,linux-ppc64le,osx-64,osx-arm64,win-64}
787+
-p, --platform {linux-64,linux-aarch64,linux-ppc64le,osx-64,osx-arm64,win-64}
788788
The platform(s) to get the requirements for. Multiple
789789
platforms can be specified. By default, the current
790790
platform (`linux-64`) is used.
@@ -849,16 +849,16 @@ positional arguments:
849849
850850
options:
851851
-h, --help show this help message and exit
852-
-o OUTPUT_FILE, --output-file OUTPUT_FILE
852+
-o, --output-file OUTPUT_FILE
853853
Output file for the pip requirements, by default
854854
`requirements.txt`
855-
-d DIRECTORY, --directory DIRECTORY
855+
-d, --directory DIRECTORY
856856
Base directory to scan for `requirements.yaml` or
857857
`pyproject.toml` file(s), by default `.`
858858
--depth DEPTH Maximum depth to scan for `requirements.yaml` or
859859
`pyproject.toml` files, by default 1
860860
-v, --verbose Print verbose output
861-
-p {linux-64,linux-aarch64,linux-ppc64le,osx-64,osx-arm64,win-64}, --platform {linux-64,linux-aarch64,linux-ppc64le,osx-64,osx-arm64,win-64}
861+
-p, --platform {linux-64,linux-aarch64,linux-ppc64le,osx-64,osx-arm64,win-64}
862862
The platform(s) to get the requirements for. Multiple
863863
platforms can be specified. By default, the current
864864
platform (`linux-64`) is used.
@@ -911,11 +911,11 @@ file.
911911
912912
options:
913913
-h, --help show this help message and exit
914-
-f FILE, --file FILE The `requirements.yaml` or `pyproject.toml` file to
914+
-f, --file FILE The `requirements.yaml` or `pyproject.toml` file to
915915
parse, or folder that contains that file, by default
916916
`.`
917917
-v, --verbose Print verbose output
918-
-p {linux-64,linux-aarch64,linux-ppc64le,osx-64,osx-arm64,win-64}, --platform {linux-64,linux-aarch64,linux-ppc64le,osx-64,osx-arm64,win-64}
918+
-p, --platform {linux-64,linux-aarch64,linux-ppc64le,osx-64,osx-arm64,win-64}
919919
The platform(s) to get the requirements for. Multiple
920920
platforms can be specified. By default, the current
921921
platform (`linux-64`) is used.
@@ -970,11 +970,11 @@ to specify multiple `requirements.yaml` or `pyproject.toml` files and that
970970
971971
options:
972972
-h, --help show this help message and exit
973-
-f FILE, --file FILE The `requirements.yaml` or `pyproject.toml` file to
973+
-f, --file FILE The `requirements.yaml` or `pyproject.toml` file to
974974
parse, or folder that contains that file, by default
975975
`.`
976976
-v, --verbose Print verbose output
977-
-p {linux-64,linux-aarch64,linux-ppc64le,osx-64,osx-arm64,win-64}, --platform {linux-64,linux-aarch64,linux-ppc64le,osx-64,osx-arm64,win-64}
977+
-p, --platform {linux-64,linux-aarch64,linux-ppc64le,osx-64,osx-arm64,win-64}
978978
The platform(s) to get the requirements for. Multiple
979979
platforms can be specified. By default, the current
980980
platform (`linux-64`) is used.

example/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,11 @@ Using `unidep` for installation offers a more comprehensive approach. It handles
110110
$ unidep install --dry-run -e ./setup_py_project
111111
📦 Installing conda dependencies with `conda install --yes --override-channels --channel conda-forge pandas">=1,<3" adaptive">=0.15.0, <2.0.0" pfapack packaging adaptive-scheduler numpy">=1.21" hpc05 pexpect pytest pytest-cov`
112112

113-
📦 Installing pip dependencies with `/opt/hostedtoolcache/Python/3.12.8/x64/bin/python -m pip install yaml2bib rsync-time-machine slurm-usage pyyaml aiokef markdown-code-runner numthreads unidep`
113+
📦 Installing pip dependencies with `/opt/hostedtoolcache/Python/3.13.1/x64/bin/python -m pip install yaml2bib rsync-time-machine slurm-usage pyyaml aiokef markdown-code-runner numthreads unidep`
114114

115115
📝 Found local dependencies: {'setup_py_project': ['hatch_project', 'setuptools_project']}
116116

117-
📦 Installing project with `/opt/hostedtoolcache/Python/3.12.8/x64/bin/python -m pip install --no-deps -e /home/runner/work/unidep/unidep/example/hatch_project -e /home/runner/work/unidep/unidep/example/setuptools_project -e ./setup_py_project`
117+
📦 Installing project with `/opt/hostedtoolcache/Python/3.13.1/x64/bin/python -m pip install --no-deps -e /home/runner/work/unidep/unidep/example/hatch_project -e /home/runner/work/unidep/unidep/example/setuptools_project -e ./setup_py_project`
118118

119119
```
120120

@@ -157,11 +157,11 @@ unidep install-all -e
157157
$ unidep install-all -e --dry-run
158158
📦 Installing conda dependencies with `conda install --yes --override-channels --channel conda-forge adaptive-scheduler numpy">=1.21" hpc05 pandas">=1,<3" pexpect adaptive">=0.15.0, <2.0.0" pfapack packaging pytest pytest-cov`
159159

160-
📦 Installing pip dependencies with `/opt/hostedtoolcache/Python/3.12.8/x64/bin/python -m pip install unidep markdown-code-runner numthreads yaml2bib rsync-time-machine slurm-usage pyyaml aiokef`
160+
📦 Installing pip dependencies with `/opt/hostedtoolcache/Python/3.13.1/x64/bin/python -m pip install unidep markdown-code-runner numthreads yaml2bib rsync-time-machine slurm-usage pyyaml aiokef`
161161

162162
📝 Found local dependencies: {'pyproject_toml_project': ['hatch_project'], 'setup_py_project': ['hatch_project', 'setuptools_project'], 'setuptools_project': ['hatch_project']}
163163

164-
📦 Installing project with `/opt/hostedtoolcache/Python/3.12.8/x64/bin/python -m pip install --no-deps -e ./hatch2_project -e ./hatch_project -e ./pyproject_toml_project -e ./setup_py_project -e ./setuptools_project`
164+
📦 Installing project with `/opt/hostedtoolcache/Python/3.13.1/x64/bin/python -m pip install --no-deps -e ./hatch2_project -e ./hatch_project -e ./pyproject_toml_project -e ./setup_py_project -e ./setuptools_project`
165165

166166
```
167167

tests/test_version_conflicts.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def test_is_valid_pinning(operator: str, version: str) -> None:
6060
([">0.0.1", "<2", "=1.0.0"], "=1.0.0"),
6161
([">1", "<=3", "<4"], ">1,<=3"),
6262
([">1", "<=3"], ">1,<=3"),
63-
# TODO #67: !=5 should be removed but this is not yet implemented # noqa: TD004, FIX002, TD003
63+
# TODO #67: !=5 should be removed but this is not yet implemented # noqa: TD004, FIX002
6464
# However, this is not a problem here because !=5 is redundant
6565
# as it is outside the range of >1 and <=3
6666
([">1", "<=3", "!=5"], ">1,<=3,!=5"),

0 commit comments

Comments
 (0)