Merge branch 'main' into more-vendor-clean-up

pypa · Nov 4, 2022 · e8e391f · e8e391f
2 parents 6f88313 + 2049648
commit e8e391f
Show file tree

Hide file tree

Showing 13 changed files with 193 additions and 86 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,3 +1,25 @@
+2022.10.25 (2022-10-25)
+=======================
+Pipenv 2022.10.25 (2022-10-25)
+==============================
+
+
+Features & Improvements
+-----------------------
+
+- Add support to export requirements file for a specified set of categories.  `#5431 <https://github.com/pypa/pipenv/issues/5431>`_
+
+Vendored Libraries
+------------------
+
+- Remove appdirs.py in favor of platformdirs.  `#5420 <https://github.com/pypa/pipenv/issues/5420>`_
+
+Removals and Deprecations
+-------------------------
+
+- Remove usage of vistir.cmdparse in favor of pipenv.cmdparse  `#5419 <https://github.com/pypa/pipenv/issues/5419>`_
+
+
 2022.10.12 (2022-10-12)
 =======================
 Pipenv 2022.10.12 (2022-10-12)

diff --git a/docs/advanced.rst b/docs/advanced.rst
@@ -628,11 +628,17 @@ You can display the names and commands of your shortcuts by running ``pipenv scr
 ☤ Configuration With Environment Variables
 ------------------------------------------
 
-Pipenv comes with a handful of options that can be enabled via shell environment
-variables. To activate them, simply create the variable in your shell and pipenv
-will detect it.
+Pipenv comes with a handful of options that can be set via shell environment
+variables.
 
-.. automodule:: pipenv.environments
+To enable boolean options, create the variable in your shell and assign to it a
+truthy value (i.e. ``"1"``)::
+
+    $ PIPENV_IGNORE_VIRTUALENVS=1
+
+To explicitly disable a boolean option, assign to it a falsey value (i.e. ``"0"``).
+
+.. autoclass:: pipenv.environments.Setting
     :members:
 
 If you'd like to set these environment variables on a per-project basis, I recommend utilizing the fantastic `direnv <https://direnv.net>`_ project, in order to do so.

diff --git a/docs/dev/contributing.rst b/docs/dev/contributing.rst
@@ -110,7 +110,7 @@ Pipenv now uses pre-commit hooks similar to Pip in order to apply linting and
 code formatting automatically!  The build now also checks that these linting rules
 have been applied to the code before running the tests.
 The build will fail when linting changes are detected so be sure to sync dev requirements
-and install the pre-commit hooks locally:
+and install the pre-commit hooks locally::
 
    $ ``pipenv install --dev``
    # This will configure running the pre-commit checks at start of each commit

diff --git a/news/5419.removal.rst b/news/5419.removal.rst
diff --git a/news/5420.vendor.rst b/news/5420.vendor.rst
diff --git a/news/5431.feature.rst b/news/5431.feature.rst
diff --git a/news/5451.feature.rst b/news/5451.feature.rst
@@ -0,0 +1 @@
+Allow pipenv settings to be explicitly disabled more easily by assigning to the environment variable a falsy value.
diff --git a/pipenv/__version__.py b/pipenv/__version__.py
@@ -2,4 +2,4 @@
 #   //   ) ) / / //   ) ) //___) ) //   ) ) ||  / /
 #  //___/ / / / //___/ / //       //   / /  || / /
 # //       / / //       ((____   //   / /   ||/ /
-__version__ = "2022.10.13.dev0"
+__version__ = "2022.10.26.dev0"