Merge branch 'main' of github.com:pypa/pipenv

Author: matteius

README.md

@@ -150,35 +150,36 @@ Magic shell completions are now enabled!
 ☤ Usage
 -------
 
-   $ pipenv --help
-   Usage: pipenv [OPTIONS] COMMAND [ARGS]...
-
-   Options:
-     --where                         Output project home information.
-     --venv                          Output virtualenv information.
-     --py                            Output Python interpreter information.
-     --envs                          Output Environment Variable options.
-     --rm                            Remove the virtualenv.
-     --bare                          Minimal output.
-     --man                           Display manpage.
-     --support                       Output diagnostic information for use in
-                                     GitHub issues.
-     --site-packages / --no-site-packages
-                                     Enable site-packages for the virtualenv.
-                                     [env var: PIPENV_SITE_PACKAGES]
-     --python TEXT                   Specify which version of Python virtualenv
-                                     should use.
-     --three                         Use Python 3 when creating virtualenv.
-     --clear                         Clears caches (pipenv, pip).  [env var:
-                                     PIPENV_CLEAR]
-     -q, --quiet                     Quiet mode.
-     -v, --verbose                   Verbose mode.
-     --pypi-mirror TEXT              Specify a PyPI mirror.
-     --version                       Show the version and exit.
-     -h, --help                      Show this message and exit.
+    $ pipenv --help
+    Usage: pipenv [OPTIONS] COMMAND [ARGS]...
+
+    Options:
+      --where                         Output project home information.
+      --venv                          Output virtualenv information.
+      --py                            Output Python interpreter information.
+      --envs                          Output Environment Variable options.
+      --rm                            Remove the virtualenv.
+      --bare                          Minimal output.
+      --man                           Display manpage.
+      --support                       Output diagnostic information for use in
+                                      GitHub issues.
+      --site-packages / --no-site-packages
+                                      Enable site-packages for the virtualenv.
+                                      [env var: PIPENV_SITE_PACKAGES]
+      --python TEXT                   Specify which version of Python virtualenv
+                                      should use.
+      --three                         Use Python 3 when creating virtualenv.
+      --clear                         Clears caches (pipenv, pip).  [env var:
+                                      PIPENV_CLEAR]
+      -q, --quiet                     Quiet mode.
+      -v, --verbose                   Verbose mode.
+      --pypi-mirror TEXT              Specify a PyPI mirror.
+      --version                       Show the version and exit.
+      -h, --help                      Show this message and exit.
 
 
    Usage Examples:
+
       Create a new project using Python 3.7, specifically:
       $ pipenv --python 3.7
 
@@ -204,22 +205,23 @@ Magic shell completions are now enabled!
       $ pipenv run pip freeze
 
    Commands:
-     check         Checks for PyUp Safety security vulnerabilities and against
-                   PEP 508 markers provided in Pipfile.
-     clean         Uninstalls all packages not specified in Pipfile.lock.
-     graph         Displays currently-installed dependency graph information.
-     install       Installs provided packages and adds them to Pipfile, or (if no
-                   packages are given), installs all packages from Pipfile.
-     lock          Generates Pipfile.lock.
-     open          View a given module in your editor.
-     requirements  Generate a requirements.txt from Pipfile.lock.
-     run           Spawns a command installed into the virtualenv.
-     scripts       Lists scripts in current environment config.
-     shell         Spawns a shell within the virtualenv.
-     sync          Installs all packages specified in Pipfile.lock.
-     uninstall     Uninstalls a provided package and removes it from Pipfile.
-     update        Runs lock, then sync.
-     verify        Verify the hash in Pipfile.lock is up-to-date.
+
+      check         Checks for PyUp Safety security vulnerabilities and against
+                    PEP 508 markers provided in Pipfile.
+      clean         Uninstalls all packages not specified in Pipfile.lock.
+      graph         Displays currently-installed dependency graph information.
+      install       Installs provided packages and adds them to Pipfile, or (if no
+                    packages are given), installs all packages from Pipfile.
+      lock          Generates Pipfile.lock.
+      open          View a given module in your editor.
+      requirements  Generate a requirements.txt from Pipfile.lock.
+      run           Spawns a command installed into the virtualenv.
+      scripts       Lists scripts in current environment config.
+      shell         Spawns a shell within the virtualenv.
+      sync          Installs all packages specified in Pipfile.lock.
+      uninstall     Uninstalls a provided package and removes it from Pipfile.
+      update        Runs lock, then sync.
+      verify        Verify the hash in Pipfile.lock is up-to-date.
 
 
 Locate the project:

news/5296.bugfix.rst

@@ -0,0 +1 @@
+Fix an issue when using ``pipenv install --system`` on systems that having the ``python`` executable pointing to Python 2 and a Python 3 executable being ``python3``.

news/5299.bugfix.rst

@@ -0,0 +1 @@
+Sorting ``constraints`` before resolving, which fixes ``pipenv lock`` generates nondeterminism environment markers.

pipenv/utils/resolver.py

@@ -647,6 +647,7 @@ def constraints(self):
             # Only use default_constraints when installing dev-packages
             if self.dev:
                 self._constraints += self.default_constraints
+            self._constraints.sort(key=lambda ireq: ireq.name)
         return self._constraints
 
     @contextlib.contextmanager

pipenv/utils/shell.py

@@ -445,7 +445,7 @@ def project_python(project, system=False):
     if not system:
         python = project._which("python")
     else:
-        interpreters = [system_which(p) for p in ("python", "python3")]
+        interpreters = [system_which(p) for p in ("python3", "python")]
         interpreters = [i for i in interpreters if i]  # filter out not found interpreters
         python = interpreters[0] if interpreters else None
     if not python:

tests/unit/test_utils.py

@@ -458,3 +458,17 @@ def test_invalid_prepare_pip_source_args(self):
         sources = [{}]
         with pytest.raises(PipenvUsageError):
             indexes.prepare_pip_source_args(sources, pip_args=None)
+
+    @pytest.mark.utils
+    def test_project_python_tries_python3_before_python_if_system_is_true(self):
+        def mock_shutil_which(command, path=None):
+            if command != "python3":
+                return f"/usr/bin/{command}"
+            return "/usr/local/bin/python3"
+
+        with mock.patch("pipenv.utils.shell.shutil.which", wraps=mock_shutil_which):
+            # Setting project to None as system=True doesn't use it
+            project = None
+            python = shell.project_python(project, system=True)
+
+        assert python == "/usr/local/bin/python3"