Commit Graph

9079 Commits

Author SHA1 Message Date
Matt Davis b5fb36c717 possible nice to have detect its a git URL 2025-03-20 19:27:18 -04:00
Oz Tiram f1ec23da75 Merge pull request #6352 from pypa/remove-click-echo-utils
Remove click echo from utils
2025-03-20 21:39:20 +01:00
Oz Tiram ffbe755169 fix: correct error message specifying python version required
Signed-off-by: Oz Tiram <oz.tiram@gmail.com>
2025-03-10 09:22:31 +01:00
Oz Tiram 228129f6e1 fix: formatting with spaces in environment.py
Signed-off-by: Oz Tiram <oz.tiram@gmail.com>
2025-03-10 09:18:27 +01:00
Oz Tiram b66ecd30cb fix: formatting of error message in project.py
Signed-off-by: Oz Tiram <oz.tiram@gmail.com>
2025-03-10 09:15:43 +01:00
Oz Tiram 6f8d34b3a3 fix: correct variable name in project.py
Signed-off-by: Oz Tiram <oz.tiram@gmail.com>
2025-03-10 09:14:41 +01:00
Oz Tiram a5a6069246 chore: bump pypi-server version to 2.3.2 (#6353)
* chore: bump pypi-server version to 2.3.2

This version supports modern python versions

Signed-off-by: Oz Tiram <oz.tiram@gmail.com>

* chore: pin dev dependencies

These were breaking on python3.8 which is now EOL.

Signed-off-by: Oz Tiram <oz.tiram@gmail.com>

* fix: attempt checking which pypi-server is installed

Signed-off-by: Oz Tiram <oz.tiram@gmail.com>

* ci: don't run pypi-server via pipenv

Signed-off-by: Oz Tiram <oz.tiram@gmail.com>

* ci: simplify pipeline

Signed-off-by: Oz Tiram <oz.tiram@gmail.com>

* ci: work around issue with pypi-server and older python

It failes to start with:

usage: pypi-server run [-h] [-v] [--log-file FILE] [--log-stream STREAM]
[--log-frmt FORMAT] [--hash-algo HASH_ALGO]
[--backend {auto,simple-dir,cached-dir}] [--version]
[-p PORT] [-i HOST] [-a AUTHENTICATE]
[-P PASSWORD_FILE] [--disable-fallback]
[--fallback-url FALLBACK_URL]
[--health-endpoint HEALTH_ENDPOINT] [--server METHOD]
[-o] [--welcome HTML_FILE] [--cache-control AGE]
[--log-req-frmt FORMAT] [--log-res-frmt FORMAT]
[--log-err-frmt FORMAT]
[package_directory ...]
pypi-server run: error: argument --welcome: invalid html_file_arg value:
'pypiserver/welcome.html'

But only on those versions.

Signed-off-by: Oz Tiram <oz.tiram@gmail.com>

* ci: on windows also conditionally use pipenv with pypi-server

Signed-off-by: Oz Tiram <oz.tiram@gmail.com>

* ci: windows worker have default powershell

Signed-off-by: Oz Tiram <oz.tiram@gmail.com>

* ci: revert usage of power shell

Signed-off-by: Oz Tiram <oz.tiram@gmail.com>

* ci: add installation of gunicorn and waitress

Signed-off-by: Oz Tiram <oz.tiram@gmail.com>

---------

Signed-off-by: Oz Tiram <oz.tiram@gmail.com>
2025-03-09 08:38:14 -04:00
Matt Davis 5dce6f6566 Merge pull request #6357 from pypa/fix-6340
fix: UnboundLocalError on pipenv graph
2025-03-09 01:25:44 -05:00
Oz Tiram 2037ed6b0d fix: UnboundLocalError on pipenv graph
If we can't use pipenv graph, we should not let RuntimeError
slip away silently until it hits UnboundLocalError: cannot access local
variable 'python_path'.

Fix #6340.

Signed-off-by: Oz Tiram <oz.tiram@gmail.com>
2025-03-08 22:48:56 +01:00
Oz Tiram 96b33fe405 fix: failing test because of rich vs click API
Signed-off-by: Oz Tiram <oz.tiram@gmail.com>
2025-03-06 13:15:06 +01:00
Oz Tiram 3ce259bf18 chore: remove click.echo from pipenv/utils/environment.py
Signed-off-by: Oz Tiram <oz.tiram@gmail.com>
2025-03-06 12:51:50 +01:00
Oz Tiram 985732f314 chore: remove click from pipenv/utils/processes.py
Signed-off-by: Oz Tiram <oz.tiram@gmail.com>
2025-03-06 12:48:43 +01:00
Oz Tiram ecd677f779 chore: remove click.echo from pipenv/utils/project.py
Signed-off-by: Oz Tiram <oz.tiram@gmail.com>
2025-03-06 12:42:50 +01:00
Oz Tiram 62f75c59e7 Merge pull request #6351 from pypa/drop-py3.8
Drop py3.8
2025-03-06 09:13:37 +01:00
Oz Tiram b00148e750 Merge pull request #6349 from gautambhat/main
Fix typo in documentation for PIPENV_CACHE_DIR
2025-03-05 23:40:25 +01:00
Oz Tiram 9aac5e3522 chore: fix ruff linting
Signed-off-by: Oz Tiram <oz.tiram@gmail.com>
2025-03-05 23:39:17 +01:00
Gautam Bhat 1f9dbee1cf Update environments.py
its*
2025-02-25 15:36:08 -08:00
Oz Tiram c7d6df4685 ci: update pre-commit hook pyproject-fmt
Signed-off-by: Oz Tiram <oz.tiram@gmail.com>
2025-01-22 21:52:23 +01:00
Oz Tiram 33f8e7592b chore: drop python3.8
Signed-off-by: Oz Tiram <oz.tiram@gmail.com>
2025-01-22 21:51:50 +01:00
Oz Tiram 46bc4ef3b4 docs: update RELEASING.md 2025-01-22 21:37:43 +01:00
Oz Tiram afde9b4773 Release v2024.4.1 v2024.4.1 2025-01-22 21:35:40 +01:00
Oz Tiram e9d3fd4e47 Bumped version to 2024.4.1.
Signed-off-by: Oz Tiram <oz.tiram@gmail.com>
2025-01-22 21:35:24 +01:00
Oz Tiram f9feb00543 Merge pull request #6338 from pypa/better-error-messaeg-on-resolution-failure-6336
fix: when a resolution is failed show a helpful error
2025-01-19 22:42:56 +01:00
Oz Tiram b4d5d1f7ef fix: correct the exception raise
fixes the failing test!

Signed-off-by: Oz Tiram <oz.tiram@gmail.com>
2025-01-19 22:10:15 +01:00
Oz Tiram 5701434f41 fix: when a resolution is failed show a helpful error
Also, exist the program immediately.

For example:
```
 $ pipenv install bottle==0.16.0
 Installing bottle==0.16.0...
 ✔ Installation Succeeded
 Installing dependencies from Pipfile.lock (2110f5)...
 All dependencies are now up-to-date!
 Upgrading bottle==0.16.0 in  dependencies.
 Building requirements...
 Resolving dependencies...
 ✘ Locking Failed!
 ⠼ Locking
 packages...CRITICAL:pipenv.patched.pip._internal.resolution.resolvelib.factory:Could
 not find a version that satisfies the requirement bottle==0.16.0 (from
 versions: 0.4.3, 0.4.4, 0.4.6, 0.4.7, 0.4.8, 0.4.9, 0.4.10, 0.4.11,
 0.4.12, 0.4.13, 0.4.14,
 0.5.3, 0.5.4, 0.5.6, 0.5.7, 0.5.8, 0.6.0, 0.6.1, 0.6.2, 0.6.3, 0.6.4,
 0.6.5, 0.6.6, 0.8.1, 0.8.2, 0.8.3, 0.8.4, 0.8.5, 0.9.1, 0.9.2, 0.9.3,
 0.9.4, 0.9.5, 0.9.6, 0.9.7, 0.9.8, 0.10.1, 0.10.2, 0.10.3, 0.10.4,
 0.10.5, 0.10.6, 0.10.7,
 0.10.8, 0.10.9, 0.10.10, 0.10.11, 0.10.12, 0.11.1, 0.11.2, 0.11.3,
 0.11.4, 0.11.5, 0.11.6, 0.11.7, 0.12.1, 0.12.2, 0.12.3, 0.12.4, 0.12.5,
 0.12.6, 0.12.7, 0.12.8, 0.12.9, 0.12.10, 0.12.11, 0.12.12, 0.12.13,
 0.12.14, 0.12.15, 0.12.16,
 0.12.17, 0.12.18, 0.12.19, 0.12.20, 0.12.21, 0.12.22, 0.12.23, 0.12.24,
 0.12.25, 0.13.0, 0.13.1, 0.13.2)
 [ResolutionFailure]:   File
 "/home/oznt/Software/pypa/pipenv/pipenv/resolver.py", line 451, in main
 [ResolutionFailure]:       _main(
 [ResolutionFailure]:   File
 "/home/oznt/Software/pypa/pipenv/pipenv/resolver.py", line 436, in
 _main
 [ResolutionFailure]:       resolve_packages(
 [ResolutionFailure]:   File
 "/home/oznt/Software/pypa/pipenv/pipenv/resolver.py", line 400, in
 resolve_packages
 [ResolutionFailure]:       results, resolver = resolve_deps(
 [ResolutionFailure]:       ^^^^^^^^^^^^^
 [ResolutionFailure]:   File
 "/home/oznt/Software/pypa/pipenv/pipenv/utils/resolver.py", line 971,
 in resolve_deps
 [ResolutionFailure]:       results, hashes, internal_resolver =
 actually_resolve_deps(
 [ResolutionFailure]:       ^^^^^^^^^^^^^^^^^^^^^^
 [ResolutionFailure]:   File
 "/home/oznt/Software/pypa/pipenv/pipenv/utils/resolver.py", line 735,
 in actually_resolve_deps
 [ResolutionFailure]:       resolver.resolve()
 [ResolutionFailure]:   File
 "/home/oznt/Software/pypa/pipenv/pipenv/utils/resolver.py", line 460,
 in resolve
 [ResolutionFailure]:       raise ResolutionFailure(message=e)
 Your dependencies could not be resolved. You likely have a mismatch in
 your sub-dependencies.
 You can use $ pipenv run pip install <requirement_name> to bypass this
 mechanism, then run $ pipenv graph to inspect the versions actually
 installed in the virtualenv.
 Hint: try $ pipenv lock --pre if it is a pre-release dependency.
 ERROR: No matching distribution found for bottle==0.16.0
```

Or:

```
oznt@gentoo:/tmp/bla |pipenv-H8EVR25f| $ pipenv install noSuchDog
Installing noSuchDog...
✔ Installation Succeeded
Installing dependencies from Pipfile.lock (2110f5)...
All dependencies are now up-to-date!
Upgrading noSuchDog in  dependencies.
Building requirements...
Resolving dependencies...
✘ Locking Failed!
⠹ Locking
packages...CRITICAL:pipenv.patched.pip._internal.resolution.resolvelib.factory:Could
not find a version that satisfies the requirement nosuchdog (from
versions: none)
[ResolutionFailure]:   File
"/home/oznt/Software/pypa/pipenv/pipenv/resolver.py", line 451, in main
[ResolutionFailure]:       _main(
[ResolutionFailure]:   File
"/home/oznt/Software/pypa/pipenv/pipenv/resolver.py", line 436, in _main
[ResolutionFailure]:       resolve_packages(
[ResolutionFailure]:   File
"/home/oznt/Software/pypa/pipenv/pipenv/resolver.py", line 400, in
resolve_packages
[ResolutionFailure]:       results, resolver = resolve_deps(
[ResolutionFailure]:       ^^^^^^^^^^^^^
[ResolutionFailure]:   File
"/home/oznt/Software/pypa/pipenv/pipenv/utils/resolver.py", line 971, in
resolve_deps
[ResolutionFailure]:       results, hashes, internal_resolver =
actually_resolve_deps(
[ResolutionFailure]:       ^^^^^^^^^^^^^^^^^^^^^^
[ResolutionFailure]:   File
"/home/oznt/Software/pypa/pipenv/pipenv/utils/resolver.py", line 735, in
actually_resolve_deps
[ResolutionFailure]:       resolver.resolve()
[ResolutionFailure]:   File
"/home/oznt/Software/pypa/pipenv/pipenv/utils/resolver.py", line 460, in
resolve
[ResolutionFailure]:       raise ResolutionFailure(message=e)
Your dependencies could not be resolved. You likely have a mismatch in
your sub-dependencies.
You can use $ pipenv run pip install <requirement_name> to bypass this
mechanism, then run $ pipenv graph to inspect the versions actually
installed in the virtualenv.
Hint: try $ pipenv lock --pre if it is a pre-release dependency.
ERROR: No matching distribution found for nosuchdog
```

Signed-off-by: Oz Tiram <oz.tiram@gmail.com>
2025-01-19 21:49:20 +01:00
Oz Tiram 94c9658468 Merge pull request #6335 from pypa/fix-6326
fix: correct printing of errors
2025-01-14 23:13:38 +01:00
Oz Tiram 69d23318d8 fix: disable printing resolver verbose
The resolver does not have any output, and it
just printed a weired "False" which was hard to
grasp.

Signed-off-by: Oz Tiram <oz.tiram@gmail.com>
2025-01-14 22:40:48 +01:00
Oz Tiram 13c13ed781 fix: correct printing of errors
Instead of printing err (which is a handle to rich formatter)
we print errors - which are the real output of the failed command.

Signed-off-by: Oz Tiram <oz.tiram@gmail.com>
2025-01-10 09:01:39 +01:00
Oz Tiram f15af7e574 Merge pull request #6334 from pypa/bump-ruff
ci: bump ruff in pre-commit
2025-01-10 09:01:05 +01:00
Oz Tiram 29fa24b9fb fix: remove duplicate noqa directives
Signed-off-by: Oz Tiram <oz.tiram@gmail.com>
2025-01-10 08:59:19 +01:00
Oz Tiram b6fc7d8665 chore: fix ruff linting (ignore extract keys without items)
Signed-off-by: Oz Tiram <oz.tiram@gmail.com>
2025-01-09 21:31:27 +01:00
Oz Tiram 71d584086c chore: fix ruff linting
Signed-off-by: Oz Tiram <oz.tiram@gmail.com>
2025-01-09 21:27:20 +01:00
Oz Tiram 68aa4afa89 chore: fix ruff linting
Signed-off-by: Oz Tiram <oz.tiram@gmail.com>
2025-01-09 21:21:06 +01:00
Oz Tiram cdaadc9963 ci: bump ruff in pre-commit
Signed-off-by: Oz Tiram <oz.tiram@gmail.com>
2025-01-09 21:12:51 +01:00
Oz Tiram 5bd54bd094 Merge pull request #6321 from socram8888/fix-shell-repr
Fix repr(Shell)
2024-12-30 23:07:38 +01:00
Oz Tiram d796a526f9 Merge pull request #6319 from shdarrina/pwsh-activate-macos
Fix activate path for pwsh on MacOS
2024-12-30 23:03:35 +01:00
Darrin Allred 7c085c14da Merge branch 'main' into pwsh-activate-macos 2024-12-30 14:55:19 -07:00
Oz Tiram 307505d913 Merge pull request #6329 from samer-shah/fix_licence_declaration
Fix license declaration
2024-12-19 14:00:46 +01:00
samerabushah d45d37e84b Add news file 2024-12-18 21:59:02 +01:00
samerabushah 68d97cdfcb Fix licence declaration 2024-12-18 21:53:52 +01:00
Oz Tiram 847b42f9bb Merge pull request #6327 from samer-shah/fix_running_pipenv_shell
Fix File path by removing the dot
2024-12-16 04:54:19 +01:00
samerabushah ec3a813ba4 add news file 2024-12-15 19:10:18 +01:00
samerabushah 356ecd3dd7 Fix xpath syntax by removing the dot 2024-12-15 16:43:54 +01:00
Oz Tiram c4c1f76b7a Merge pull request #6315 from shaneikennedy/ignore-example-on-build 2024-12-11 19:06:10 +00:00
Aiden Cullo 739b90c63e remove unused CacheError 2024-12-10 22:58:40 +01:00
Aiden Cullo 8ffd983ecf replace click.style in InstallError 2024-12-10 22:58:40 +01:00
Aiden Cullo 4e4f28cb50 replace click.style in UninstallError 2024-12-10 22:58:40 +01:00
Aiden Cullo 4354eb7d52 replace click.style in SystemUsageError 2024-12-10 22:58:40 +01:00
Aiden Cullo 6de18f5bd6 replace click.style in DeployException exception 2024-12-10 22:58:40 +01:00
Aiden Cullo fa4d2b4043 replace click.style in LockfileNotFound exception 2024-12-10 22:58:40 +01:00