Upgrade embeded setuptools and fix changelog (#1865)

Signed-off-by: Bernat Gabor <bgabor8@bloomberg.net>

docs/_static/custom.css

@@ -50,6 +50,7 @@ div[class*="highlight-"] {
 
 #release-history ul ul {
     margin-bottom: 0;
+    margin-top: 0;
 }
 
 #release-history h2 {

docs/changelog/1821.doc.rst

@@ -1 +1 @@
-Document how bundled wheels are handled and (potentially automatically) kept up to date - by :user:`gaborbernat`.
+How seeding mechanisms discover (and automatically keep it up to date) wheels at :ref:`wheels` - by :user:`gaborbernat`.

docs/changelog/1821.feature.rst

@@ -1,8 +1,7 @@
-Better handling of bundled wheel installation:
+Ensure that the seeded packages do not get too much out of date:
 
-- display the installed seed package versions in the final summary output
-- add a manual upgrade of embedded wheels feature via :option:`upgrade-embed-wheels` CLI flag
-- periodically (once every 14 days) try to automatically upgrade the embedded wheels in the background, can be disabled
-  via :option:`no-periodic-update`
+- add a CLI flag that triggers upgrade of embedded wheels under :option:`upgrade-embed-wheels`
+- periodically (once every 14 days) upgrade the embedded wheels in a background process, and use them if they have been
+  released for more than 28 days (can be disabled via :option:`no-periodic-update`)
 
-by :user:`gaborbernat`.
+More details under :ref:`wheels` - by :user:`gaborbernat`.

docs/changelog/1840.doc.rst

@@ -0,0 +1 @@
+How distributions should handle shipping their own embedded wheels at  :ref:`distribution_wheels` - by :user:`gaborbernat`.

docs/changelog/1841.feature.rst

@@ -1,7 +1,6 @@
-Bump embed wheel content:
+Upgrade embed wheel content:
 
-- ship wheels for Python ``3.9``
-- upgrade embedded setuptools for Python ``3.5+`` from ``46.4.0`` to ``47.1.1``
-- upgrade embedded setuptools for Python ``2.7`` from ``44.1.0`` to ``44.1.1``
+- ship wheels for Python ``3.9`` and ``3.10``
+- upgrade setuptools for Python ``3.5+`` from ``47.1.1`` to ``47.3.1``
 
 by :user:`gaborbernat`.

docs/changelog/1864.feature.rst

@@ -0,0 +1,10 @@
+Display the installed seed package versions in the final summary output, for example:
+
+.. code-block:: console
+
+    created virtual environment CPython3.8.3.final.0-64 in 350ms
+      creator CPython3Posix(dest=/x, clear=True, global=False)
+      seeder FromAppData(download=False, pip=bundle, setuptools=bundle, wheel=bundle, via=copy, app_data_dir=/y/virtualenv)
+        added seed packages: pip==20.1.1, setuptools==47.3.1, wheel==0.34.2
+
+by :user:`gaborbernat`.

docs/cli_interface.rst

@@ -76,7 +76,7 @@ is used to separate the values:
 
 .. code-block:: console
 
-  env VIRTUALENV_EXTRA_SEARCH_DIR="/path/to/dists\n/path/to/other/dists" virtualenv
+  env VIRTUALENV_EXTRA_SEARCH_DIR=/path/to/dists\n/path/to/other/dists virtualenv
 
 The equivalent CLI-flags based invocation, for the above example, would be:
 

docs/user_guide.rst

@@ -131,6 +131,8 @@ main seed mechanism available:
   To override the filesystem location of the seed cache, one can use the
   ``VIRTUALENV_OVERRIDE_APP_DATA`` environment variable.
 
+.. _wheels:
+
 Wheels
 ~~~~~~
 
@@ -174,6 +176,8 @@ When searching for a wheel to use virtualenv performs lookup in the following or
 Bundled wheels are all three above together. If neither of the locations contain the requested wheel version or
 :option:`download` option is set will use ``pip`` download to load the latest version available from the index server.
 
+.. _distribution_wheels:
+
 Embed wheels for distributions
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

src/virtualenv/seed/wheels/embed/__init__.py

@@ -7,32 +7,32 @@ BUNDLE_FOLDER = Path(__file__).absolute().parent
 BUNDLE_SUPPORT = {
     "3.10": {
         "pip": "pip-20.1.1-py2.py3-none-any.whl",
-        "setuptools": "setuptools-47.1.1-py3-none-any.whl",
+        "setuptools": "setuptools-47.3.1-py3-none-any.whl",
         "wheel": "wheel-0.34.2-py2.py3-none-any.whl",
     },
     "3.9": {
         "pip": "pip-20.1.1-py2.py3-none-any.whl",
-        "setuptools": "setuptools-47.1.1-py3-none-any.whl",
+        "setuptools": "setuptools-47.3.1-py3-none-any.whl",
         "wheel": "wheel-0.34.2-py2.py3-none-any.whl",
     },
     "3.8": {
         "pip": "pip-20.1.1-py2.py3-none-any.whl",
-        "setuptools": "setuptools-47.1.1-py3-none-any.whl",
+        "setuptools": "setuptools-47.3.1-py3-none-any.whl",
         "wheel": "wheel-0.34.2-py2.py3-none-any.whl",
     },
     "3.7": {
         "pip": "pip-20.1.1-py2.py3-none-any.whl",
-        "setuptools": "setuptools-47.1.1-py3-none-any.whl",
+        "setuptools": "setuptools-47.3.1-py3-none-any.whl",
         "wheel": "wheel-0.34.2-py2.py3-none-any.whl",
     },
     "3.6": {
         "pip": "pip-20.1.1-py2.py3-none-any.whl",
-        "setuptools": "setuptools-47.1.1-py3-none-any.whl",
+        "setuptools": "setuptools-47.3.1-py3-none-any.whl",
         "wheel": "wheel-0.34.2-py2.py3-none-any.whl",
     },
     "3.5": {
         "pip": "pip-20.1.1-py2.py3-none-any.whl",
-        "setuptools": "setuptools-47.1.1-py3-none-any.whl",
+        "setuptools": "setuptools-47.3.1-py3-none-any.whl",
         "wheel": "wheel-0.34.2-py2.py3-none-any.whl",
     },
     "3.4": {