From 51bf92f3531b39b91061fd0aa07459d877e9b96a Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Wed, 7 Dec 2022 06:51:42 -0800
Subject: [PATCH 1/6] Add contents to certbot/CHANGELOG.md for next version

---
 certbot/CHANGELOG.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/certbot/CHANGELOG.md b/certbot/CHANGELOG.md
index ad8c3b378..bab56be6e 100644
--- a/certbot/CHANGELOG.md
+++ b/certbot/CHANGELOG.md
@@ -2,6 +2,22 @@
 
 Certbot adheres to [Semantic Versioning](https://semver.org/).
 
+## 2.2.0 - master
+
+### Added
+
+*
+
+### Changed
+
+*
+
+### Fixed
+
+*
+
+More details about these changes can be found on our GitHub repo.
+
 ## 2.1.0 - 2022-12-07
 
 ### Added

From 7240e06613217700375204b0c789c8b711ad95bc Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Wed, 7 Dec 2022 06:51:42 -0800
Subject: [PATCH 2/6] Bump version to 2.2.0

---
 acme/setup.py                       | 2 +-
 certbot-apache/setup.py             | 2 +-
 certbot-compatibility-test/setup.py | 2 +-
 certbot-dns-cloudflare/setup.py     | 2 +-
 certbot-dns-digitalocean/setup.py   | 2 +-
 certbot-dns-dnsimple/setup.py       | 2 +-
 certbot-dns-dnsmadeeasy/setup.py    | 2 +-
 certbot-dns-gehirn/setup.py         | 2 +-
 certbot-dns-google/setup.py         | 2 +-
 certbot-dns-linode/setup.py         | 2 +-
 certbot-dns-luadns/setup.py         | 2 +-
 certbot-dns-nsone/setup.py          | 2 +-
 certbot-dns-ovh/setup.py            | 2 +-
 certbot-dns-rfc2136/setup.py        | 2 +-
 certbot-dns-route53/setup.py        | 2 +-
 certbot-dns-sakuracloud/setup.py    | 2 +-
 certbot-nginx/setup.py              | 2 +-
 certbot/certbot/__init__.py         | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/acme/setup.py b/acme/setup.py
index 816c9c071..f9f16e997 100644
--- a/acme/setup.py
+++ b/acme/setup.py
@@ -3,7 +3,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.1.0'
+version = '2.2.0.dev0'
 
 install_requires = [
     'cryptography>=2.5.0',
diff --git a/certbot-apache/setup.py b/certbot-apache/setup.py
index 168895779..77e65a0b9 100644
--- a/certbot-apache/setup.py
+++ b/certbot-apache/setup.py
@@ -1,7 +1,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.1.0'
+version = '2.2.0.dev0'
 
 install_requires = [
     # We specify the minimum acme and certbot version as the current plugin
diff --git a/certbot-compatibility-test/setup.py b/certbot-compatibility-test/setup.py
index 155b711c4..f31df62aa 100644
--- a/certbot-compatibility-test/setup.py
+++ b/certbot-compatibility-test/setup.py
@@ -1,7 +1,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.1.0'
+version = '2.2.0.dev0'
 
 install_requires = [
     'certbot',
diff --git a/certbot-dns-cloudflare/setup.py b/certbot-dns-cloudflare/setup.py
index 68243da96..01809ad5c 100644
--- a/certbot-dns-cloudflare/setup.py
+++ b/certbot-dns-cloudflare/setup.py
@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.1.0'
+version = '2.2.0.dev0'
 
 install_requires = [
     'cloudflare>=1.5.1',
diff --git a/certbot-dns-digitalocean/setup.py b/certbot-dns-digitalocean/setup.py
index 3ac88d937..7549f2ae7 100644
--- a/certbot-dns-digitalocean/setup.py
+++ b/certbot-dns-digitalocean/setup.py
@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.1.0'
+version = '2.2.0.dev0'
 
 install_requires = [
     'python-digitalocean>=1.11', # 1.15.0 or newer is recommended for TTL support
diff --git a/certbot-dns-dnsimple/setup.py b/certbot-dns-dnsimple/setup.py
index 9e5014a15..a9bc2c8f7 100644
--- a/certbot-dns-dnsimple/setup.py
+++ b/certbot-dns-dnsimple/setup.py
@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.1.0'
+version = '2.2.0.dev0'
 
 install_requires = [
     # This version of lexicon is required to address the problem described in
diff --git a/certbot-dns-dnsmadeeasy/setup.py b/certbot-dns-dnsmadeeasy/setup.py
index 5f1dcc048..aedc145d5 100644
--- a/certbot-dns-dnsmadeeasy/setup.py
+++ b/certbot-dns-dnsmadeeasy/setup.py
@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.1.0'
+version = '2.2.0.dev0'
 
 install_requires = [
     'dns-lexicon>=3.2.1',
diff --git a/certbot-dns-gehirn/setup.py b/certbot-dns-gehirn/setup.py
index d910f6c6f..21df19cb8 100644
--- a/certbot-dns-gehirn/setup.py
+++ b/certbot-dns-gehirn/setup.py
@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.1.0'
+version = '2.2.0.dev0'
 
 install_requires = [
     'dns-lexicon>=3.2.1',
diff --git a/certbot-dns-google/setup.py b/certbot-dns-google/setup.py
index 9d4be37d6..c82ed4fbb 100644
--- a/certbot-dns-google/setup.py
+++ b/certbot-dns-google/setup.py
@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.1.0'
+version = '2.2.0.dev0'
 
 install_requires = [
     'google-api-python-client>=1.5.5',
diff --git a/certbot-dns-linode/setup.py b/certbot-dns-linode/setup.py
index 324e2e6a3..b8a41a926 100644
--- a/certbot-dns-linode/setup.py
+++ b/certbot-dns-linode/setup.py
@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.1.0'
+version = '2.2.0.dev0'
 
 install_requires = [
     'dns-lexicon>=3.2.1',
diff --git a/certbot-dns-luadns/setup.py b/certbot-dns-luadns/setup.py
index d3893e206..c86669077 100644
--- a/certbot-dns-luadns/setup.py
+++ b/certbot-dns-luadns/setup.py
@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.1.0'
+version = '2.2.0.dev0'
 
 install_requires = [
     'dns-lexicon>=3.2.1',
diff --git a/certbot-dns-nsone/setup.py b/certbot-dns-nsone/setup.py
index 09b0e2978..c59a27800 100644
--- a/certbot-dns-nsone/setup.py
+++ b/certbot-dns-nsone/setup.py
@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.1.0'
+version = '2.2.0.dev0'
 
 install_requires = [
     'dns-lexicon>=3.2.1',
diff --git a/certbot-dns-ovh/setup.py b/certbot-dns-ovh/setup.py
index d675cdbae..c1c960581 100644
--- a/certbot-dns-ovh/setup.py
+++ b/certbot-dns-ovh/setup.py
@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.1.0'
+version = '2.2.0.dev0'
 
 install_requires = [
     'dns-lexicon>=3.2.1',
diff --git a/certbot-dns-rfc2136/setup.py b/certbot-dns-rfc2136/setup.py
index 0dc8e79d5..ade155823 100644
--- a/certbot-dns-rfc2136/setup.py
+++ b/certbot-dns-rfc2136/setup.py
@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.1.0'
+version = '2.2.0.dev0'
 
 install_requires = [
     'dnspython>=1.15.0',
diff --git a/certbot-dns-route53/setup.py b/certbot-dns-route53/setup.py
index 0c4425528..f905e818e 100644
--- a/certbot-dns-route53/setup.py
+++ b/certbot-dns-route53/setup.py
@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.1.0'
+version = '2.2.0.dev0'
 
 install_requires = [
     'boto3>=1.15.15',
diff --git a/certbot-dns-sakuracloud/setup.py b/certbot-dns-sakuracloud/setup.py
index 119f3e98c..2e5441794 100644
--- a/certbot-dns-sakuracloud/setup.py
+++ b/certbot-dns-sakuracloud/setup.py
@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.1.0'
+version = '2.2.0.dev0'
 
 install_requires = [
     'dns-lexicon>=3.2.1',
diff --git a/certbot-nginx/setup.py b/certbot-nginx/setup.py
index 84f866a35..8e94a70dc 100644
--- a/certbot-nginx/setup.py
+++ b/certbot-nginx/setup.py
@@ -1,7 +1,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.1.0'
+version = '2.2.0.dev0'
 
 install_requires = [
     # We specify the minimum acme and certbot version as the current plugin
diff --git a/certbot/certbot/__init__.py b/certbot/certbot/__init__.py
index 10874d564..5ff735866 100644
--- a/certbot/certbot/__init__.py
+++ b/certbot/certbot/__init__.py
@@ -1,3 +1,3 @@
 """Certbot client."""
 # version number like 1.2.3a0, must have at least 2 parts, like 1.2
-__version__ = '2.1.0'
+__version__ = '2.2.0.dev0'

From 6b7549bf3aa4e4d122ba0cb8989a559b76040cfe Mon Sep 17 00:00:00 2001
From: Marcel Robitaille <marcelrobitaille11@gmail.com>
Date: Fri, 9 Dec 2022 23:55:07 +0100
Subject: [PATCH 3/6] Add filename to dns_common.py configuration errors
 (#9501)

Fixes #9500

Also print the path to the file with errors for the error "Error parsing credentials configuration" of `dns_common.py`. This makes debugging this error much easier.
---
 certbot/certbot/plugins/dns_common.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/certbot/certbot/plugins/dns_common.py b/certbot/certbot/plugins/dns_common.py
index 9d5b2e614..a8e6a5a4d 100644
--- a/certbot/certbot/plugins/dns_common.py
+++ b/certbot/certbot/plugins/dns_common.py
@@ -272,8 +272,18 @@ class CredentialsConfiguration:
         try:
             self.confobj = configobj.ConfigObj(filename)
         except configobj.ConfigObjError as e:
-            logger.debug("Error parsing credentials configuration: %s", e, exc_info=True)
-            raise errors.PluginError("Error parsing credentials configuration: {0}".format(e))
+            logger.debug(
+                "Error parsing credentials configuration '%s': %s",
+                filename,
+                e,
+                exc_info=True
+            )
+            raise errors.PluginError(
+                "Error parsing credentials configuration '{}': {}".format(
+                    filename,
+                    e
+                )
+            )
 
         self.mapper = mapper
 

From 70a36fdf00b38e873e7551919a1b4aa4d949eb00 Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@users.noreply.github.com>
Date: Mon, 12 Dec 2022 15:48:17 -0800
Subject: [PATCH 4/6] Update dependencies (#9505)

* upgrade dependencies

* forbid old setuptools
---
 tools/oldest_constraints.txt         | 26 +++++++-------
 tools/pinning/current/pyproject.toml | 12 +++++++
 tools/requirements.txt               | 52 ++++++++++++++--------------
 3 files changed, 51 insertions(+), 39 deletions(-)

diff --git a/tools/oldest_constraints.txt b/tools/oldest_constraints.txt
index 1783b0d37..da361cb4d 100644
--- a/tools/oldest_constraints.txt
+++ b/tools/oldest_constraints.txt
@@ -2,11 +2,11 @@
 # that script.
 apacheconfig==0.3.2 ; python_full_version < "3.8.0" and python_version >= "3.7"
 asn1crypto==0.24.0 ; python_full_version >= "3.7.0" and python_full_version < "3.8.0"
-astroid==2.12.12 ; python_full_version >= "3.7.2" and python_full_version < "3.8.0"
+astroid==2.12.13 ; python_full_version >= "3.7.2" and python_full_version < "3.8.0"
 attrs==22.1.0 ; python_version >= "3.7" and python_full_version < "3.8.0"
 boto3==1.15.15 ; python_full_version < "3.8.0" and python_version >= "3.7"
 botocore==1.18.15 ; python_full_version < "3.8.0" and python_version >= "3.7"
-certifi==2022.9.24 ; python_full_version < "3.8.0" and python_version >= "3.7"
+certifi==2022.12.7 ; python_full_version < "3.8.0" and python_version >= "3.7"
 cffi==1.9.1 ; python_full_version < "3.8.0" and python_version >= "3.7"
 chardet==3.0.4 ; python_full_version < "3.8.0" and python_version >= "3.7"
 cloudflare==1.5.1 ; python_full_version < "3.8.0" and python_version >= "3.7"
@@ -23,13 +23,13 @@ dns-lexicon==3.2.1 ; python_full_version < "3.8.0" and python_version >= "3.7"
 dnspython==1.15.0 ; python_full_version < "3.8.0" and python_version >= "3.7"
 exceptiongroup==1.0.4 ; python_version >= "3.7" and python_full_version < "3.8.0"
 execnet==1.9.0 ; python_version >= "3.7" and python_full_version < "3.8.0"
-filelock==3.8.0 ; python_version >= "3.7" and python_full_version < "3.8.0"
+filelock==3.8.2 ; python_version >= "3.7" and python_full_version < "3.8.0"
 funcsigs==0.4 ; python_full_version >= "3.7.0" and python_full_version < "3.8.0"
 future==0.18.2 ; python_full_version < "3.8.0" and python_version >= "3.7"
 google-api-python-client==1.5.5 ; python_full_version < "3.8.0" and python_version >= "3.7"
 httplib2==0.9.2 ; python_full_version < "3.8.0" and python_version >= "3.7"
 idna==2.6 ; python_full_version < "3.8.0" and python_version >= "3.7"
-importlib-metadata==5.0.0 ; python_version >= "3.7" and python_version < "3.8"
+importlib-metadata==5.1.0 ; python_version >= "3.7" and python_version < "3.8"
 iniconfig==1.1.1 ; python_version >= "3.7" and python_full_version < "3.8.0"
 ipaddress==1.0.16 ; python_full_version >= "3.7.0" and python_full_version < "3.8.0"
 isort==5.10.1 ; python_full_version >= "3.7.2" and python_full_version < "3.8.0"
@@ -42,23 +42,23 @@ mypy-extensions==0.4.3 ; python_version >= "3.7" and python_full_version < "3.8.
 mypy==0.991 ; python_version >= "3.7" and python_full_version < "3.8.0"
 ndg-httpsclient==0.3.2 ; python_full_version >= "3.7.0" and python_full_version < "3.8.0"
 oauth2client==4.0.0 ; python_full_version < "3.8.0" and python_version >= "3.7"
-packaging==21.3 ; python_version >= "3.7" and python_full_version < "3.8.0"
+packaging==22.0 ; python_version >= "3.7" and python_full_version < "3.8.0"
 parsedatetime==2.4 ; python_full_version < "3.8.0" and python_version >= "3.7"
 pbr==1.8.0 ; python_full_version >= "3.7.0" and python_full_version < "3.8.0"
 pip==22.3.1 ; python_version >= "3.7" and python_full_version < "3.8.0"
-platformdirs==2.5.4 ; python_full_version < "3.8.0" and python_version >= "3.7"
+platformdirs==2.6.0 ; python_full_version < "3.8.0" and python_version >= "3.7"
 pluggy==1.0.0 ; python_version >= "3.7" and python_full_version < "3.8.0"
 ply==3.4 ; python_full_version < "3.8.0" and python_version >= "3.7"
 py==1.11.0 ; python_version >= "3.7" and python_full_version < "3.8.0"
 pyasn1-modules==0.0.10 ; python_full_version < "3.8.0" and python_version >= "3.7"
 pyasn1==0.1.9 ; python_full_version < "3.8.0" and python_version >= "3.7"
 pycparser==2.14 ; python_full_version < "3.8.0" and python_version >= "3.7"
-pylint==2.15.5 ; python_full_version >= "3.7.2" and python_full_version < "3.8.0"
+pylint==2.15.8 ; python_full_version >= "3.7.2" and python_full_version < "3.8.0"
 pyopenssl==17.5.0 ; python_full_version < "3.8.0" and python_version >= "3.7"
 pyparsing==2.2.1 ; python_full_version < "3.8.0" and python_version >= "3.7"
 pyrfc3339==1.0 ; python_full_version < "3.8.0" and python_version >= "3.7"
 pytest-cov==4.0.0 ; python_version >= "3.7" and python_full_version < "3.8.0"
-pytest-xdist==3.0.2 ; python_version >= "3.7" and python_full_version < "3.8.0"
+pytest-xdist==3.1.0 ; python_version >= "3.7" and python_full_version < "3.8.0"
 pytest==7.2.0 ; python_version >= "3.7" and python_full_version < "3.8.0"
 python-augeas==0.5.0 ; python_full_version < "3.8.0" and python_version >= "3.7"
 python-dateutil==2.8.2 ; python_full_version < "3.8.0" and python_version >= "3.7"
@@ -79,17 +79,17 @@ tox==1.9.2 ; python_version >= "3.7" and python_full_version < "3.8.0"
 typed-ast==1.5.4 ; python_version < "3.8" and python_version >= "3.7"
 types-cryptography==3.3.23.2 ; python_version >= "3.7" and python_full_version < "3.8.0"
 types-pyopenssl==22.1.0.2 ; python_version >= "3.7" and python_full_version < "3.8.0"
-types-pyrfc3339==1.1.1 ; python_version >= "3.7" and python_full_version < "3.8.0"
+types-pyrfc3339==1.1.1.1 ; python_version >= "3.7" and python_full_version < "3.8.0"
 types-python-dateutil==2.8.19.4 ; python_version >= "3.7" and python_full_version < "3.8.0"
 types-pytz==2022.6.0.1 ; python_version >= "3.7" and python_full_version < "3.8.0"
 types-requests==2.28.11.5 ; python_version >= "3.7" and python_full_version < "3.8.0"
-types-setuptools==65.5.0.3 ; python_version >= "3.7" and python_full_version < "3.8.0"
-types-six==1.16.21.3 ; python_version >= "3.7" and python_full_version < "3.8.0"
+types-setuptools==65.6.0.2 ; python_version >= "3.7" and python_full_version < "3.8.0"
+types-six==1.16.21.4 ; python_version >= "3.7" and python_full_version < "3.8.0"
 types-urllib3==1.26.25.4 ; python_version >= "3.7" and python_full_version < "3.8.0"
 typing-extensions==4.4.0 ; python_version >= "3.7" and python_version < "3.8"
 uritemplate==3.0.1 ; python_full_version < "3.8.0" and python_version >= "3.7"
 urllib3==1.24.2 ; python_full_version < "3.8.0" and python_version >= "3.7"
-virtualenv==20.16.7 ; python_version >= "3.7" and python_full_version < "3.8.0"
+virtualenv==20.17.1 ; python_version >= "3.7" and python_full_version < "3.8.0"
 wheel==0.33.6 ; python_full_version < "3.8.0" and python_version >= "3.7"
 wrapt==1.14.1 ; python_full_version >= "3.7.2" and python_full_version < "3.8.0"
-zipp==3.10.0 ; python_version >= "3.7" and python_version < "3.8"
+zipp==3.11.0 ; python_version >= "3.7" and python_version < "3.8"
diff --git a/tools/pinning/current/pyproject.toml b/tools/pinning/current/pyproject.toml
index 7db80d7fa..9680fb2a1 100644
--- a/tools/pinning/current/pyproject.toml
+++ b/tools/pinning/current/pyproject.toml
@@ -61,6 +61,18 @@ pylint = { version="2.15.5", python = ">=3.7.2" }
 # Making sure that it would not get installed (Fixing https://github.com/certbot/certbot/issues/9336)
 cryptography = "!= 37.0.3"
 
+# If poetry>=1.3.0 is selected, multiple versions of virtualenv are selected
+# causing problems when exporting dependencies so let's pin poetry back until
+# https://github.com/python-poetry/poetry-plugin-export/issues/168 is resolved.
+poetry = "<1.3.0"
+
+# jsonpickle is currently pinning back setuptools which can cause some problems
+# in newer versions of Python. Until
+# https://github.com/jsonpickle/jsonpickle/issues/424 is resolved, let's
+# require a newer version of setuptools ourselves so a solution other than
+# downgrading setuptools is found.
+setuptools = ">=62.3.0"
+
 [tool.poetry.dev-dependencies]
 
 [build-system]
diff --git a/tools/requirements.txt b/tools/requirements.txt
index 905d96cc7..fd28956fb 100644
--- a/tools/requirements.txt
+++ b/tools/requirements.txt
@@ -17,23 +17,23 @@ backports-cached-property==1.0.2 ; python_version >= "3.7" and python_version <
 bcrypt==4.0.1 ; python_version >= "3.7" and python_version < "4.0"
 beautifulsoup4==4.11.1 ; python_version >= "3.7" and python_version < "4.0"
 bleach==5.0.1 ; python_version >= "3.7" and python_version < "4.0"
-boto3==1.26.13 ; python_version >= "3.7" and python_version < "4.0"
-botocore==1.29.13 ; python_version >= "3.7" and python_version < "4.0"
+boto3==1.26.27 ; python_version >= "3.7" and python_version < "4.0"
+botocore==1.29.27 ; python_version >= "3.7" and python_version < "4.0"
 cachecontrol==0.12.11 ; python_version >= "3.7" and python_version < "4.0"
 cachetools==5.2.0 ; python_version >= "3.7" and python_version < "4.0"
 cachy==0.3.0 ; python_version >= "3.7" and python_version < "4.0"
-certifi==2022.9.24 ; python_version >= "3.7" and python_version < "4"
+certifi==2022.12.7 ; python_version >= "3.7" and python_version < "4"
 cffi==1.15.1 ; python_version >= "3.7" and python_version < "4.0"
 charset-normalizer==2.1.1 ; python_version >= "3.7" and python_version < "4"
 cleo==1.0.0a5 ; python_version >= "3.7" and python_version < "4.0"
-cloudflare==2.10.5 ; python_version >= "3.7" and python_version < "4.0"
+cloudflare==2.11.1 ; python_version >= "3.7" and python_version < "4.0"
 colorama==0.4.6 ; python_version < "4.0" and sys_platform == "win32" and python_version >= "3.7" or python_version >= "3.7" and python_version < "4.0" and platform_system == "Windows"
 commonmark==0.9.1 ; python_version >= "3.7" and python_version < "4.0"
 configargparse==1.5.3 ; python_version >= "3.7" and python_version < "4.0"
 configobj==5.0.6 ; python_version >= "3.7" and python_version < "4.0"
 coverage==6.5.0 ; python_version >= "3.7" and python_version < "4.0"
 crashtest==0.3.1 ; python_version >= "3.7" and python_version < "4.0"
-cryptography==38.0.3 ; python_version >= "3.7" and python_version < "4.0"
+cryptography==38.0.4 ; python_version >= "3.7" and python_version < "4.0"
 cython==0.29.32 ; python_version >= "3.7" and python_version < "4.0"
 decorator==5.1.1 ; python_version >= "3.7" and python_version < "4.0"
 dill==0.3.6 ; python_full_version >= "3.7.2" and python_version < "4.0"
@@ -46,33 +46,33 @@ dulwich==0.20.50 ; python_version >= "3.7" and python_version < "4.0"
 exceptiongroup==1.0.4 ; python_version >= "3.7" and python_version < "3.11"
 execnet==1.9.0 ; python_version >= "3.7" and python_version < "4.0"
 fabric==2.7.1 ; python_version >= "3.7" and python_version < "4.0"
-filelock==3.8.0 ; python_version >= "3.7" and python_version < "4.0"
-google-api-core==2.10.2 ; python_version >= "3.7" and python_version < "4.0"
-google-api-python-client==2.66.0 ; python_version >= "3.7" and python_version < "4.0"
+filelock==3.8.2 ; python_version >= "3.7" and python_version < "4.0"
+google-api-core==2.11.0 ; python_version >= "3.7" and python_version < "4.0"
+google-api-python-client==2.69.0 ; python_version >= "3.7" and python_version < "4.0"
 google-auth-httplib2==0.1.0 ; python_version >= "3.7" and python_version < "4.0"
-google-auth==2.14.1 ; python_version >= "3.7" and python_version < "4.0"
+google-auth==2.15.0 ; python_version >= "3.7" and python_version < "4.0"
 googleapis-common-protos==1.57.0 ; python_version >= "3.7" and python_version < "4.0"
 html5lib==1.1 ; python_version >= "3.7" and python_version < "4.0"
 httplib2==0.21.0 ; python_version >= "3.7" and python_version < "4.0"
 idna==3.4 ; python_version >= "3.7" and python_version < "4"
 imagesize==1.4.1 ; python_version >= "3.7" and python_version < "4.0"
 importlib-metadata==4.13.0 ; python_version >= "3.7" and python_version < "4.0"
-importlib-resources==5.10.0 ; python_version >= "3.7" and python_version < "3.9"
+importlib-resources==5.10.1 ; python_version >= "3.7" and python_version < "3.9"
 iniconfig==1.1.1 ; python_version >= "3.7" and python_version < "4.0"
 invoke==1.7.3 ; python_version >= "3.7" and python_version < "4.0"
 ipdb==0.13.9 ; python_version >= "3.7" and python_version < "4.0"
 ipython==7.34.0 ; python_version >= "3.7" and python_version < "4.0"
 isodate==0.6.1 ; python_version >= "3.7" and python_version < "4.0"
-isort==5.10.1 ; python_full_version >= "3.7.2" and python_version < "4.0"
+isort==5.11.0 ; python_full_version >= "3.7.2" and python_version < "4.0"
 jaraco-classes==3.2.3 ; python_version >= "3.7" and python_version < "4.0"
-jedi==0.18.1 ; python_version >= "3.7" and python_version < "4.0"
+jedi==0.18.2 ; python_version >= "3.7" and python_version < "4.0"
 jeepney==0.8.0 ; python_version >= "3.7" and python_version < "4.0" and sys_platform == "linux"
 jinja2==3.1.2 ; python_version >= "3.7" and python_version < "4.0"
 jmespath==1.0.1 ; python_version >= "3.7" and python_version < "4.0"
 josepy==1.13.0 ; python_version >= "3.7" and python_version < "4.0"
 jsonlines==3.1.0 ; python_version >= "3.7" and python_version < "4.0"
 jsonpickle==2.2.0 ; python_version >= "3.7" and python_version < "4.0"
-jsonschema==4.17.0 ; python_version >= "3.7" and python_version < "4.0"
+jsonschema==4.17.3 ; python_version >= "3.7" and python_version < "4.0"
 keyring==23.11.0 ; python_version >= "3.7" and python_version < "4.0"
 lazy-object-proxy==1.8.0 ; python_full_version >= "3.7.2" and python_version < "4.0"
 lockfile==0.12.2 ; python_version >= "3.7" and python_version < "4.0"
@@ -86,7 +86,7 @@ mypy-extensions==0.4.3 ; python_version >= "3.7" and python_version < "4.0"
 mypy==0.991 ; python_version >= "3.7" and python_version < "4.0"
 oauth2client==4.1.3 ; python_version >= "3.7" and python_version < "4.0"
 oauthlib==3.2.2 ; python_version >= "3.7" and python_version < "4.0"
-packaging==21.3 ; python_version >= "3.7" and python_version < "4.0"
+packaging==22.0 ; python_version >= "3.7" and python_version < "4.0"
 paramiko==2.12.0 ; python_version >= "3.7" and python_version < "4.0"
 parsedatetime==2.6 ; python_version >= "3.7" and python_version < "4.0"
 parso==0.8.3 ; python_version >= "3.7" and python_version < "4.0"
@@ -94,16 +94,16 @@ pathlib2==2.3.7.post1 ; python_version >= "3.7" and python_version < "4.0"
 pexpect==4.8.0 ; python_version >= "3.7" and python_version < "4.0"
 pickleshare==0.7.5 ; python_version >= "3.7" and python_version < "4.0"
 pip==22.3.1 ; python_version >= "3.7" and python_version < "4.0"
-pkginfo==1.8.3 ; python_version >= "3.7" and python_version < "4.0"
+pkginfo==1.9.2 ; python_version >= "3.7" and python_version < "4.0"
 pkgutil-resolve-name==1.3.10 ; python_version >= "3.7" and python_version < "3.9"
-platformdirs==2.5.4 ; python_version < "4.0" and python_version >= "3.7"
+platformdirs==2.6.0 ; python_version < "4.0" and python_version >= "3.7"
 pluggy==1.0.0 ; python_version >= "3.7" and python_version < "4.0"
 ply==3.11 ; python_version >= "3.7" and python_version < "4.0"
 poetry-core==1.3.2 ; python_version >= "3.7" and python_version < "4.0"
 poetry-plugin-export==1.2.0 ; python_version >= "3.7" and python_version < "4.0"
 poetry==1.2.2 ; python_version >= "3.7" and python_version < "4.0"
-prompt-toolkit==3.0.33 ; python_version >= "3.7" and python_version < "4.0"
-protobuf==4.21.9 ; python_version >= "3.7" and python_version < "4.0"
+prompt-toolkit==3.0.36 ; python_version >= "3.7" and python_version < "4.0"
+protobuf==4.21.11 ; python_version >= "3.7" and python_version < "4.0"
 ptyprocess==0.7.0 ; python_version >= "3.7" and python_version < "4.0"
 py==1.11.0 ; python_version >= "3.7" and python_version < "4.0"
 pyasn1-modules==0.2.8 ; python_version >= "3.7" and python_version < "4.0"
@@ -119,7 +119,7 @@ pyparsing==3.0.9 ; python_version >= "3.7" and python_version < "4.0"
 pyrfc3339==1.1 ; python_version >= "3.7" and python_version < "4.0"
 pyrsistent==0.19.2 ; python_version >= "3.7" and python_version < "4.0"
 pytest-cov==4.0.0 ; python_version >= "3.7" and python_version < "4.0"
-pytest-xdist==3.0.2 ; python_version >= "3.7" and python_version < "4.0"
+pytest-xdist==3.1.0 ; python_version >= "3.7" and python_version < "4.0"
 pytest==7.2.0 ; python_version >= "3.7" and python_version < "4.0"
 python-augeas==1.1.0 ; python_version >= "3.7" and python_version < "4.0"
 python-dateutil==2.8.2 ; python_version >= "3.7" and python_version < "4.0"
@@ -141,7 +141,7 @@ s3transfer==0.6.0 ; python_version >= "3.7" and python_version < "4.0"
 secretstorage==3.3.3 ; python_version >= "3.7" and python_version < "4.0" and sys_platform == "linux"
 semantic-version==2.10.0 ; python_version >= "3.7" and python_version < "4.0"
 setuptools-rust==1.5.2 ; python_version >= "3.7" and python_version < "4.0"
-setuptools==65.6.0 ; python_version >= "3.7" and python_version < "4.0"
+setuptools==65.6.3 ; python_version >= "3.7" and python_version < "4.0"
 shellingham==1.5.0 ; python_version >= "3.7" and python_version < "4.0"
 six==1.16.0 ; python_version >= "3.7" and python_version < "4.0"
 snowballstemmer==2.2.0 ; python_version >= "3.7" and python_version < "4.0"
@@ -159,8 +159,8 @@ toml==0.10.2 ; python_version >= "3.7" and python_version < "4.0"
 tomli==2.0.1 ; python_version >= "3.7" and python_full_version <= "3.11.0a6"
 tomlkit==0.11.6 ; python_version < "4.0" and python_version >= "3.7"
 tox==3.27.1 ; python_version >= "3.7" and python_version < "4.0"
-traitlets==5.5.0 ; python_version >= "3.7" and python_version < "4.0"
-twine==4.0.1 ; python_version >= "3.7" and python_version < "4.0"
+traitlets==5.7.1 ; python_version >= "3.7" and python_version < "4.0"
+twine==4.0.2 ; python_version >= "3.7" and python_version < "4.0"
 typed-ast==1.5.4 ; python_version < "3.8" and python_version >= "3.7"
 types-cryptography==3.3.23.2 ; python_version >= "3.7" and python_version < "4.0"
 types-pyopenssl==22.1.0.2 ; python_version >= "3.7" and python_version < "4.0"
@@ -168,17 +168,17 @@ types-pyrfc3339==1.1.1.1 ; python_version >= "3.7" and python_version < "4.0"
 types-python-dateutil==2.8.19.4 ; python_version >= "3.7" and python_version < "4.0"
 types-pytz==2022.6.0.1 ; python_version >= "3.7" and python_version < "4.0"
 types-requests==2.28.11.5 ; python_version >= "3.7" and python_version < "4.0"
-types-setuptools==65.6.0.0 ; python_version >= "3.7" and python_version < "4.0"
+types-setuptools==65.6.0.2 ; python_version >= "3.7" and python_version < "4.0"
 types-six==1.16.21.4 ; python_version >= "3.7" and python_version < "4.0"
 types-urllib3==1.26.25.4 ; python_version >= "3.7" and python_version < "4.0"
 typing-extensions==4.4.0 ; python_version >= "3.7" and python_version < "4.0"
 uritemplate==4.1.1 ; python_version >= "3.7" and python_version < "4.0"
-urllib3==1.26.12 ; python_version >= "3.7" and python_version < "4"
-virtualenv==20.16.7 ; python_version >= "3.7" and python_version < "4.0"
+urllib3==1.26.13 ; python_version >= "3.7" and python_version < "4.0"
+virtualenv==20.17.1 ; python_version >= "3.7" and python_version < "4.0"
 wcwidth==0.2.5 ; python_version >= "3.7" and python_version < "4.0"
 webencodings==0.5.1 ; python_version >= "3.7" and python_version < "4.0"
 wheel==0.38.4 ; python_version >= "3.7" and python_version < "4.0"
 wrapt==1.14.1 ; python_full_version >= "3.7.2" and python_version < "4.0"
 xattr==0.9.9 ; python_version >= "3.7" and python_version < "4.0" and sys_platform == "darwin"
 yarg==0.1.9 ; python_version >= "3.7" and python_version < "4.0"
-zipp==3.10.0 ; python_version >= "3.7" and python_version < "4.0"
+zipp==3.11.0 ; python_version >= "3.7" and python_version < "4.0"

From a807240db7b8ca60bc1bd637a66282b3ca449417 Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@users.noreply.github.com>
Date: Mon, 12 Dec 2022 16:00:30 -0800
Subject: [PATCH 5/6] add 1.32.x/requirements.txt (#9506)

---
 certbot/docs/contributing.rst |  10 +-
 tools/1.32.x/requirements.txt | 195 ++++++++++++++++++++++++++++++++++
 2 files changed, 203 insertions(+), 2 deletions(-)
 create mode 100644 tools/1.32.x/requirements.txt

diff --git a/certbot/docs/contributing.rst b/certbot/docs/contributing.rst
index c32bdc170..6d1faf061 100644
--- a/certbot/docs/contributing.rst
+++ b/certbot/docs/contributing.rst
@@ -585,8 +585,8 @@ include our snaps, Docker images, Windows installer, CI, and our development
 environments.
 
 In most cases, the file where dependency versions are specified is
-``tools/requirements.txt``. There are two exceptions to this. The first is our
-"oldest" tests where ``tools/oldest_constraints.txt`` is used instead. The
+``tools/requirements.txt``. There are three exceptions to this. The first is
+our "oldest" tests where ``tools/oldest_constraints.txt`` is used instead. The
 purpose of the "oldest" tests is to ensure Certbot continues to work with the
 oldest versions of our dependencies which we claim to support. The oldest
 versions of the dependencies we support should also be declared in our setup.py
@@ -598,6 +598,12 @@ leave Certbot's dependencies unpinned. The thinking behind this test is to help
 us learn about breaking changes in our dependencies so that we can respond
 accordingly.
 
+The third exception is temporary and at ``tools/1.32.x/requirements.txt``.
+This file is simply a copy of ``tools/requirements.txt`` from our 1.32.x branch
+to help us ensure those dependencies stay reasonably well updated while we still
+have Certbot 1.x snap users. Once we've moved all snap users to Certbot 2.0,
+this file should be deleted.
+
 The choices of whether Certbot's dependencies are pinned and what file is used
 if they are should be automatically handled for you most of the time by
 Certbot's tooling. The way it works though is ``tools/pip_install.py`` (which
diff --git a/tools/1.32.x/requirements.txt b/tools/1.32.x/requirements.txt
new file mode 100644
index 000000000..9f49b9353
--- /dev/null
+++ b/tools/1.32.x/requirements.txt
@@ -0,0 +1,195 @@
+# This is a copy of tools/requirements.txt from the 1.32.x branch that I
+# placed here so it will be in our master branch and GitHub will scan it for
+# security vulnerabilities while we still have 1.x snap users. If we're notified
+# about problems in our dependencies here and want to upgrade, we should do so
+# by updating tools/requirements.txt on the 1.32.x branch, doing a point release
+# from that branch, and copying any updates to tools/requirements.txt on that
+# branch to this file on the master branch.
+#
+# This file is named requirements.txt so it is scanned by GitHub. See
+# https://docs.github.com/en/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#supported-package-ecosystems
+# for more info.
+alabaster==0.7.12 ; python_version >= "3.7" and python_version < "4.0"
+apacheconfig==0.3.2 ; python_version >= "3.7" and python_version < "4.0"
+appnope==0.1.3 ; python_version >= "3.7" and python_version < "4.0" and sys_platform == "darwin"
+astroid==2.11.7 ; python_version >= "3.7" and python_version < "4.0"
+attrs==22.1.0 ; python_version >= "3.7" and python_version < "4.0"
+awscli==1.27.0 ; python_version >= "3.7" and python_version < "4.0"
+azure-devops==6.0.0b4 ; python_version >= "3.7" and python_version < "4.0"
+babel==2.11.0 ; python_version >= "3.7" and python_version < "4.0"
+backcall==0.2.0 ; python_version >= "3.7" and python_version < "4.0"
+backports-cached-property==1.0.2 ; python_version >= "3.7" and python_version < "3.8"
+bcrypt==4.0.1 ; python_version >= "3.7" and python_version < "4.0"
+beautifulsoup4==4.11.1 ; python_version >= "3.7" and python_version < "4.0"
+bleach==5.0.1 ; python_version >= "3.7" and python_version < "4.0"
+boto3==1.26.0 ; python_version >= "3.7" and python_version < "4.0"
+botocore==1.29.0 ; python_version >= "3.7" and python_version < "4.0"
+cachecontrol==0.12.11 ; python_version >= "3.7" and python_version < "4.0"
+cachetools==5.2.0 ; python_version >= "3.7" and python_version < "4.0"
+cachy==0.3.0 ; python_version >= "3.7" and python_version < "4.0"
+certifi==2022.9.24 ; python_version >= "3.7" and python_version < "4"
+cffi==1.15.1 ; python_version >= "3.7" and python_version < "4.0"
+charset-normalizer==2.1.1 ; python_version >= "3.7" and python_version < "4"
+cleo==1.0.0a5 ; python_version >= "3.7" and python_version < "4.0"
+cloudflare==2.10.2 ; python_version >= "3.7" and python_version < "4.0"
+colorama==0.4.4 ; python_version >= "3.7" and python_version < "4.0"
+commonmark==0.9.1 ; python_version >= "3.7" and python_version < "4.0"
+configargparse==1.5.3 ; python_version >= "3.7" and python_version < "4.0"
+configobj==5.0.6 ; python_version >= "3.7" and python_version < "4.0"
+coverage==6.5.0 ; python_version >= "3.7" and python_version < "4.0"
+crashtest==0.3.1 ; python_version >= "3.7" and python_version < "4.0"
+cryptography==38.0.3 ; python_version >= "3.7" and python_version < "4.0"
+cython==0.29.32 ; python_version >= "3.7" and python_version < "4.0"
+decorator==5.1.1 ; python_version >= "3.7" and python_version < "4.0"
+dill==0.3.6 ; python_version >= "3.7" and python_version < "4.0"
+distlib==0.3.6 ; python_version >= "3.7" and python_version < "4.0"
+distro==1.8.0 ; python_version >= "3.7" and python_version < "4.0"
+dns-lexicon==3.11.7 ; python_version >= "3.7" and python_version < "4.0"
+dnspython==2.2.1 ; python_version >= "3.7" and python_version < "4.0"
+docutils==0.16 ; python_version >= "3.7" and python_version < "4.0"
+dulwich==0.20.50 ; python_version >= "3.7" and python_version < "4.0"
+exceptiongroup==1.0.0 ; python_version >= "3.7" and python_version < "3.11"
+execnet==1.9.0 ; python_version >= "3.7" and python_version < "4.0"
+fabric==2.7.1 ; python_version >= "3.7" and python_version < "4.0"
+filelock==3.8.0 ; python_version >= "3.7" and python_version < "4.0"
+google-api-core==2.10.2 ; python_version >= "3.7" and python_version < "4.0"
+google-api-python-client==2.65.0 ; python_version >= "3.7" and python_version < "4.0"
+google-auth-httplib2==0.1.0 ; python_version >= "3.7" and python_version < "4.0"
+google-auth==2.14.0 ; python_version >= "3.7" and python_version < "4.0"
+googleapis-common-protos==1.56.4 ; python_version >= "3.7" and python_version < "4.0"
+html5lib==1.1 ; python_version >= "3.7" and python_version < "4.0"
+httplib2==0.21.0 ; python_version >= "3.7" and python_version < "4.0"
+idna==3.4 ; python_version >= "3.7" and python_version < "4"
+imagesize==1.4.1 ; python_version >= "3.7" and python_version < "4.0"
+importlib-metadata==4.13.0 ; python_version >= "3.7" and python_version < "4.0"
+importlib-resources==5.10.0 ; python_version >= "3.7" and python_version < "3.9"
+iniconfig==1.1.1 ; python_version >= "3.7" and python_version < "4.0"
+invoke==1.7.3 ; python_version >= "3.7" and python_version < "4.0"
+ipdb==0.13.9 ; python_version >= "3.7" and python_version < "4.0"
+ipython==7.34.0 ; python_version >= "3.7" and python_version < "4.0"
+isodate==0.6.1 ; python_version >= "3.7" and python_version < "4.0"
+isort==5.10.1 ; python_version >= "3.7" and python_version < "4.0"
+jaraco-classes==3.2.3 ; python_version >= "3.7" and python_version < "4.0"
+jedi==0.18.1 ; python_version >= "3.7" and python_version < "4.0"
+jeepney==0.8.0 ; python_version >= "3.7" and python_version < "4.0" and sys_platform == "linux"
+jinja2==3.1.2 ; python_version >= "3.7" and python_version < "4.0"
+jmespath==1.0.1 ; python_version >= "3.7" and python_version < "4.0"
+josepy==1.13.0 ; python_version >= "3.7" and python_version < "4.0"
+jsonlines==3.1.0 ; python_version >= "3.7" and python_version < "4.0"
+jsonpickle==2.2.0 ; python_version >= "3.7" and python_version < "4.0"
+jsonschema==4.17.0 ; python_version >= "3.7" and python_version < "4.0"
+keyring==23.9.3 ; python_version >= "3.7" and python_version < "4.0"
+lazy-object-proxy==1.8.0 ; python_version >= "3.7" and python_version < "4.0"
+lockfile==0.12.2 ; python_version >= "3.7" and python_version < "4.0"
+markupsafe==2.1.1 ; python_version >= "3.7" and python_version < "4.0"
+matplotlib-inline==0.1.6 ; python_version >= "3.7" and python_version < "4.0"
+mccabe==0.7.0 ; python_version >= "3.7" and python_version < "4.0"
+mock==4.0.3 ; python_version >= "3.7" and python_version < "4.0"
+more-itertools==9.0.0 ; python_version >= "3.7" and python_version < "4.0"
+msgpack==1.0.4 ; python_version >= "3.7" and python_version < "4.0"
+msrest==0.6.21 ; python_version >= "3.7" and python_version < "4.0"
+mypy-extensions==0.4.3 ; python_version >= "3.7" and python_version < "4.0"
+mypy==0.982 ; python_version >= "3.7" and python_version < "4.0"
+oauth2client==4.1.3 ; python_version >= "3.7" and python_version < "4.0"
+oauthlib==3.2.2 ; python_version >= "3.7" and python_version < "4.0"
+packaging==21.3 ; python_version >= "3.7" and python_version < "4.0"
+paramiko==2.11.0 ; python_version >= "3.7" and python_version < "4.0"
+parsedatetime==2.6 ; python_version >= "3.7" and python_version < "4.0"
+parso==0.8.3 ; python_version >= "3.7" and python_version < "4.0"
+pathlib2==2.3.7.post1 ; python_version >= "3.7" and python_version < "4.0"
+pexpect==4.8.0 ; python_version >= "3.7" and python_version < "4.0"
+pickleshare==0.7.5 ; python_version >= "3.7" and python_version < "4.0"
+pip==22.3 ; python_version >= "3.7" and python_version < "4.0"
+pkginfo==1.8.3 ; python_version >= "3.7" and python_version < "4.0"
+pkgutil-resolve-name==1.3.10 ; python_version >= "3.7" and python_version < "3.9"
+platformdirs==2.5.2 ; python_version >= "3.7" and python_version < "4.0"
+pluggy==1.0.0 ; python_version >= "3.7" and python_version < "4.0"
+ply==3.11 ; python_version >= "3.7" and python_version < "4.0"
+poetry-core==1.3.2 ; python_version >= "3.7" and python_version < "4.0"
+poetry-plugin-export==1.1.2 ; python_version >= "3.7" and python_version < "4.0"
+poetry==1.2.2 ; python_version >= "3.7" and python_version < "4.0"
+prompt-toolkit==3.0.31 ; python_version >= "3.7" and python_version < "4.0"
+protobuf==4.21.9 ; python_version >= "3.7" and python_version < "4.0"
+ptyprocess==0.7.0 ; python_version >= "3.7" and python_version < "4.0"
+py==1.11.0 ; python_version >= "3.7" and python_version < "4.0"
+pyasn1-modules==0.2.8 ; python_version >= "3.7" and python_version < "4.0"
+pyasn1==0.4.8 ; python_version >= "3.7" and python_version < "4.0"
+pycparser==2.21 ; python_version >= "3.7" and python_version < "4.0"
+pygments==2.13.0 ; python_version >= "3.7" and python_version < "4.0"
+pylev==1.4.0 ; python_version >= "3.7" and python_version < "4.0"
+pylint==2.13.9 ; python_version >= "3.7" and python_version < "4.0"
+pynacl==1.5.0 ; python_version >= "3.7" and python_version < "4.0"
+pynsist==2.7 ; python_version >= "3.7" and python_version < "4.0"
+pyopenssl==22.1.0 ; python_version >= "3.7" and python_version < "4.0"
+pyparsing==3.0.9 ; python_version >= "3.7" and python_version < "4.0"
+pyrfc3339==1.1 ; python_version >= "3.7" and python_version < "4.0"
+pyrsistent==0.19.1 ; python_version >= "3.7" and python_version < "4.0"
+pytest-cov==4.0.0 ; python_version >= "3.7" and python_version < "4.0"
+pytest-xdist==3.0.2 ; python_version >= "3.7" and python_version < "4.0"
+pytest==7.2.0 ; python_version >= "3.7" and python_version < "4.0"
+python-augeas==1.1.0 ; python_version >= "3.7" and python_version < "4.0"
+python-dateutil==2.8.2 ; python_version >= "3.7" and python_version < "4.0"
+python-digitalocean==1.17.0 ; python_version >= "3.7" and python_version < "4.0"
+pytz==2022.6 ; python_version >= "3.7" and python_version < "4.0"
+pywin32-ctypes==0.2.0 ; python_version >= "3.7" and python_version < "4.0" and sys_platform == "win32"
+pywin32==304 ; python_version >= "3.7" and python_version < "4.0" and sys_platform == "win32"
+pyyaml==5.4.1 ; python_version >= "3.7" and python_version < "4.0"
+readme-renderer==37.3 ; python_version >= "3.7" and python_version < "4.0"
+requests-download==0.1.2 ; python_version >= "3.7" and python_version < "4.0"
+requests-file==1.5.1 ; python_version >= "3.7" and python_version < "4.0"
+requests-oauthlib==1.3.1 ; python_version >= "3.7" and python_version < "4.0"
+requests-toolbelt==0.9.1 ; python_version >= "3.7" and python_version < "4.0"
+requests==2.28.1 ; python_version >= "3.7" and python_version < "4"
+rfc3986==2.0.0 ; python_version >= "3.7" and python_version < "4.0"
+rich==12.6.0 ; python_version >= "3.7" and python_version < "4.0"
+rsa==4.7.2 ; python_version >= "3.7" and python_version < "4"
+s3transfer==0.6.0 ; python_version >= "3.7" and python_version < "4.0"
+secretstorage==3.3.3 ; python_version >= "3.7" and python_version < "4.0" and sys_platform == "linux"
+semantic-version==2.10.0 ; python_version >= "3.7" and python_version < "4.0"
+setuptools-rust==1.5.2 ; python_version >= "3.7" and python_version < "4.0"
+setuptools==65.5.0 ; python_version >= "3.7" and python_version < "4.0"
+shellingham==1.5.0 ; python_version >= "3.7" and python_version < "4.0"
+six==1.16.0 ; python_version >= "3.7" and python_version < "4.0"
+snowballstemmer==2.2.0 ; python_version >= "3.7" and python_version < "4.0"
+soupsieve==2.3.2.post1 ; python_version >= "3.7" and python_version < "4.0"
+sphinx-rtd-theme==1.1.0 ; python_version >= "3.7" and python_version < "4.0"
+sphinx==5.1.1 ; python_version >= "3.7" and python_version < "4.0"
+sphinxcontrib-applehelp==1.0.2 ; python_version >= "3.7" and python_version < "4.0"
+sphinxcontrib-devhelp==1.0.2 ; python_version >= "3.7" and python_version < "4.0"
+sphinxcontrib-htmlhelp==2.0.0 ; python_version >= "3.7" and python_version < "4.0"
+sphinxcontrib-jsmath==1.0.1 ; python_version >= "3.7" and python_version < "4.0"
+sphinxcontrib-qthelp==1.0.3 ; python_version >= "3.7" and python_version < "4.0"
+sphinxcontrib-serializinghtml==1.1.5 ; python_version >= "3.7" and python_version < "4.0"
+tldextract==3.4.0 ; python_version >= "3.7" and python_version < "4.0"
+toml==0.10.2 ; python_version >= "3.7" and python_version < "4.0"
+tomli==2.0.1 ; python_version >= "3.7" and python_full_version <= "3.11.0a6"
+tomlkit==0.11.6 ; python_version >= "3.7" and python_version < "4.0"
+tox==3.27.0 ; python_version >= "3.7" and python_version < "4.0"
+traitlets==5.5.0 ; python_version >= "3.7" and python_version < "4.0"
+twine==4.0.1 ; python_version >= "3.7" and python_version < "4.0"
+typed-ast==1.5.4 ; python_version >= "3.7" and python_version < "3.8"
+types-cryptography==3.3.23.1 ; python_version >= "3.7" and python_version < "4.0"
+types-mock==4.0.15.2 ; python_version >= "3.7" and python_version < "4.0"
+types-pyopenssl==22.1.0.1 ; python_version >= "3.7" and python_version < "4.0"
+types-pyrfc3339==1.1.1 ; python_version >= "3.7" and python_version < "4.0"
+types-python-dateutil==2.8.19.2 ; python_version >= "3.7" and python_version < "4.0"
+types-pytz==2022.6.0.1 ; python_version >= "3.7" and python_version < "4.0"
+types-requests==2.28.11.2 ; python_version >= "3.7" and python_version < "4.0"
+types-setuptools==65.5.0.2 ; python_version >= "3.7" and python_version < "4.0"
+types-six==1.16.21 ; python_version >= "3.7" and python_version < "4.0"
+types-urllib3==1.26.25.1 ; python_version >= "3.7" and python_version < "4.0"
+typing-extensions==4.4.0 ; python_version >= "3.7" and python_version < "4.0"
+uritemplate==4.1.1 ; python_version >= "3.7" and python_version < "4.0"
+urllib3==1.26.12 ; python_version >= "3.7" and python_version < "4"
+virtualenv==20.16.6 ; python_version >= "3.7" and python_version < "4.0"
+wcwidth==0.2.5 ; python_version >= "3.7" and python_version < "4.0"
+webencodings==0.5.1 ; python_version >= "3.7" and python_version < "4.0"
+wheel==0.37.1 ; python_version >= "3.7" and python_version < "4.0"
+wrapt==1.14.1 ; python_version >= "3.7" and python_version < "4.0"
+xattr==0.9.9 ; python_version >= "3.7" and python_version < "4.0" and sys_platform == "darwin"
+yarg==0.1.9 ; python_version >= "3.7" and python_version < "4.0"
+zipp==3.10.0 ; python_version >= "3.7" and python_version < "4.0"
+zope-component==5.0.1 ; python_version >= "3.7" and python_version < "4.0"
+zope-event==4.5.0 ; python_version >= "3.7" and python_version < "4.0"
+zope-hookable==5.2 ; python_version >= "3.7" and python_version < "4.0"
+zope-interface==5.5.0 ; python_version >= "3.7" and python_version < "4.0"

From 27af7b5d152ef89f1eb78e60972ee644a3238fdb Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@users.noreply.github.com>
Date: Wed, 14 Dec 2022 16:27:23 -0800
Subject: [PATCH 6/6] fix help output (#9509)

---
 tools/_release.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tools/_release.sh b/tools/_release.sh
index 368ed21d5..58551952c 100755
--- a/tools/_release.sh
+++ b/tools/_release.sh
@@ -169,6 +169,14 @@ VIRTUALENV_NO_DOWNLOAD=1 virtualenv ../venv
 . ../venv/bin/activate
 pip install -U setuptools
 pip install -U pip
+
+# This creates a string like "acme==a.b.c certbot==a.b.c ..." which can be used
+# with pip to ensure the correct versions of our packages installed.
+subpkgs_with_version=""
+for pkg in $SUBPKGS; do
+    subpkgs_with_version="$subpkgs_with_version $pkg==$version"
+done
+
 # Now, use our local archives. Disable cache so we get the correct packages even if
 # we (or our dependencies) have conditional dependencies implemented with if
 # statements in setup.py and we have cached wheels lying around that would cause
@@ -176,7 +184,7 @@ pip install -U pip
 python ../tools/pip_install.py \
   --no-cache-dir \
   --find-links . \
-  $SUBPKGS
+  $subpkgs_with_version
 cd ~-
 
 # get a snapshot of the CLI help for the docs