Solve upgrade can create incompatible dependency versions in lock file + other bugs

.github/ISSUE_TEMPLATE/Feature_request.md

@@ -5,7 +5,7 @@ about: Suggest an idea for this project
 
 Be sure to check the existing issues (both open and closed!), and make sure you are running the latest version of Pipenv.
 
-Check the [diagnose documentation](https://pipenv.pypa.io/en/latest/diagnose/) for common issues and the [PEEP list](https://github.com/pypa/pipenv/blob/master/peeps/) before posting! We may close your issue if it is very similar to one of them. Please be considerate and follow the PEEP process, or be on your way.
+Check the [diagnose documentation](https://pipenv.pypa.io/en/latest/diagnose/) for common issues as well as the GitHub Issues page.
 
 Make sure to mention your debugging experience if the documented solution failed.
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -7,9 +7,7 @@ What is the thing you want to fix? Is it associated with an issue on GitHub? Ple
 
 Always consider opening an issue first to describe your problem, so we can discuss what is the best way to amend it.  Note that if you do not describe the goal of this change or link to a related issue, the maintainers may close the PR without further review.
 
-If your pull request makes a non-insignificant change to Pipenv, such as the user interface or intended functionality, please file a PEEP.
-
-    https://github.com/pypa/pipenv/blob/master/peeps/PEEP-000.md
+If your pull request makes a significant change to Pipenv, such as the user interface or intended functionality, please open a discussion or issue report first.
 
 ### The fix
 

.github/workflows/ci.yaml

@@ -22,7 +22,6 @@ on:
       - "**/*.txt"
       - "examples/**"
       - "news/**"
-      - "peeps/**"
     branches:
       - main
   pull_request:
@@ -36,7 +35,6 @@ on:
       - "**/*.txt"
       - "examples/**"
       - "news/**"
-      - "peeps/**"
 permissions:
   contents: read # to fetch code (actions/checkout)
 jobs:

MANIFEST.in

@@ -23,7 +23,6 @@ recursive-include docs/_templates *.html
 recursive-include docs/_static *.js *.css *.png
 recursive-exclude tests/test_artifacts *.pyd *.so *.pyc *.egg-info PKG-INFO
 
-prune peeps
 prune .azure-pipelines
 prune .github
 prune pipenv/vendor/importlib_metadata/tests

news/6281.bugfix.rst

@@ -0,0 +1,18 @@
+Fix dependency resolution edge cases and versioning constraints handling:
+* Allow JSON format options for ``--reverse`` dependency graph output matching pipdeptree
+* Improve installation and upgrade routines to better handle dependencies
+* Add ability to specify json output as pipdeptree does
+* Add more consistent handling of VCS dependencies and references
+* Fix synchronization of development and default dependencies during updates
+* Ensure proper propagation of version constraints during updates
+* Fix handling of ``~=`` and other version specifiers during updates
+
+Key Changes:
+* Improved reverse dependency analysis to catch conflicts earlier in resolution
+* Better handling of VCS package lock data, preserving refs and subdirectories
+* Fixed issue where VCS references could be lost in lock file when installed via commit hash
+* Better handling of pipfile categories during installation and updates
+* Corrected logic for development dependency resolution and constraint propagation
+* Improved validation and preservation of version specifiers during updates
+
+This improves stability when working with complex dependency trees and version constraints.

pipenv/cli/command.py

@@ -219,7 +219,7 @@ def install(state, **kwargs):
         editable_packages=state.installstate.editables,
         site_packages=state.site_packages,
         extra_pip_args=state.installstate.extra_pip_args,
-        categories=state.installstate.categories,
+        pipfile_categories=state.installstate.categories,
         skip_lock=state.installstate.skip_lock,
     )