From 55357fd3168bcc0271c518c35000dbb837ec50e3 Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Thu, 11 Mar 2021 15:58:00 -0800 Subject: [PATCH 1/8] certbot constraints to reqs --- snap/snapcraft.yaml | 2 +- tests/letstest/scripts/test_sdists.sh | 2 +- .../{certbot_constraints.txt => certbot_requirements.txt} | 2 +- tools/dev_constraints.txt | 2 +- tools/pip_install.py | 4 ++-- tools/rebuild_certbot_constraints.py | 8 ++++---- tools/snap/generate_dnsplugins_all.sh | 2 +- windows-installer/construct.py | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) rename tools/{certbot_constraints.txt => certbot_requirements.txt} (99%) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index d53fba88bd4..c647dd5518c 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -85,7 +85,7 @@ parts: snapcraftctl build override-pull: | snapcraftctl pull - python3 "${SNAPCRAFT_PART_SRC}/tools/strip_hashes.py" "${SNAPCRAFT_PART_SRC}/tools/certbot_constraints.txt" | grep -v python-augeas >> "${SNAPCRAFT_PART_SRC}/snap-constraints.txt" + python3 "${SNAPCRAFT_PART_SRC}/tools/strip_hashes.py" "${SNAPCRAFT_PART_SRC}/tools/certbot_requirements.txt" | grep -v python-augeas >> "${SNAPCRAFT_PART_SRC}/snap-constraints.txt" python3 "${SNAPCRAFT_PART_SRC}/tools/strip_hashes.py" "${SNAPCRAFT_PART_SRC}/tools/pipstrap_constraints.txt" >> "${SNAPCRAFT_PART_SRC}/snap-constraints.txt" echo "$(python3 "${SNAPCRAFT_PART_SRC}/tools/merge_requirements.py" "${SNAPCRAFT_PART_SRC}/snap-constraints.txt")" > "${SNAPCRAFT_PART_SRC}/snap-constraints.txt" snapcraftctl set-version `grep -oP "__version__ = '\K.*(?=')" "${SNAPCRAFT_PART_SRC}/certbot/certbot/__init__.py"` diff --git a/tests/letstest/scripts/test_sdists.sh b/tests/letstest/scripts/test_sdists.sh index becdd6d9a3e..17e24ef0b43 100755 --- a/tests/letstest/scripts/test_sdists.sh +++ b/tests/letstest/scripts/test_sdists.sh @@ -13,7 +13,7 @@ sudo $BOOTSTRAP_SCRIPT # constraints in the commands given to pip and the mix of hashed and unhashed # packages makes pip error out. python3 tools/strip_hashes.py tools/pipstrap_constraints.txt > constraints.txt -python3 tools/strip_hashes.py tools/certbot_constraints.txt > requirements.txt +python3 tools/strip_hashes.py tools/certbot_requirements.txt > requirements.txt # We pin cryptography to 3.1.1 and pyOpenSSL to 19.1.0 specifically for CentOS 7 / RHEL 7 # because these systems ship only with OpenSSL 1.0.2, and this OpenSSL version support has been diff --git a/tools/certbot_constraints.txt b/tools/certbot_requirements.txt similarity index 99% rename from tools/certbot_constraints.txt rename to tools/certbot_requirements.txt index 77bfef9dbca..9ea882223c0 100644 --- a/tools/certbot_constraints.txt +++ b/tools/certbot_requirements.txt @@ -2,7 +2,7 @@ # To generate this, do (with docker and package hashin installed): # ``` # tools/rebuild_certbot_contraints.py \ -# tools/certbot_constraints.txt +# tools/certbot_requirements.txt # ``` # If you want to update a single dependency, run commands similar to these: # ``` diff --git a/tools/dev_constraints.txt b/tools/dev_constraints.txt index f4059a3f90f..8a45a794959 100644 --- a/tools/dev_constraints.txt +++ b/tools/dev_constraints.txt @@ -1,7 +1,7 @@ # Specifies Python package versions for development and building Docker images. # It includes in particular packages not specified in letsencrypt-auto's requirements file. # Some dev package versions specified here may be overridden by higher level constraints -# files during tests (eg. tools/certbot_constraints.txt). +# files during tests (eg. tools/certbot_requirements.txt). alabaster==0.7.10 apacheconfig==0.3.2 apipkg==1.4 diff --git a/tools/pip_install.py b/tools/pip_install.py index e06650ff284..cde0b61efa6 100755 --- a/tools/pip_install.py +++ b/tools/pip_install.py @@ -57,7 +57,7 @@ def certbot_oldest_processing(tools_path, args, test_constraints): def certbot_normal_processing(tools_path, test_constraints): repo_path = os.path.dirname(tools_path) certbot_requirements = os.path.normpath(os.path.join( - repo_path, 'tools/certbot_constraints.txt')) + repo_path, 'tools/certbot_requirements.txt')) with open(certbot_requirements, 'r') as fd: certbot_reqs = fd.readlines() with open(os.path.join(tools_path, 'pipstrap_constraints.txt'), 'r') as fd: @@ -76,7 +76,7 @@ def merge_requirements(tools_path, requirements, test_constraints, all_constrain # Here is the order by increasing priority: # 1) The general development constraints (tools/dev_constraints.txt) # 2) The general tests constraints (oldest_requirements.txt or - # certbot_constraints.txt + pipstrap's constraints for the normal processing) + # certbot_requirements.txt + pipstrap's constraints for the normal processing) # 3) The local requirement file, typically local-oldest-requirement in oldest tests files = [os.path.join(tools_path, 'dev_constraints.txt'), test_constraints] if requirements: diff --git a/tools/rebuild_certbot_constraints.py b/tools/rebuild_certbot_constraints.py index f5e5d3ca78b..39571b2b17d 100755 --- a/tools/rebuild_certbot_constraints.py +++ b/tools/rebuild_certbot_constraints.py @@ -4,12 +4,12 @@ on various Linux distributions. It generates a requirements file contained the pinned and hashed versions, ready to be used by pip to install the certbot dependencies. -This script is typically used to update the certbot_constraints.txt file. +This script is typically used to update the certbot_requirements.txt file. To achieve its purpose, this script will start a certbot installation with unpinned dependencies, then gather them, on various distributions started as Docker containers. -Usage: tools/rebuild_certbot_constraints.py new_requirements.txt +Usage: tools/rebuild_certbot_requirements.py new_requirements.txt NB1: Docker must be installed on the machine running this script. NB2: Python library 'hashin' must be installed on the machine running this script. @@ -42,7 +42,7 @@ 'cryptography': '3.3.2', } -# ./certbot/tools/rebuild_certbot_constraints.py (2 levels from certbot root path) +# ./certbot/tools/rebuild_certbot_requirements.py (2 levels from certbot root path) CERTBOT_REPO_PATH = dirname(dirname(abspath(__file__))) # The script will be used to gather dependencies for a given distribution. @@ -209,7 +209,7 @@ def _write_requirements(dest_file, requirements, conflicts): # To generate this, do (with docker and package hashin installed): # ``` # tools/rebuild_certbot_contraints.py \\ -# tools/certbot_constraints.txt +# tools/certbot_requirements.txt # ``` # If you want to update a single dependency, run commands similar to these: # ``` diff --git a/tools/snap/generate_dnsplugins_all.sh b/tools/snap/generate_dnsplugins_all.sh index 976b0dd7b3e..66607d9e196 100755 --- a/tools/snap/generate_dnsplugins_all.sh +++ b/tools/snap/generate_dnsplugins_all.sh @@ -10,7 +10,7 @@ for PLUGIN_PATH in "${CERTBOT_DIR}"/certbot-dns-*; do bash "${CERTBOT_DIR}"/tools/snap/generate_dnsplugins_postrefreshhook.sh $PLUGIN_PATH # Create constraints file "${CERTBOT_DIR}"/tools/merge_requirements.py tools/dev_constraints.txt \ - <("${CERTBOT_DIR}"/tools/strip_hashes.py tools/certbot_constraints.txt) \ + <("${CERTBOT_DIR}"/tools/strip_hashes.py tools/certbot_requirements.txt) \ <("${CERTBOT_DIR}"/tools/strip_hashes.py tools/pipstrap_constraints.txt) \ > "${PLUGIN_PATH}"/snap-constraints.txt done diff --git a/windows-installer/construct.py b/windows-installer/construct.py index eb199a7e10a..96373d44ef5 100644 --- a/windows-installer/construct.py +++ b/windows-installer/construct.py @@ -79,7 +79,7 @@ def _prepare_build_tools(venv_path, venv_python, repo_path): @contextlib.contextmanager def _prepare_constraints(repo_path): - reqs_certbot = os.path.join(repo_path, 'tools', 'certbot_constraints.txt') + reqs_certbot = os.path.join(repo_path, 'tools', 'certbot_requirements.txt') reqs_pipstrap = os.path.join(repo_path, 'tools', 'pipstrap_constraints.txt') constraints_certbot = subprocess.check_output( [sys.executable, os.path.join(repo_path, 'tools', 'strip_hashes.py'), reqs_certbot], From 4a51935b63678530a6f994ff0b65e47ff0ffd807 Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Thu, 11 Mar 2021 16:20:47 -0800 Subject: [PATCH 2/8] rename dev constraints to reqs --- tools/{dev_constraints.txt => dev_requirements.txt} | 4 ++-- tools/pip_install.py | 10 +++++----- tools/snap/generate_dnsplugins_all.sh | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) rename tools/{dev_constraints.txt => dev_requirements.txt} (96%) diff --git a/tools/dev_constraints.txt b/tools/dev_requirements.txt similarity index 96% rename from tools/dev_constraints.txt rename to tools/dev_requirements.txt index 8a45a794959..d4ba3789bb0 100644 --- a/tools/dev_constraints.txt +++ b/tools/dev_requirements.txt @@ -1,7 +1,7 @@ # Specifies Python package versions for development and building Docker images. # It includes in particular packages not specified in letsencrypt-auto's requirements file. -# Some dev package versions specified here may be overridden by higher level constraints -# files during tests (eg. tools/certbot_requirements.txt). +# Some dev package versions specified here may be overridden by higher level +# requirements files during tests (eg. tools/certbot_requirements.txt). alabaster==0.7.10 apacheconfig==0.3.2 apipkg==1.4 diff --git a/tools/pip_install.py b/tools/pip_install.py index cde0b61efa6..305e628bc74 100755 --- a/tools/pip_install.py +++ b/tools/pip_install.py @@ -1,10 +1,10 @@ #!/usr/bin/env python # pip installs packages using pinned package versions. If CERTBOT_OLDEST is set # to 1, a combination of tools/oldest_constraints.txt, -# tools/dev_constraints.txt, and local-oldest-requirements.txt contained in the +# tools/dev_requirements.txt, and local-oldest-requirements.txt contained in the # top level of the package's directory is used, otherwise, a combination of -# certbot-auto's requirements file and tools/dev_constraints.txt is used. The -# other file always takes precedence over tools/dev_constraints.txt. If +# certbot-auto's requirements file and tools/dev_requirements.txt is used. The +# other file always takes precedence over tools/dev_requirements.txt. If # CERTBOT_OLDEST is set, this script must be run with `-e ` and # no other arguments. @@ -74,11 +74,11 @@ def merge_requirements(tools_path, requirements, test_constraints, all_constrain # Indeed version retained for a given package will be the last version # found when following all requirements in the given order. # Here is the order by increasing priority: - # 1) The general development constraints (tools/dev_constraints.txt) + # 1) The general development constraints (tools/dev_requirements.txt) # 2) The general tests constraints (oldest_requirements.txt or # certbot_requirements.txt + pipstrap's constraints for the normal processing) # 3) The local requirement file, typically local-oldest-requirement in oldest tests - files = [os.path.join(tools_path, 'dev_constraints.txt'), test_constraints] + files = [os.path.join(tools_path, 'dev_requirements.txt'), test_constraints] if requirements: files.append(requirements) merged_requirements = merge_module.main(*files) diff --git a/tools/snap/generate_dnsplugins_all.sh b/tools/snap/generate_dnsplugins_all.sh index 66607d9e196..5f3c49104f1 100755 --- a/tools/snap/generate_dnsplugins_all.sh +++ b/tools/snap/generate_dnsplugins_all.sh @@ -9,7 +9,7 @@ for PLUGIN_PATH in "${CERTBOT_DIR}"/certbot-dns-*; do bash "${CERTBOT_DIR}"/tools/snap/generate_dnsplugins_snapcraft.sh $PLUGIN_PATH bash "${CERTBOT_DIR}"/tools/snap/generate_dnsplugins_postrefreshhook.sh $PLUGIN_PATH # Create constraints file - "${CERTBOT_DIR}"/tools/merge_requirements.py tools/dev_constraints.txt \ + "${CERTBOT_DIR}"/tools/merge_requirements.py tools/dev_requirements.txt \ <("${CERTBOT_DIR}"/tools/strip_hashes.py tools/certbot_requirements.txt) \ <("${CERTBOT_DIR}"/tools/strip_hashes.py tools/pipstrap_constraints.txt) \ > "${PLUGIN_PATH}"/snap-constraints.txt From 4e718804d04a865b455ef618ea424a4f89c7ef97 Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Thu, 11 Mar 2021 16:22:29 -0800 Subject: [PATCH 3/8] Rename pipstrap constraints to requirements --- snap/snapcraft.yaml | 2 +- tests/letstest/scripts/test_sdists.sh | 2 +- tools/pip_install.py | 2 +- tools/pipstrap.py | 2 +- tools/{pipstrap_constraints.txt => pipstrap_requirements.txt} | 2 +- tools/snap/generate_dnsplugins_all.sh | 2 +- windows-installer/construct.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) rename tools/{pipstrap_constraints.txt => pipstrap_requirements.txt} (96%) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index c647dd5518c..a8bf27615d1 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -86,7 +86,7 @@ parts: override-pull: | snapcraftctl pull python3 "${SNAPCRAFT_PART_SRC}/tools/strip_hashes.py" "${SNAPCRAFT_PART_SRC}/tools/certbot_requirements.txt" | grep -v python-augeas >> "${SNAPCRAFT_PART_SRC}/snap-constraints.txt" - python3 "${SNAPCRAFT_PART_SRC}/tools/strip_hashes.py" "${SNAPCRAFT_PART_SRC}/tools/pipstrap_constraints.txt" >> "${SNAPCRAFT_PART_SRC}/snap-constraints.txt" + python3 "${SNAPCRAFT_PART_SRC}/tools/strip_hashes.py" "${SNAPCRAFT_PART_SRC}/tools/pipstrap_requirements.txt" >> "${SNAPCRAFT_PART_SRC}/snap-constraints.txt" echo "$(python3 "${SNAPCRAFT_PART_SRC}/tools/merge_requirements.py" "${SNAPCRAFT_PART_SRC}/snap-constraints.txt")" > "${SNAPCRAFT_PART_SRC}/snap-constraints.txt" snapcraftctl set-version `grep -oP "__version__ = '\K.*(?=')" "${SNAPCRAFT_PART_SRC}/certbot/certbot/__init__.py"` shared-metadata: diff --git a/tests/letstest/scripts/test_sdists.sh b/tests/letstest/scripts/test_sdists.sh index 17e24ef0b43..31f4ef72b8f 100755 --- a/tests/letstest/scripts/test_sdists.sh +++ b/tests/letstest/scripts/test_sdists.sh @@ -12,7 +12,7 @@ sudo $BOOTSTRAP_SCRIPT # We strip the hashes because the venv creation script includes unhashed # constraints in the commands given to pip and the mix of hashed and unhashed # packages makes pip error out. -python3 tools/strip_hashes.py tools/pipstrap_constraints.txt > constraints.txt +python3 tools/strip_hashes.py tools/pipstrap_requirements.txt > constraints.txt python3 tools/strip_hashes.py tools/certbot_requirements.txt > requirements.txt # We pin cryptography to 3.1.1 and pyOpenSSL to 19.1.0 specifically for CentOS 7 / RHEL 7 diff --git a/tools/pip_install.py b/tools/pip_install.py index 305e628bc74..284aa7c0abf 100755 --- a/tools/pip_install.py +++ b/tools/pip_install.py @@ -60,7 +60,7 @@ def certbot_normal_processing(tools_path, test_constraints): repo_path, 'tools/certbot_requirements.txt')) with open(certbot_requirements, 'r') as fd: certbot_reqs = fd.readlines() - with open(os.path.join(tools_path, 'pipstrap_constraints.txt'), 'r') as fd: + with open(os.path.join(tools_path, 'pipstrap_requirements.txt'), 'r') as fd: pipstrap_reqs = fd.readlines() with open(test_constraints, 'w') as fd: data_certbot = "\n".join(strip_hashes.process_entries(certbot_reqs)) diff --git a/tools/pipstrap.py b/tools/pipstrap.py index 2b2e3dcbbe9..c0516d9ed77 100755 --- a/tools/pipstrap.py +++ b/tools/pipstrap.py @@ -4,7 +4,7 @@ import pip_install -_REQUIREMENTS_PATH = os.path.join(os.path.dirname(__file__), "pipstrap_constraints.txt") +_REQUIREMENTS_PATH = os.path.join(os.path.dirname(__file__), "pipstrap_requirements.txt") def main(): diff --git a/tools/pipstrap_constraints.txt b/tools/pipstrap_requirements.txt similarity index 96% rename from tools/pipstrap_constraints.txt rename to tools/pipstrap_requirements.txt index 5de9e147df5..21bf9c0b1a3 100644 --- a/tools/pipstrap_constraints.txt +++ b/tools/pipstrap_requirements.txt @@ -1,4 +1,4 @@ -# Constraints for pipstrap.py +# Requirements file for pipstrap.py # # We include the hashes of the packages here for extra verification of # the packages downloaded from PyPI. This is especially valuable in our diff --git a/tools/snap/generate_dnsplugins_all.sh b/tools/snap/generate_dnsplugins_all.sh index 5f3c49104f1..fdb80e6f60a 100755 --- a/tools/snap/generate_dnsplugins_all.sh +++ b/tools/snap/generate_dnsplugins_all.sh @@ -11,6 +11,6 @@ for PLUGIN_PATH in "${CERTBOT_DIR}"/certbot-dns-*; do # Create constraints file "${CERTBOT_DIR}"/tools/merge_requirements.py tools/dev_requirements.txt \ <("${CERTBOT_DIR}"/tools/strip_hashes.py tools/certbot_requirements.txt) \ - <("${CERTBOT_DIR}"/tools/strip_hashes.py tools/pipstrap_constraints.txt) \ + <("${CERTBOT_DIR}"/tools/strip_hashes.py tools/pipstrap_requirements.txt) \ > "${PLUGIN_PATH}"/snap-constraints.txt done diff --git a/windows-installer/construct.py b/windows-installer/construct.py index 96373d44ef5..a8bac904ea4 100644 --- a/windows-installer/construct.py +++ b/windows-installer/construct.py @@ -80,7 +80,7 @@ def _prepare_build_tools(venv_path, venv_python, repo_path): @contextlib.contextmanager def _prepare_constraints(repo_path): reqs_certbot = os.path.join(repo_path, 'tools', 'certbot_requirements.txt') - reqs_pipstrap = os.path.join(repo_path, 'tools', 'pipstrap_constraints.txt') + reqs_pipstrap = os.path.join(repo_path, 'tools', 'pipstrap_requirements.txt') constraints_certbot = subprocess.check_output( [sys.executable, os.path.join(repo_path, 'tools', 'strip_hashes.py'), reqs_certbot], universal_newlines=True) From 70d974b3cc6126ee4517e081347d1c7060e12557 Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Mon, 15 Mar 2021 14:38:57 -0700 Subject: [PATCH 4/8] update comments --- tools/certbot_requirements.txt | 99 +++++++++++++++------------- tools/dev_requirements.txt | 14 ++-- tools/pipstrap_requirements.txt | 5 ++ tools/rebuild_certbot_constraints.py | 7 +- 4 files changed, 73 insertions(+), 52 deletions(-) diff --git a/tools/certbot_requirements.txt b/tools/certbot_requirements.txt index 9ea882223c0..8b19efb927c 100644 --- a/tools/certbot_requirements.txt +++ b/tools/certbot_requirements.txt @@ -1,4 +1,9 @@ -# This is the flattened list of pinned packages to build certbot deployable artifacts. +# This is the flattened list of pinned packages to use as constraints for pip +# when building deployable Certbot artifacts. Despite the file being used as +# constraints, you may want to include "requirements.txt" in the filename so +# https://docs.github.com/en/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#supported-package-ecosystems +# for more info. +# # To generate this, do (with docker and package hashin installed): # ``` # tools/rebuild_certbot_contraints.py \ @@ -9,49 +14,49 @@ # pip install hashin # hashin -r dependency-requirements.txt cryptography==1.5.2 # ``` -ConfigArgParse==1.2.3 \ - --hash=sha256:edd17be986d5c1ba2e307150b8e5f5107aba125f3574dddd02c85d5cdcfd37dc +ConfigArgParse==1.4 \ + --hash=sha256:abef9ff44fb0091f0e3bb2ee7e5b26a02b5b62d45408a5272a9bd461f5b59b4b certifi==2020.12.5 \ --hash=sha256:1a4995114262bffbc2413b159f2a1a480c969de6e6eb13ee966d470af86af59c \ --hash=sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830 -cffi==1.14.4 \ - --hash=sha256:00a1ba5e2e95684448de9b89888ccd02c98d512064b4cb987d48f4b40aa0421e \ - --hash=sha256:00e28066507bfc3fe865a31f325c8391a1ac2916219340f87dfad602c3e48e5d \ - --hash=sha256:045d792900a75e8b1e1b0ab6787dd733a8190ffcf80e8c8ceb2fb10a29ff238a \ - --hash=sha256:0638c3ae1a0edfb77c6765d487fee624d2b1ee1bdfeffc1f0b58c64d149e7eec \ - --hash=sha256:105abaf8a6075dc96c1fe5ae7aae073f4696f2905fde6aeada4c9d2926752362 \ - --hash=sha256:155136b51fd733fa94e1c2ea5211dcd4c8879869008fc811648f16541bf99668 \ - --hash=sha256:1a465cbe98a7fd391d47dce4b8f7e5b921e6cd805ef421d04f5f66ba8f06086c \ - --hash=sha256:1d2c4994f515e5b485fd6d3a73d05526aa0fcf248eb135996b088d25dfa1865b \ - --hash=sha256:2c24d61263f511551f740d1a065eb0212db1dbbbbd241db758f5244281590c06 \ - --hash=sha256:51a8b381b16ddd370178a65360ebe15fbc1c71cf6f584613a7ea08bfad946698 \ - --hash=sha256:594234691ac0e9b770aee9fcdb8fa02c22e43e5c619456efd0d6c2bf276f3eb2 \ - --hash=sha256:5cf4be6c304ad0b6602f5c4e90e2f59b47653ac1ed9c662ed379fe48a8f26b0c \ - --hash=sha256:64081b3f8f6f3c3de6191ec89d7dc6c86a8a43911f7ecb422c60e90c70be41c7 \ - --hash=sha256:6bc25fc545a6b3d57b5f8618e59fc13d3a3a68431e8ca5fd4c13241cd70d0009 \ - --hash=sha256:798caa2a2384b1cbe8a2a139d80734c9db54f9cc155c99d7cc92441a23871c03 \ - --hash=sha256:7c6b1dece89874d9541fc974917b631406233ea0440d0bdfbb8e03bf39a49b3b \ - --hash=sha256:7ef7d4ced6b325e92eb4d3502946c78c5367bc416398d387b39591532536734e \ - --hash=sha256:840793c68105fe031f34d6a086eaea153a0cd5c491cde82a74b420edd0a2b909 \ - --hash=sha256:8d6603078baf4e11edc4168a514c5ce5b3ba6e3e9c374298cb88437957960a53 \ - --hash=sha256:9cc46bc107224ff5b6d04369e7c595acb700c3613ad7bcf2e2012f62ece80c35 \ - --hash=sha256:9f7a31251289b2ab6d4012f6e83e58bc3b96bd151f5b5262467f4bb6b34a7c26 \ - --hash=sha256:9ffb888f19d54a4d4dfd4b3f29bc2c16aa4972f1c2ab9c4ab09b8ab8685b9c2b \ - --hash=sha256:a5ed8c05548b54b998b9498753fb9cadbfd92ee88e884641377d8a8b291bcc01 \ - --hash=sha256:a7711edca4dcef1a75257b50a2fbfe92a65187c47dab5a0f1b9b332c5919a3fb \ - --hash=sha256:af5c59122a011049aad5dd87424b8e65a80e4a6477419c0c1015f73fb5ea0293 \ - --hash=sha256:b18e0a9ef57d2b41f5c68beefa32317d286c3d6ac0484efd10d6e07491bb95dd \ - --hash=sha256:b4e248d1087abf9f4c10f3c398896c87ce82a9856494a7155823eb45a892395d \ - --hash=sha256:ba4e9e0ae13fc41c6b23299545e5ef73055213e466bd107953e4a013a5ddd7e3 \ - --hash=sha256:c6332685306b6417a91b1ff9fae889b3ba65c2292d64bd9245c093b1b284809d \ - --hash=sha256:d5ff0621c88ce83a28a10d2ce719b2ee85635e85c515f12bac99a95306da4b2e \ - --hash=sha256:d9efd8b7a3ef378dd61a1e77367f1924375befc2eba06168b6ebfa903a5e59ca \ - --hash=sha256:df5169c4396adc04f9b0a05f13c074df878b6052430e03f50e68adf3a57aa28d \ - --hash=sha256:ebb253464a5d0482b191274f1c8bf00e33f7e0b9c66405fbffc61ed2c839c775 \ - --hash=sha256:ec80dc47f54e6e9a78181ce05feb71a0353854cc26999db963695f950b5fb375 \ - --hash=sha256:f032b34669220030f905152045dfa27741ce1a6db3324a5bc0b96b6c7420c87b \ - --hash=sha256:f60567825f791c6f8a592f3c6e3bd93dd2934e3f9dac189308426bd76b00ef3b \ - --hash=sha256:f803eaa94c2fcda012c047e62bc7a51b0bdabda1cad7a92a522694ea2d76e49f +cffi==1.14.5 \ + --hash=sha256:005a36f41773e148deac64b08f233873a4d0c18b053d37da83f6af4d9087b813 \ + --hash=sha256:0857f0ae312d855239a55c81ef453ee8fd24136eaba8e87a2eceba644c0d4c06 \ + --hash=sha256:1071534bbbf8cbb31b498d5d9db0f274f2f7a865adca4ae429e147ba40f73dea \ + --hash=sha256:158d0d15119b4b7ff6b926536763dc0714313aa59e320ddf787502c70c4d4bee \ + --hash=sha256:1f436816fc868b098b0d63b8920de7d208c90a67212546d02f84fe78a9c26396 \ + --hash=sha256:2894f2df484ff56d717bead0a5c2abb6b9d2bf26d6960c4604d5c48bbc30ee73 \ + --hash=sha256:29314480e958fd8aab22e4a58b355b629c59bf5f2ac2492b61e3dc06d8c7a315 \ + --hash=sha256:34eff4b97f3d982fb93e2831e6750127d1355a923ebaeeb565407b3d2f8d41a1 \ + --hash=sha256:35f27e6eb43380fa080dccf676dece30bef72e4a67617ffda586641cd4508d49 \ + --hash=sha256:3d3dd4c9e559eb172ecf00a2a7517e97d1e96de2a5e610bd9b68cea3925b4892 \ + --hash=sha256:43e0b9d9e2c9e5d152946b9c5fe062c151614b262fda2e7b201204de0b99e482 \ + --hash=sha256:48e1c69bbacfc3d932221851b39d49e81567a4d4aac3b21258d9c24578280058 \ + --hash=sha256:51182f8927c5af975fece87b1b369f722c570fe169f9880764b1ee3bca8347b5 \ + --hash=sha256:58e3f59d583d413809d60779492342801d6e82fefb89c86a38e040c16883be53 \ + --hash=sha256:5de7970188bb46b7bf9858eb6890aad302577a5f6f75091fd7cdd3ef13ef3045 \ + --hash=sha256:65fa59693c62cf06e45ddbb822165394a288edce9e276647f0046e1ec26920f3 \ + --hash=sha256:69e395c24fc60aad6bb4fa7e583698ea6cc684648e1ffb7fe85e3c1ca131a7d5 \ + --hash=sha256:6c97d7350133666fbb5cf4abdc1178c812cb205dc6f41d174a7b0f18fb93337e \ + --hash=sha256:6e4714cc64f474e4d6e37cfff31a814b509a35cb17de4fb1999907575684479c \ + --hash=sha256:72d8d3ef52c208ee1c7b2e341f7d71c6fd3157138abf1a95166e6165dd5d4369 \ + --hash=sha256:8ae6299f6c68de06f136f1f9e69458eae58f1dacf10af5c17353eae03aa0d827 \ + --hash=sha256:8b198cec6c72df5289c05b05b8b0969819783f9418e0409865dac47288d2a053 \ + --hash=sha256:99cd03ae7988a93dd00bcd9d0b75e1f6c426063d6f03d2f90b89e29b25b82dfa \ + --hash=sha256:9cf8022fb8d07a97c178b02327b284521c7708d7c71a9c9c355c178ac4bbd3d4 \ + --hash=sha256:9de2e279153a443c656f2defd67769e6d1e4163952b3c622dcea5b08a6405322 \ + --hash=sha256:9e93e79c2551ff263400e1e4be085a1210e12073a31c2011dbbda14bda0c6132 \ + --hash=sha256:9ff227395193126d82e60319a673a037d5de84633f11279e336f9c0f189ecc62 \ + --hash=sha256:a465da611f6fa124963b91bf432d960a555563efe4ed1cc403ba5077b15370aa \ + --hash=sha256:ad17025d226ee5beec591b52800c11680fca3df50b8b29fe51d882576e039ee0 \ + --hash=sha256:afb29c1ba2e5a3736f1c301d9d0abe3ec8b86957d04ddfa9d7a6a42b9367e396 \ + --hash=sha256:b85eb46a81787c50650f2392b9b4ef23e1f126313b9e0e9013b35c15e4288e2e \ + --hash=sha256:bb89f306e5da99f4d922728ddcd6f7fcebb3241fc40edebcb7284d7514741991 \ + --hash=sha256:cbde590d4faaa07c72bf979734738f328d239913ba3e043b1e98fe9a39f8b2b6 \ + --hash=sha256:cd2868886d547469123fadc46eac7ea5253ea7fcb139f12e1dfc2bbd406427d1 \ + --hash=sha256:d42b11d692e11b6634f7613ad8df5d6d5f8875f5d48939520d351007b3c13406 \ + --hash=sha256:f2d45f97ab6bb54753eab54fffe75aaf3de4ff2341c9daee1987ee1837636f1d \ + --hash=sha256:fd78e5fee591709f32ef6edb9a015b4aa1a5022598e36227500c8f4e02328d9c chardet==4.0.0 \ --hash=sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa \ --hash=sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5 @@ -78,9 +83,9 @@ distro==1.5.0 \ idna==2.10 \ --hash=sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6 \ --hash=sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0 -josepy==1.6.0 \ - --hash=sha256:0aab1c3ceffe045e7fd5bcfe7685e27e9d2758518d9ba7116b5de34087e70bf5 \ - --hash=sha256:65f077fc5902aca1e140ddb000e7abb081d5fb8421db60b6071076ef81c5bd27 +josepy==1.7.0 \ + --hash=sha256:84c9d202093236fddbfaefc3137a476a9863d43c054268863a9d6727a22f1317 \ + --hash=sha256:d265414fa16d7a8b7a1d1833b4ebb19a22bd0deae5d44413cf9040fd8491d85a parsedatetime==2.6 \ --hash=sha256:4cb368fbb18a0b7231f4d76119165451c8d2e35951455dfee97c62a87b04d455 \ --hash=sha256:cb96edd7016872f58479e35879294258c71437195760746faffedb692aef000b @@ -110,9 +115,9 @@ requests-toolbelt==0.9.1 \ six==1.15.0 \ --hash=sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259 \ --hash=sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced -urllib3==1.26.3 \ - --hash=sha256:1b465e494e3e0d8939b50680403e3aedaa2bc434b7d5af64dfd3c958d7f5ae80 \ - --hash=sha256:de3eedaad74a2683334e282005cd8d7f22f4d55fa690a2a1020a416cb0a47e73 +urllib3==1.26.4 \ + --hash=sha256:2f4da4594db7e1e110a944bb1b551fdf4e6c136ad42e4234131391e21eb5b0df \ + --hash=sha256:e7b021f7241115872f92f43c6508082facffbd1c048e3c6e2bb9c2a157e28937 zope.component==4.6.2 \ --hash=sha256:607628e4c84f7887a69a958542b5c304663e726b73aba0882e3a3f059bff14f3 \ --hash=sha256:91628918218b3e6f6323de2a7b845e09ddc5cae131c034896c051b084bba3c92 diff --git a/tools/dev_requirements.txt b/tools/dev_requirements.txt index d4ba3789bb0..81ac5c2b777 100644 --- a/tools/dev_requirements.txt +++ b/tools/dev_requirements.txt @@ -1,7 +1,13 @@ -# Specifies Python package versions for development and building Docker images. -# It includes in particular packages not specified in letsencrypt-auto's requirements file. -# Some dev package versions specified here may be overridden by higher level -# requirements files during tests (eg. tools/certbot_requirements.txt). +# Specifies Python package versions for development and building Docker +# images. It includes in particular packages not specified in Certbot's +# requirements file. Some dev package versions specified here may be +# overridden by higher level requirements files during tests (eg. +# tools/certbot_requirements.txt). Because of that and the fact that this file +# is used as constraints rather than requirements, you should include any +# package that may be required here. This file is named "requirements" rather +# than "constraints" so that 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.10 apacheconfig==0.3.2 apipkg==1.4 diff --git a/tools/pipstrap_requirements.txt b/tools/pipstrap_requirements.txt index 21bf9c0b1a3..a54e65d6933 100644 --- a/tools/pipstrap_requirements.txt +++ b/tools/pipstrap_requirements.txt @@ -1,5 +1,10 @@ # Requirements file for pipstrap.py # +# It is important that this file's name includes "requirements.txt" so that 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. +# # We include the hashes of the packages here for extra verification of # the packages downloaded from PyPI. This is especially valuable in our # builds of Certbot that we ship to our users such as our Docker images. diff --git a/tools/rebuild_certbot_constraints.py b/tools/rebuild_certbot_constraints.py index 39571b2b17d..294d6cdaaf7 100755 --- a/tools/rebuild_certbot_constraints.py +++ b/tools/rebuild_certbot_constraints.py @@ -205,7 +205,12 @@ def _write_requirements(dest_file, requirements, conflicts): print('===> Calculating hashes for the requirement file.') _write_to(dest_file, '''\ -# This is the flattened list of pinned packages to build certbot deployable artifacts. +# This is the flattened list of pinned packages to use as constraints for pip +# when building deployable Certbot artifacts. Despite the file being used as +# constraints, you may want to include "requirements.txt" in the filename so +# https://docs.github.com/en/github/visualizing-repository-data-with-graphs/about-the-dependency-graph#supported-package-ecosystems +# for more info. +# # To generate this, do (with docker and package hashin installed): # ``` # tools/rebuild_certbot_contraints.py \\ From 6f6521226f853e6b186b196f18bdc558fd32f952 Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Mon, 15 Mar 2021 14:41:20 -0700 Subject: [PATCH 5/8] update httplib2 and jinja --- tools/dev_requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/dev_requirements.txt b/tools/dev_requirements.txt index 81ac5c2b777..7e2eba26a76 100644 --- a/tools/dev_requirements.txt +++ b/tools/dev_requirements.txt @@ -45,7 +45,7 @@ future==0.16.0 futures==3.3.0 filelock==3.0.12 google-api-python-client==1.5.5 -httplib2==0.18.1 +httplib2==0.19.0 imagesize==0.7.1 importlib-metadata==0.23 ipdb==0.12.3 @@ -54,7 +54,7 @@ ipython-genutils==0.2.0 isodate==0.6.0 isort==4.3.21 jedi==0.17.1 -Jinja2==2.9.6 +Jinja2==2.11.3 jmespath==0.9.4 josepy==1.1.0 jsonpickle==2.0.0 From f9e2dda6e683c23f25c67031fcd74b87c233f727 Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Mon, 15 Mar 2021 14:42:18 -0700 Subject: [PATCH 6/8] delete extra stuff --- acme/readthedocs.org.requirements.txt | 10 ---------- certbot-apache/local-oldest-requirements.txt | 3 --- certbot-dns-cloudflare/local-oldest-requirements.txt | 3 --- .../readthedocs.org.requirements.txt | 12 ------------ certbot-dns-cloudxns/local-oldest-requirements.txt | 3 --- .../readthedocs.org.requirements.txt | 12 ------------ .../local-oldest-requirements.txt | 3 --- .../readthedocs.org.requirements.txt | 12 ------------ certbot-dns-dnsimple/local-oldest-requirements.txt | 3 --- .../readthedocs.org.requirements.txt | 12 ------------ .../local-oldest-requirements.txt | 3 --- .../readthedocs.org.requirements.txt | 12 ------------ certbot-dns-gehirn/local-oldest-requirements.txt | 3 --- certbot-dns-gehirn/readthedocs.org.requirements.txt | 12 ------------ certbot-dns-google/local-oldest-requirements.txt | 3 --- certbot-dns-google/readthedocs.org.requirements.txt | 12 ------------ certbot-dns-linode/local-oldest-requirements.txt | 4 ---- certbot-dns-linode/readthedocs.org.requirements.txt | 12 ------------ certbot-dns-luadns/local-oldest-requirements.txt | 3 --- certbot-dns-luadns/readthedocs.org.requirements.txt | 12 ------------ certbot-dns-nsone/local-oldest-requirements.txt | 3 --- certbot-dns-nsone/readthedocs.org.requirements.txt | 12 ------------ certbot-dns-ovh/local-oldest-requirements.txt | 4 ---- certbot-dns-ovh/readthedocs.org.requirements.txt | 12 ------------ certbot-dns-rfc2136/local-oldest-requirements.txt | 3 --- certbot-dns-rfc2136/readthedocs.org.requirements.txt | 12 ------------ certbot-dns-route53/local-oldest-requirements.txt | 3 --- certbot-dns-route53/readthedocs.org.requirements.txt | 12 ------------ .../local-oldest-requirements.txt | 3 --- .../readthedocs.org.requirements.txt | 12 ------------ certbot-nginx/local-oldest-requirements.txt | 3 --- certbot/local-oldest-requirements.txt | 2 -- certbot/readthedocs.org.requirements.txt | 11 ----------- 33 files changed, 241 deletions(-) delete mode 100644 acme/readthedocs.org.requirements.txt delete mode 100644 certbot-apache/local-oldest-requirements.txt delete mode 100644 certbot-dns-cloudflare/local-oldest-requirements.txt delete mode 100644 certbot-dns-cloudflare/readthedocs.org.requirements.txt delete mode 100644 certbot-dns-cloudxns/local-oldest-requirements.txt delete mode 100644 certbot-dns-cloudxns/readthedocs.org.requirements.txt delete mode 100644 certbot-dns-digitalocean/local-oldest-requirements.txt delete mode 100644 certbot-dns-digitalocean/readthedocs.org.requirements.txt delete mode 100644 certbot-dns-dnsimple/local-oldest-requirements.txt delete mode 100644 certbot-dns-dnsimple/readthedocs.org.requirements.txt delete mode 100644 certbot-dns-dnsmadeeasy/local-oldest-requirements.txt delete mode 100644 certbot-dns-dnsmadeeasy/readthedocs.org.requirements.txt delete mode 100644 certbot-dns-gehirn/local-oldest-requirements.txt delete mode 100644 certbot-dns-gehirn/readthedocs.org.requirements.txt delete mode 100644 certbot-dns-google/local-oldest-requirements.txt delete mode 100644 certbot-dns-google/readthedocs.org.requirements.txt delete mode 100644 certbot-dns-linode/local-oldest-requirements.txt delete mode 100644 certbot-dns-linode/readthedocs.org.requirements.txt delete mode 100644 certbot-dns-luadns/local-oldest-requirements.txt delete mode 100644 certbot-dns-luadns/readthedocs.org.requirements.txt delete mode 100644 certbot-dns-nsone/local-oldest-requirements.txt delete mode 100644 certbot-dns-nsone/readthedocs.org.requirements.txt delete mode 100644 certbot-dns-ovh/local-oldest-requirements.txt delete mode 100644 certbot-dns-ovh/readthedocs.org.requirements.txt delete mode 100644 certbot-dns-rfc2136/local-oldest-requirements.txt delete mode 100644 certbot-dns-rfc2136/readthedocs.org.requirements.txt delete mode 100644 certbot-dns-route53/local-oldest-requirements.txt delete mode 100644 certbot-dns-route53/readthedocs.org.requirements.txt delete mode 100644 certbot-dns-sakuracloud/local-oldest-requirements.txt delete mode 100644 certbot-dns-sakuracloud/readthedocs.org.requirements.txt delete mode 100644 certbot-nginx/local-oldest-requirements.txt delete mode 100644 certbot/local-oldest-requirements.txt delete mode 100644 certbot/readthedocs.org.requirements.txt diff --git a/acme/readthedocs.org.requirements.txt b/acme/readthedocs.org.requirements.txt deleted file mode 100644 index 168af801350..00000000000 --- a/acme/readthedocs.org.requirements.txt +++ /dev/null @@ -1,10 +0,0 @@ -# readthedocs.org gives no way to change the install command to "pip -# install -e acme[docs]" (that would in turn install documentation -# dependencies), but it allows to specify a requirements.txt file at -# https://readthedocs.org/dashboard/letsencrypt/advanced/ (c.f. #259) - -# Although ReadTheDocs certainly doesn't need to install the project -# in --editable mode (-e), just "pip install acme[docs]" does not work as -# expected and "pip install -e acme[docs]" must be used instead - --e acme[docs] diff --git a/certbot-apache/local-oldest-requirements.txt b/certbot-apache/local-oldest-requirements.txt deleted file mode 100644 index ee742a478bf..00000000000 --- a/certbot-apache/local-oldest-requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Remember to update setup.py to match the package versions below. -acme[dev]==0.29.0 -certbot[dev]==1.6.0 \ No newline at end of file diff --git a/certbot-dns-cloudflare/local-oldest-requirements.txt b/certbot-dns-cloudflare/local-oldest-requirements.txt deleted file mode 100644 index cf61c15a591..00000000000 --- a/certbot-dns-cloudflare/local-oldest-requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Remember to update setup.py to match the package versions below. -acme[dev]==0.29.0 -certbot[dev]==1.1.0 diff --git a/certbot-dns-cloudflare/readthedocs.org.requirements.txt b/certbot-dns-cloudflare/readthedocs.org.requirements.txt deleted file mode 100644 index f1df15227ab..00000000000 --- a/certbot-dns-cloudflare/readthedocs.org.requirements.txt +++ /dev/null @@ -1,12 +0,0 @@ -# readthedocs.org gives no way to change the install command to "pip -# install -e certbot-dns-cloudflare[docs]" (that would in turn install documentation -# dependencies), but it allows to specify a requirements.txt file at -# https://readthedocs.org/dashboard/letsencrypt/advanced/ (c.f. #259) - -# Although ReadTheDocs certainly doesn't need to install the project -# in --editable mode (-e), just "pip install certbot-dns-cloudflare[docs]" does not work as -# expected and "pip install -e certbot-dns-cloudflare[docs]" must be used instead - --e acme --e certbot --e certbot-dns-cloudflare[docs] diff --git a/certbot-dns-cloudxns/local-oldest-requirements.txt b/certbot-dns-cloudxns/local-oldest-requirements.txt deleted file mode 100644 index 1307698d4fa..00000000000 --- a/certbot-dns-cloudxns/local-oldest-requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Remember to update setup.py to match the package versions below. -acme[dev]==0.31.0 -certbot[dev]==1.1.0 diff --git a/certbot-dns-cloudxns/readthedocs.org.requirements.txt b/certbot-dns-cloudxns/readthedocs.org.requirements.txt deleted file mode 100644 index a9a4d068b2f..00000000000 --- a/certbot-dns-cloudxns/readthedocs.org.requirements.txt +++ /dev/null @@ -1,12 +0,0 @@ -# readthedocs.org gives no way to change the install command to "pip -# install -e certbot-dns-cloudxns[docs]" (that would in turn install documentation -# dependencies), but it allows to specify a requirements.txt file at -# https://readthedocs.org/dashboard/letsencrypt/advanced/ (c.f. #259) - -# Although ReadTheDocs certainly doesn't need to install the project -# in --editable mode (-e), just "pip install certbot-dns-cloudxns[docs]" does not work as -# expected and "pip install -e certbot-dns-cloudxns[docs]" must be used instead - --e acme --e certbot --e certbot-dns-cloudxns[docs] diff --git a/certbot-dns-digitalocean/local-oldest-requirements.txt b/certbot-dns-digitalocean/local-oldest-requirements.txt deleted file mode 100644 index cf61c15a591..00000000000 --- a/certbot-dns-digitalocean/local-oldest-requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Remember to update setup.py to match the package versions below. -acme[dev]==0.29.0 -certbot[dev]==1.1.0 diff --git a/certbot-dns-digitalocean/readthedocs.org.requirements.txt b/certbot-dns-digitalocean/readthedocs.org.requirements.txt deleted file mode 100644 index d0cc2f74a4e..00000000000 --- a/certbot-dns-digitalocean/readthedocs.org.requirements.txt +++ /dev/null @@ -1,12 +0,0 @@ -# readthedocs.org gives no way to change the install command to "pip -# install -e certbot-dns-digitalocean[docs]" (that would in turn install documentation -# dependencies), but it allows to specify a requirements.txt file at -# https://readthedocs.org/dashboard/letsencrypt/advanced/ (c.f. #259) - -# Although ReadTheDocs certainly doesn't need to install the project -# in --editable mode (-e), just "pip install certbot-dns-digitalocean[docs]" does not work as -# expected and "pip install -e certbot-dns-digitalocean[docs]" must be used instead - --e acme --e certbot --e certbot-dns-digitalocean[docs] diff --git a/certbot-dns-dnsimple/local-oldest-requirements.txt b/certbot-dns-dnsimple/local-oldest-requirements.txt deleted file mode 100644 index 1307698d4fa..00000000000 --- a/certbot-dns-dnsimple/local-oldest-requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Remember to update setup.py to match the package versions below. -acme[dev]==0.31.0 -certbot[dev]==1.1.0 diff --git a/certbot-dns-dnsimple/readthedocs.org.requirements.txt b/certbot-dns-dnsimple/readthedocs.org.requirements.txt deleted file mode 100644 index 04163ff34e2..00000000000 --- a/certbot-dns-dnsimple/readthedocs.org.requirements.txt +++ /dev/null @@ -1,12 +0,0 @@ -# readthedocs.org gives no way to change the install command to "pip -# install -e certbot-dns-dnsimple[docs]" (that would in turn install documentation -# dependencies), but it allows to specify a requirements.txt file at -# https://readthedocs.org/dashboard/letsencrypt/advanced/ (c.f. #259) - -# Although ReadTheDocs certainly doesn't need to install the project -# in --editable mode (-e), just "pip install certbot-dns-dnsimple[docs]" does not work as -# expected and "pip install -e certbot-dns-dnsimple[docs]" must be used instead - --e acme --e certbot --e certbot-dns-dnsimple[docs] diff --git a/certbot-dns-dnsmadeeasy/local-oldest-requirements.txt b/certbot-dns-dnsmadeeasy/local-oldest-requirements.txt deleted file mode 100644 index 1307698d4fa..00000000000 --- a/certbot-dns-dnsmadeeasy/local-oldest-requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Remember to update setup.py to match the package versions below. -acme[dev]==0.31.0 -certbot[dev]==1.1.0 diff --git a/certbot-dns-dnsmadeeasy/readthedocs.org.requirements.txt b/certbot-dns-dnsmadeeasy/readthedocs.org.requirements.txt deleted file mode 100644 index eb205d8f2d6..00000000000 --- a/certbot-dns-dnsmadeeasy/readthedocs.org.requirements.txt +++ /dev/null @@ -1,12 +0,0 @@ -# readthedocs.org gives no way to change the install command to "pip -# install -e certbot-dns-dnsmadeeasy[docs]" (that would in turn install documentation -# dependencies), but it allows to specify a requirements.txt file at -# https://readthedocs.org/dashboard/letsencrypt/advanced/ (c.f. #259) - -# Although ReadTheDocs certainly doesn't need to install the project -# in --editable mode (-e), just "pip install certbot-dns-dnsmadeeasy[docs]" does not work as -# expected and "pip install -e certbot-dns-dnsmadeeasy[docs]" must be used instead - --e acme --e certbot --e certbot-dns-dnsmadeeasy[docs] diff --git a/certbot-dns-gehirn/local-oldest-requirements.txt b/certbot-dns-gehirn/local-oldest-requirements.txt deleted file mode 100644 index 1307698d4fa..00000000000 --- a/certbot-dns-gehirn/local-oldest-requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Remember to update setup.py to match the package versions below. -acme[dev]==0.31.0 -certbot[dev]==1.1.0 diff --git a/certbot-dns-gehirn/readthedocs.org.requirements.txt b/certbot-dns-gehirn/readthedocs.org.requirements.txt deleted file mode 100644 index 97af343d9b9..00000000000 --- a/certbot-dns-gehirn/readthedocs.org.requirements.txt +++ /dev/null @@ -1,12 +0,0 @@ -# readthedocs.org gives no way to change the install command to "pip -# install -e certbot-dns-gehirn[docs]" (that would in turn install documentation -# dependencies), but it allows to specify a requirements.txt file at -# https://readthedocs.org/dashboard/letsencrypt/advanced/ (c.f. #259) - -# Although ReadTheDocs certainly doesn't need to install the project -# in --editable mode (-e), just "pip install certbot-dns-gehirn[docs]" does not work as -# expected and "pip install -e certbot-dns-gehirn[docs]" must be used instead - --e acme --e certbot --e certbot-dns-gehirn[docs] diff --git a/certbot-dns-google/local-oldest-requirements.txt b/certbot-dns-google/local-oldest-requirements.txt deleted file mode 100644 index cf61c15a591..00000000000 --- a/certbot-dns-google/local-oldest-requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Remember to update setup.py to match the package versions below. -acme[dev]==0.29.0 -certbot[dev]==1.1.0 diff --git a/certbot-dns-google/readthedocs.org.requirements.txt b/certbot-dns-google/readthedocs.org.requirements.txt deleted file mode 100644 index fe97cee9478..00000000000 --- a/certbot-dns-google/readthedocs.org.requirements.txt +++ /dev/null @@ -1,12 +0,0 @@ -# readthedocs.org gives no way to change the install command to "pip -# install -e certbot-dns-google[docs]" (that would in turn install documentation -# dependencies), but it allows to specify a requirements.txt file at -# https://readthedocs.org/dashboard/letsencrypt/advanced/ (c.f. #259) - -# Although ReadTheDocs certainly doesn't need to install the project -# in --editable mode (-e), just "pip install certbot-dns-google[docs]" does not work as -# expected and "pip install -e certbot-dns-google[docs]" must be used instead - --e acme --e certbot --e certbot-dns-google[docs] diff --git a/certbot-dns-linode/local-oldest-requirements.txt b/certbot-dns-linode/local-oldest-requirements.txt deleted file mode 100644 index a8bd7449a05..00000000000 --- a/certbot-dns-linode/local-oldest-requirements.txt +++ /dev/null @@ -1,4 +0,0 @@ -# Remember to update setup.py to match the package versions below. -acme[dev]==0.31.0 -certbot[dev]==1.1.0 -dns-lexicon==2.2.3 diff --git a/certbot-dns-linode/readthedocs.org.requirements.txt b/certbot-dns-linode/readthedocs.org.requirements.txt deleted file mode 100644 index 3d28f43bf15..00000000000 --- a/certbot-dns-linode/readthedocs.org.requirements.txt +++ /dev/null @@ -1,12 +0,0 @@ -# readthedocs.org gives no way to change the install command to "pip -# install -e certbot-dns-linode[docs]" (that would in turn install documentation -# dependencies), but it allows to specify a requirements.txt file at -# https://readthedocs.org/dashboard/letsencrypt/advanced/ (c.f. #259) - -# Although ReadTheDocs certainly doesn't need to install the project -# in --editable mode (-e), just "pip install certbot-dns-linode[docs]" does not work as -# expected and "pip install -e certbot-dns-linode[docs]" must be used instead - --e acme --e certbot --e certbot-dns-linode[docs] diff --git a/certbot-dns-luadns/local-oldest-requirements.txt b/certbot-dns-luadns/local-oldest-requirements.txt deleted file mode 100644 index 1307698d4fa..00000000000 --- a/certbot-dns-luadns/local-oldest-requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Remember to update setup.py to match the package versions below. -acme[dev]==0.31.0 -certbot[dev]==1.1.0 diff --git a/certbot-dns-luadns/readthedocs.org.requirements.txt b/certbot-dns-luadns/readthedocs.org.requirements.txt deleted file mode 100644 index 6f467dc7c1b..00000000000 --- a/certbot-dns-luadns/readthedocs.org.requirements.txt +++ /dev/null @@ -1,12 +0,0 @@ -# readthedocs.org gives no way to change the install command to "pip -# install -e certbot-dns-luadns[docs]" (that would in turn install documentation -# dependencies), but it allows to specify a requirements.txt file at -# https://readthedocs.org/dashboard/letsencrypt/advanced/ (c.f. #259) - -# Although ReadTheDocs certainly doesn't need to install the project -# in --editable mode (-e), just "pip install certbot-dns-luadns[docs]" does not work as -# expected and "pip install -e certbot-dns-luadns[docs]" must be used instead - --e acme --e certbot --e certbot-dns-luadns[docs] diff --git a/certbot-dns-nsone/local-oldest-requirements.txt b/certbot-dns-nsone/local-oldest-requirements.txt deleted file mode 100644 index 1307698d4fa..00000000000 --- a/certbot-dns-nsone/local-oldest-requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Remember to update setup.py to match the package versions below. -acme[dev]==0.31.0 -certbot[dev]==1.1.0 diff --git a/certbot-dns-nsone/readthedocs.org.requirements.txt b/certbot-dns-nsone/readthedocs.org.requirements.txt deleted file mode 100644 index bf17eae3088..00000000000 --- a/certbot-dns-nsone/readthedocs.org.requirements.txt +++ /dev/null @@ -1,12 +0,0 @@ -# readthedocs.org gives no way to change the install command to "pip -# install -e certbot-dns-nsone[docs]" (that would in turn install documentation -# dependencies), but it allows to specify a requirements.txt file at -# https://readthedocs.org/dashboard/letsencrypt/advanced/ (c.f. #259) - -# Although ReadTheDocs certainly doesn't need to install the project -# in --editable mode (-e), just "pip install certbot-dns-nsone[docs]" does not work as -# expected and "pip install -e certbot-dns-nsone[docs]" must be used instead - --e acme --e certbot --e certbot-dns-nsone[docs] diff --git a/certbot-dns-ovh/local-oldest-requirements.txt b/certbot-dns-ovh/local-oldest-requirements.txt deleted file mode 100644 index c55e0d570fe..00000000000 --- a/certbot-dns-ovh/local-oldest-requirements.txt +++ /dev/null @@ -1,4 +0,0 @@ -# Remember to update setup.py to match the package versions below. -acme[dev]==0.31.0 -certbot[dev]==1.1.0 -dns-lexicon==2.7.14 diff --git a/certbot-dns-ovh/readthedocs.org.requirements.txt b/certbot-dns-ovh/readthedocs.org.requirements.txt deleted file mode 100644 index 3c21ae0ce6d..00000000000 --- a/certbot-dns-ovh/readthedocs.org.requirements.txt +++ /dev/null @@ -1,12 +0,0 @@ -# readthedocs.org gives no way to change the install command to "pip -# install -e certbot-dns-ovh[docs]" (that would in turn install documentation -# dependencies), but it allows to specify a requirements.txt file at -# https://readthedocs.org/dashboard/letsencrypt/advanced/ (c.f. #259) - -# Although ReadTheDocs certainly doesn't need to install the project -# in --editable mode (-e), just "pip install certbot-dns-ovh[docs]" does not work as -# expected and "pip install -e certbot-dns-ovh[docs]" must be used instead - --e acme --e certbot --e certbot-dns-ovh[docs] diff --git a/certbot-dns-rfc2136/local-oldest-requirements.txt b/certbot-dns-rfc2136/local-oldest-requirements.txt deleted file mode 100644 index cf61c15a591..00000000000 --- a/certbot-dns-rfc2136/local-oldest-requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Remember to update setup.py to match the package versions below. -acme[dev]==0.29.0 -certbot[dev]==1.1.0 diff --git a/certbot-dns-rfc2136/readthedocs.org.requirements.txt b/certbot-dns-rfc2136/readthedocs.org.requirements.txt deleted file mode 100644 index 2cf4f70f876..00000000000 --- a/certbot-dns-rfc2136/readthedocs.org.requirements.txt +++ /dev/null @@ -1,12 +0,0 @@ -# readthedocs.org gives no way to change the install command to "pip -# install -e certbot-dns-rfc2136[docs]" (that would in turn install documentation -# dependencies), but it allows to specify a requirements.txt file at -# https://readthedocs.org/dashboard/letsencrypt/advanced/ (c.f. #259) - -# Although ReadTheDocs certainly doesn't need to install the project -# in --editable mode (-e), just "pip install certbot-dns-rfc2136[docs]" does not work as -# expected and "pip install -e certbot-dns-rfc2136[docs]" must be used instead - --e acme --e certbot --e certbot-dns-rfc2136[docs] diff --git a/certbot-dns-route53/local-oldest-requirements.txt b/certbot-dns-route53/local-oldest-requirements.txt deleted file mode 100644 index cf61c15a591..00000000000 --- a/certbot-dns-route53/local-oldest-requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Remember to update setup.py to match the package versions below. -acme[dev]==0.29.0 -certbot[dev]==1.1.0 diff --git a/certbot-dns-route53/readthedocs.org.requirements.txt b/certbot-dns-route53/readthedocs.org.requirements.txt deleted file mode 100644 index 993225eac42..00000000000 --- a/certbot-dns-route53/readthedocs.org.requirements.txt +++ /dev/null @@ -1,12 +0,0 @@ -# readthedocs.org gives no way to change the install command to "pip -# install -e certbot-dns-route53[docs]" (that would in turn install documentation -# dependencies), but it allows to specify a requirements.txt file at -# https://readthedocs.org/dashboard/letsencrypt/advanced/ (c.f. #259) - -# Although ReadTheDocs certainly doesn't need to install the project -# in --editable mode (-e), just "pip install certbot-dns-route53[docs]" does not work as -# expected and "pip install -e certbot-dns-route53[docs]" must be used instead - --e acme --e certbot --e certbot-dns-route53[docs] diff --git a/certbot-dns-sakuracloud/local-oldest-requirements.txt b/certbot-dns-sakuracloud/local-oldest-requirements.txt deleted file mode 100644 index 1307698d4fa..00000000000 --- a/certbot-dns-sakuracloud/local-oldest-requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Remember to update setup.py to match the package versions below. -acme[dev]==0.31.0 -certbot[dev]==1.1.0 diff --git a/certbot-dns-sakuracloud/readthedocs.org.requirements.txt b/certbot-dns-sakuracloud/readthedocs.org.requirements.txt deleted file mode 100644 index 07bc8a28920..00000000000 --- a/certbot-dns-sakuracloud/readthedocs.org.requirements.txt +++ /dev/null @@ -1,12 +0,0 @@ -# readthedocs.org gives no way to change the install command to "pip -# install -e certbot-dns-sakuracloud[docs]" (that would in turn install documentation -# dependencies), but it allows to specify a requirements.txt file at -# https://readthedocs.org/dashboard/letsencrypt/advanced/ (c.f. #259) - -# Although ReadTheDocs certainly doesn't need to install the project -# in --editable mode (-e), just "pip install certbot-dns-sakuracloud[docs]" does not work as -# expected and "pip install -e certbot-dns-sakuracloud[docs]" must be used instead - --e acme --e certbot --e certbot-dns-sakuracloud[docs] diff --git a/certbot-nginx/local-oldest-requirements.txt b/certbot-nginx/local-oldest-requirements.txt deleted file mode 100644 index 4710318de2d..00000000000 --- a/certbot-nginx/local-oldest-requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Remember to update setup.py to match the package versions below. -acme[dev]==1.6.0 -certbot[dev]==1.6.0 diff --git a/certbot/local-oldest-requirements.txt b/certbot/local-oldest-requirements.txt deleted file mode 100644 index 983f11ccadf..00000000000 --- a/certbot/local-oldest-requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -# Remember to update setup.py to match the package versions below. -acme[dev]==1.8.0 diff --git a/certbot/readthedocs.org.requirements.txt b/certbot/readthedocs.org.requirements.txt deleted file mode 100644 index f3964e8a742..00000000000 --- a/certbot/readthedocs.org.requirements.txt +++ /dev/null @@ -1,11 +0,0 @@ -# readthedocs.org gives no way to change the install command to "pip -# install -e certbot[docs]" (that would in turn install documentation -# dependencies), but it allows to specify a requirements.txt file at -# https://readthedocs.org/dashboard/letsencrypt/advanced/ (c.f. #259) - -# Although ReadTheDocs certainly doesn't need to install the project -# in --editable mode (-e), just "pip install .[docs]" does not work as -# expected and "pip install -e certbot[docs]" must be used instead - --e acme --e certbot[docs] From d71ed7ae55c29e362af62814a39a140cf3e94ea3 Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Mon, 15 Mar 2021 14:43:41 -0700 Subject: [PATCH 7/8] remove setup.py --- acme/setup.py | 64 ------------ certbot-apache/setup.py | 61 ----------- certbot-ci/setup.py | 67 ------------- certbot-compatibility-test/setup.py | 52 ---------- certbot-dns-cloudflare/setup.py | 73 -------------- certbot-dns-cloudxns/setup.py | 73 -------------- certbot-dns-digitalocean/setup.py | 73 -------------- certbot-dns-dnsimple/setup.py | 84 ---------------- certbot-dns-dnsmadeeasy/setup.py | 73 -------------- certbot-dns-gehirn/setup.py | 72 ------------- certbot-dns-google/setup.py | 76 -------------- certbot-dns-linode/setup.py | 72 ------------- certbot-dns-luadns/setup.py | 73 -------------- certbot-dns-nsone/setup.py | 73 -------------- certbot-dns-ovh/setup.py | 73 -------------- certbot-dns-rfc2136/setup.py | 73 -------------- certbot-dns-route53/setup.py | 74 -------------- certbot-dns-sakuracloud/setup.py | 72 ------------- certbot-nginx/setup.py | 54 ---------- certbot/setup.py | 150 ---------------------------- 20 files changed, 1482 deletions(-) delete mode 100644 acme/setup.py delete mode 100644 certbot-apache/setup.py delete mode 100644 certbot-ci/setup.py delete mode 100644 certbot-compatibility-test/setup.py delete mode 100644 certbot-dns-cloudflare/setup.py delete mode 100644 certbot-dns-cloudxns/setup.py delete mode 100644 certbot-dns-digitalocean/setup.py delete mode 100644 certbot-dns-dnsimple/setup.py delete mode 100644 certbot-dns-dnsmadeeasy/setup.py delete mode 100644 certbot-dns-gehirn/setup.py delete mode 100644 certbot-dns-google/setup.py delete mode 100644 certbot-dns-linode/setup.py delete mode 100644 certbot-dns-luadns/setup.py delete mode 100644 certbot-dns-nsone/setup.py delete mode 100644 certbot-dns-ovh/setup.py delete mode 100644 certbot-dns-rfc2136/setup.py delete mode 100644 certbot-dns-route53/setup.py delete mode 100644 certbot-dns-sakuracloud/setup.py delete mode 100644 certbot-nginx/setup.py delete mode 100644 certbot/setup.py diff --git a/acme/setup.py b/acme/setup.py deleted file mode 100644 index 90ab5c9f3ed..00000000000 --- a/acme/setup.py +++ /dev/null @@ -1,64 +0,0 @@ -import sys - -from setuptools import find_packages -from setuptools import setup - -version = '1.14.0.dev0' - -# Please update tox.ini when modifying dependency version requirements -install_requires = [ - 'cryptography>=2.1.4', - # formerly known as acme.jose: - # 1.1.0+ is required to avoid the warnings described at - # https://github.com/certbot/josepy/issues/13. - 'josepy>=1.1.0', - 'PyOpenSSL>=17.3.0', - 'pyrfc3339', - 'pytz', - 'requests>=2.6.0', - 'requests-toolbelt>=0.3.0', - 'setuptools>=39.0.1', -] - -dev_extras = [ - 'pytest', - 'pytest-xdist', - 'tox', -] - -docs_extras = [ - 'Sphinx>=1.0', # autodoc_member_order = 'bysource', autodoc_default_flags - 'sphinx_rtd_theme', -] - -setup( - name='acme', - version=version, - description='ACME protocol implementation in Python', - url='https://github.com/letsencrypt/letsencrypt', - author="Certbot Project", - author_email='client-dev@letsencrypt.org', - license='Apache License 2.0', - python_requires='>=3.6', - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'License :: OSI Approved :: Apache Software License', - 'Programming Language :: Python', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Topic :: Internet :: WWW/HTTP', - 'Topic :: Security', - ], - - packages=find_packages(), - include_package_data=True, - install_requires=install_requires, - extras_require={ - 'dev': dev_extras, - 'docs': docs_extras, - }, -) diff --git a/certbot-apache/setup.py b/certbot-apache/setup.py deleted file mode 100644 index 43165a9ddb1..00000000000 --- a/certbot-apache/setup.py +++ /dev/null @@ -1,61 +0,0 @@ -from setuptools import find_packages -from setuptools import setup - -version = '1.14.0.dev0' - -# Remember to update local-oldest-requirements.txt when changing the minimum -# acme/certbot version. -install_requires = [ - 'acme>=0.29.0', - 'certbot>=1.6.0', - 'python-augeas', - 'setuptools>=39.0.1', - 'zope.component', - 'zope.interface', -] - -dev_extras = [ - 'apacheconfig>=0.3.2', -] - -setup( - name='certbot-apache', - version=version, - description="Apache plugin for Certbot", - url='https://github.com/letsencrypt/letsencrypt', - author="Certbot Project", - author_email='client-dev@letsencrypt.org', - license='Apache License 2.0', - python_requires='>=3.6', - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Environment :: Plugins', - 'Intended Audience :: System Administrators', - 'License :: OSI Approved :: Apache Software License', - 'Operating System :: POSIX :: Linux', - 'Programming Language :: Python', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Topic :: Internet :: WWW/HTTP', - 'Topic :: Security', - 'Topic :: System :: Installation/Setup', - 'Topic :: System :: Networking', - 'Topic :: System :: Systems Administration', - 'Topic :: Utilities', - ], - - packages=find_packages(), - include_package_data=True, - install_requires=install_requires, - extras_require={ - 'dev': dev_extras, - }, - entry_points={ - 'certbot.plugins': [ - 'apache = certbot_apache._internal.entrypoint:ENTRYPOINT', - ], - }, -) diff --git a/certbot-ci/setup.py b/certbot-ci/setup.py deleted file mode 100644 index 9f9c1f462df..00000000000 --- a/certbot-ci/setup.py +++ /dev/null @@ -1,67 +0,0 @@ -from distutils.version import LooseVersion -import sys - -from setuptools import __version__ as setuptools_version -from setuptools import find_packages -from setuptools import setup - -version = '0.32.0.dev0' - -install_requires = [ - 'coverage', - 'cryptography', - 'docker-compose', - 'pyopenssl', - 'pytest', - 'pytest-cov', - 'pytest-xdist', - 'python-dateutil', - 'pyyaml', - 'requests', -] - -# Add pywin32 on Windows platforms to handle low-level system calls. -# This dependency needs to be added using environment markers to avoid its installation on Linux. -# However environment markers are supported only with setuptools >= 36.2. -# So this dependency is not added for old Linux distributions with old setuptools, -# in order to allow these systems to build certbot from sources. -if LooseVersion(setuptools_version) >= LooseVersion('36.2'): - install_requires.append("pywin32>=224 ; sys_platform == 'win32'") -elif 'bdist_wheel' in sys.argv[1:]: - raise RuntimeError('Error, you are trying to build certbot wheels using an old version ' - 'of setuptools. Version 36.2+ of setuptools is required.') - -setup( - name='certbot-ci', - version=version, - description="Certbot continuous integration framework", - url='https://github.com/certbot/certbot', - author="Certbot Project", - author_email='client-dev@letsencrypt.org', - license='Apache License 2.0', - python_requires='>=3.6', - classifiers=[ - 'Development Status :: 3 - Alpha', - 'Intended Audience :: Developers', - 'License :: OSI Approved :: Apache Software License', - 'Programming Language :: Python', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Topic :: Internet :: WWW/HTTP', - 'Topic :: Security', - ], - - packages=find_packages(), - include_package_data=True, - install_requires=install_requires, - - entry_points={ - 'console_scripts': [ - 'certbot_test=certbot_integration_tests.utils.certbot_call:main', - 'run_acme_server=certbot_integration_tests.utils.acme_server:main', - ], - } -) diff --git a/certbot-compatibility-test/setup.py b/certbot-compatibility-test/setup.py deleted file mode 100644 index 3e9e6a7c2fd..00000000000 --- a/certbot-compatibility-test/setup.py +++ /dev/null @@ -1,52 +0,0 @@ -import sys - -from setuptools import find_packages -from setuptools import setup - -version = '1.14.0.dev0' - -install_requires = [ - 'certbot', - 'certbot-apache', - 'requests', - 'zope.interface', -] - -if sys.version_info < (2, 7, 9): - # For secure SSL connexion with Python 2.7 (InsecurePlatformWarning) - install_requires.append('ndg-httpsclient') - install_requires.append('pyasn1') - - -setup( - name='certbot-compatibility-test', - version=version, - description="Compatibility tests for Certbot", - url='https://github.com/letsencrypt/letsencrypt', - author="Certbot Project", - author_email='client-dev@letsencrypt.org', - license='Apache License 2.0', - python_requires='>=3.6', - classifiers=[ - 'Development Status :: 3 - Alpha', - 'Intended Audience :: Developers', - 'License :: OSI Approved :: Apache Software License', - 'Programming Language :: Python', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Topic :: Internet :: WWW/HTTP', - 'Topic :: Security', - ], - - packages=find_packages(), - include_package_data=True, - install_requires=install_requires, - entry_points={ - 'console_scripts': [ - 'certbot-compatibility-test = certbot_compatibility_test.test_driver:main', - ], - }, -) diff --git a/certbot-dns-cloudflare/setup.py b/certbot-dns-cloudflare/setup.py deleted file mode 100644 index 2e5215f9ceb..00000000000 --- a/certbot-dns-cloudflare/setup.py +++ /dev/null @@ -1,73 +0,0 @@ -import os -import sys - -from setuptools import find_packages -from setuptools import setup - -version = '1.14.0.dev0' - -# Remember to update local-oldest-requirements.txt when changing the minimum -# acme/certbot version. -install_requires = [ - 'cloudflare>=1.5.1', - 'setuptools>=39.0.1', - 'zope.interface', -] - -if not os.environ.get('SNAP_BUILD'): - install_requires.extend([ - 'acme>=0.29.0', - 'certbot>=1.1.0', - ]) -elif 'bdist_wheel' in sys.argv[1:]: - raise RuntimeError('Unset SNAP_BUILD when building wheels ' - 'to include certbot dependencies.') -if os.environ.get('SNAP_BUILD'): - install_requires.append('packaging') - -docs_extras = [ - 'Sphinx>=1.0', # autodoc_member_order = 'bysource', autodoc_default_flags - 'sphinx_rtd_theme', -] - -setup( - name='certbot-dns-cloudflare', - version=version, - description="Cloudflare DNS Authenticator plugin for Certbot", - url='https://github.com/certbot/certbot', - author="Certbot Project", - author_email='client-dev@letsencrypt.org', - license='Apache License 2.0', - python_requires='>=3.6', - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Environment :: Plugins', - 'Intended Audience :: System Administrators', - 'License :: OSI Approved :: Apache Software License', - 'Operating System :: POSIX :: Linux', - 'Programming Language :: Python', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Topic :: Internet :: WWW/HTTP', - 'Topic :: Security', - 'Topic :: System :: Installation/Setup', - 'Topic :: System :: Networking', - 'Topic :: System :: Systems Administration', - 'Topic :: Utilities', - ], - - packages=find_packages(), - include_package_data=True, - install_requires=install_requires, - extras_require={ - 'docs': docs_extras, - }, - entry_points={ - 'certbot.plugins': [ - 'dns-cloudflare = certbot_dns_cloudflare._internal.dns_cloudflare:Authenticator', - ], - }, -) diff --git a/certbot-dns-cloudxns/setup.py b/certbot-dns-cloudxns/setup.py deleted file mode 100644 index 44bada6bc92..00000000000 --- a/certbot-dns-cloudxns/setup.py +++ /dev/null @@ -1,73 +0,0 @@ -import os -import sys - -from setuptools import find_packages -from setuptools import setup - -version = '1.14.0.dev0' - -# Remember to update local-oldest-requirements.txt when changing the minimum -# acme/certbot version. -install_requires = [ - 'dns-lexicon>=2.2.1', # Support for >1 TXT record per name - 'setuptools>=39.0.1', - 'zope.interface', -] - -if not os.environ.get('SNAP_BUILD'): - install_requires.extend([ - 'acme>=0.31.0', - 'certbot>=1.1.0', - ]) -elif 'bdist_wheel' in sys.argv[1:]: - raise RuntimeError('Unset SNAP_BUILD when building wheels ' - 'to include certbot dependencies.') -if os.environ.get('SNAP_BUILD'): - install_requires.append('packaging') - -docs_extras = [ - 'Sphinx>=1.0', # autodoc_member_order = 'bysource', autodoc_default_flags - 'sphinx_rtd_theme', -] - -setup( - name='certbot-dns-cloudxns', - version=version, - description="CloudXNS DNS Authenticator plugin for Certbot", - url='https://github.com/certbot/certbot', - author="Certbot Project", - author_email='client-dev@letsencrypt.org', - license='Apache License 2.0', - python_requires='>=3.6', - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Environment :: Plugins', - 'Intended Audience :: System Administrators', - 'License :: OSI Approved :: Apache Software License', - 'Operating System :: POSIX :: Linux', - 'Programming Language :: Python', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Topic :: Internet :: WWW/HTTP', - 'Topic :: Security', - 'Topic :: System :: Installation/Setup', - 'Topic :: System :: Networking', - 'Topic :: System :: Systems Administration', - 'Topic :: Utilities', - ], - - packages=find_packages(), - include_package_data=True, - install_requires=install_requires, - extras_require={ - 'docs': docs_extras, - }, - entry_points={ - 'certbot.plugins': [ - 'dns-cloudxns = certbot_dns_cloudxns._internal.dns_cloudxns:Authenticator', - ], - }, -) diff --git a/certbot-dns-digitalocean/setup.py b/certbot-dns-digitalocean/setup.py deleted file mode 100644 index 106eb3cac93..00000000000 --- a/certbot-dns-digitalocean/setup.py +++ /dev/null @@ -1,73 +0,0 @@ -import os -import sys - -from setuptools import find_packages -from setuptools import setup - -version = '1.14.0.dev0' - -# Remember to update local-oldest-requirements.txt when changing the minimum -# acme/certbot version. -install_requires = [ - 'python-digitalocean>=1.11', # 1.15.0 or newer is recommended for TTL support - 'setuptools>=39.0.1', - 'zope.interface', -] - -if not os.environ.get('SNAP_BUILD'): - install_requires.extend([ - 'acme>=0.29.0', - 'certbot>=1.1.0', - ]) -elif 'bdist_wheel' in sys.argv[1:]: - raise RuntimeError('Unset SNAP_BUILD when building wheels ' - 'to include certbot dependencies.') -if os.environ.get('SNAP_BUILD'): - install_requires.append('packaging') - -docs_extras = [ - 'Sphinx>=1.0', # autodoc_member_order = 'bysource', autodoc_default_flags - 'sphinx_rtd_theme', -] - -setup( - name='certbot-dns-digitalocean', - version=version, - description="DigitalOcean DNS Authenticator plugin for Certbot", - url='https://github.com/certbot/certbot', - author="Certbot Project", - author_email='client-dev@letsencrypt.org', - license='Apache License 2.0', - python_requires='>=3.6', - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Environment :: Plugins', - 'Intended Audience :: System Administrators', - 'License :: OSI Approved :: Apache Software License', - 'Operating System :: POSIX :: Linux', - 'Programming Language :: Python', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Topic :: Internet :: WWW/HTTP', - 'Topic :: Security', - 'Topic :: System :: Installation/Setup', - 'Topic :: System :: Networking', - 'Topic :: System :: Systems Administration', - 'Topic :: Utilities', - ], - - packages=find_packages(), - include_package_data=True, - install_requires=install_requires, - extras_require={ - 'docs': docs_extras, - }, - entry_points={ - 'certbot.plugins': [ - 'dns-digitalocean = certbot_dns_digitalocean._internal.dns_digitalocean:Authenticator', - ], - }, -) diff --git a/certbot-dns-dnsimple/setup.py b/certbot-dns-dnsimple/setup.py deleted file mode 100644 index 99a3c92a311..00000000000 --- a/certbot-dns-dnsimple/setup.py +++ /dev/null @@ -1,84 +0,0 @@ -import os -import sys - -from setuptools import find_packages -from setuptools import setup - -version = '1.14.0.dev0' - -# Remember to update local-oldest-requirements.txt when changing the minimum -# acme/certbot version. -install_requires = [ - 'setuptools>=39.0.1', - 'zope.interface', -] - -if not os.environ.get('SNAP_BUILD'): - install_requires.extend([ - 'acme>=0.31.0', - 'certbot>=1.1.0', - ]) -elif 'bdist_wheel' in sys.argv[1:]: - raise RuntimeError('Unset SNAP_BUILD when building wheels ' - 'to include certbot dependencies.') -if os.environ.get('SNAP_BUILD'): - install_requires.append('packaging') - -# This package normally depends on dns-lexicon>=3.2.1 to address the -# problem described in https://github.com/AnalogJ/lexicon/issues/387, -# however, the fix there has been backported to older versions of -# lexicon found in various Linux distros. This conditional helps us test -# that we've maintained compatibility with these versions of lexicon -# which allows us to potentially upgrade our packages in these distros -# as necessary. -if os.environ.get('CERTBOT_OLDEST') == '1': - install_requires.append('dns-lexicon>=2.2.1') -else: - install_requires.append('dns-lexicon>=3.2.1') - -docs_extras = [ - 'Sphinx>=1.0', # autodoc_member_order = 'bysource', autodoc_default_flags - 'sphinx_rtd_theme', -] - -setup( - name='certbot-dns-dnsimple', - version=version, - description="DNSimple DNS Authenticator plugin for Certbot", - url='https://github.com/certbot/certbot', - author="Certbot Project", - author_email='client-dev@letsencrypt.org', - license='Apache License 2.0', - python_requires='>=3.6', - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Environment :: Plugins', - 'Intended Audience :: System Administrators', - 'License :: OSI Approved :: Apache Software License', - 'Operating System :: POSIX :: Linux', - 'Programming Language :: Python', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Topic :: Internet :: WWW/HTTP', - 'Topic :: Security', - 'Topic :: System :: Installation/Setup', - 'Topic :: System :: Networking', - 'Topic :: System :: Systems Administration', - 'Topic :: Utilities', - ], - - packages=find_packages(), - include_package_data=True, - install_requires=install_requires, - extras_require={ - 'docs': docs_extras, - }, - entry_points={ - 'certbot.plugins': [ - 'dns-dnsimple = certbot_dns_dnsimple._internal.dns_dnsimple:Authenticator', - ], - }, -) diff --git a/certbot-dns-dnsmadeeasy/setup.py b/certbot-dns-dnsmadeeasy/setup.py deleted file mode 100644 index b126b4e8fc9..00000000000 --- a/certbot-dns-dnsmadeeasy/setup.py +++ /dev/null @@ -1,73 +0,0 @@ -import os -import sys - -from setuptools import find_packages -from setuptools import setup - -version = '1.14.0.dev0' - -# Remember to update local-oldest-requirements.txt when changing the minimum -# acme/certbot version. -install_requires = [ - 'dns-lexicon>=2.2.1', # Support for >1 TXT record per name - 'setuptools>=39.0.1', - 'zope.interface', -] - -if not os.environ.get('SNAP_BUILD'): - install_requires.extend([ - 'acme>=0.31.0', - 'certbot>=1.1.0', - ]) -elif 'bdist_wheel' in sys.argv[1:]: - raise RuntimeError('Unset SNAP_BUILD when building wheels ' - 'to include certbot dependencies.') -if os.environ.get('SNAP_BUILD'): - install_requires.append('packaging') - -docs_extras = [ - 'Sphinx>=1.0', # autodoc_member_order = 'bysource', autodoc_default_flags - 'sphinx_rtd_theme', -] - -setup( - name='certbot-dns-dnsmadeeasy', - version=version, - description="DNS Made Easy DNS Authenticator plugin for Certbot", - url='https://github.com/certbot/certbot', - author="Certbot Project", - author_email='client-dev@letsencrypt.org', - license='Apache License 2.0', - python_requires='>=3.6', - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Environment :: Plugins', - 'Intended Audience :: System Administrators', - 'License :: OSI Approved :: Apache Software License', - 'Operating System :: POSIX :: Linux', - 'Programming Language :: Python', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Topic :: Internet :: WWW/HTTP', - 'Topic :: Security', - 'Topic :: System :: Installation/Setup', - 'Topic :: System :: Networking', - 'Topic :: System :: Systems Administration', - 'Topic :: Utilities', - ], - - packages=find_packages(), - include_package_data=True, - install_requires=install_requires, - extras_require={ - 'docs': docs_extras, - }, - entry_points={ - 'certbot.plugins': [ - 'dns-dnsmadeeasy = certbot_dns_dnsmadeeasy._internal.dns_dnsmadeeasy:Authenticator', - ], - }, -) diff --git a/certbot-dns-gehirn/setup.py b/certbot-dns-gehirn/setup.py deleted file mode 100644 index cada7a85e85..00000000000 --- a/certbot-dns-gehirn/setup.py +++ /dev/null @@ -1,72 +0,0 @@ -import os -import sys - -from setuptools import find_packages -from setuptools import setup - -version = '1.14.0.dev0' - -# Please update tox.ini when modifying dependency version requirements -install_requires = [ - 'dns-lexicon>=2.1.22', - 'setuptools>=39.0.1', - 'zope.interface', -] - -if not os.environ.get('SNAP_BUILD'): - install_requires.extend([ - 'acme>=0.31.0', - 'certbot>=1.1.0', - ]) -elif 'bdist_wheel' in sys.argv[1:]: - raise RuntimeError('Unset SNAP_BUILD when building wheels ' - 'to include certbot dependencies.') -if os.environ.get('SNAP_BUILD'): - install_requires.append('packaging') - -docs_extras = [ - 'Sphinx>=1.0', # autodoc_member_order = 'bysource', autodoc_default_flags - 'sphinx_rtd_theme', -] - -setup( - name='certbot-dns-gehirn', - version=version, - description="Gehirn Infrastructure Service DNS Authenticator plugin for Certbot", - url='https://github.com/certbot/certbot', - author="Certbot Project", - author_email='client-dev@letsencrypt.org', - license='Apache License 2.0', - python_requires='>=3.6', - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Environment :: Plugins', - 'Intended Audience :: System Administrators', - 'License :: OSI Approved :: Apache Software License', - 'Operating System :: POSIX :: Linux', - 'Programming Language :: Python', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Topic :: Internet :: WWW/HTTP', - 'Topic :: Security', - 'Topic :: System :: Installation/Setup', - 'Topic :: System :: Networking', - 'Topic :: System :: Systems Administration', - 'Topic :: Utilities', - ], - - packages=find_packages(), - include_package_data=True, - install_requires=install_requires, - extras_require={ - 'docs': docs_extras, - }, - entry_points={ - 'certbot.plugins': [ - 'dns-gehirn = certbot_dns_gehirn._internal.dns_gehirn:Authenticator', - ], - }, -) diff --git a/certbot-dns-google/setup.py b/certbot-dns-google/setup.py deleted file mode 100644 index e8b26eceb76..00000000000 --- a/certbot-dns-google/setup.py +++ /dev/null @@ -1,76 +0,0 @@ -import os -import sys - -from setuptools import find_packages -from setuptools import setup - -version = '1.14.0.dev0' - -# Remember to update local-oldest-requirements.txt when changing the minimum -# acme/certbot version. -install_requires = [ - 'google-api-python-client>=1.5.5', - 'oauth2client>=4.0', - 'setuptools>=39.0.1', - 'zope.interface', - # already a dependency of google-api-python-client, but added for consistency - 'httplib2' -] - -if not os.environ.get('SNAP_BUILD'): - install_requires.extend([ - 'acme>=0.29.0', - 'certbot>=1.1.0', - ]) -elif 'bdist_wheel' in sys.argv[1:]: - raise RuntimeError('Unset SNAP_BUILD when building wheels ' - 'to include certbot dependencies.') -if os.environ.get('SNAP_BUILD'): - install_requires.append('packaging') - -docs_extras = [ - 'Sphinx>=1.0', # autodoc_member_order = 'bysource', autodoc_default_flags - 'sphinx_rtd_theme', -] - -setup( - name='certbot-dns-google', - version=version, - description="Google Cloud DNS Authenticator plugin for Certbot", - url='https://github.com/certbot/certbot', - author="Certbot Project", - author_email='client-dev@letsencrypt.org', - license='Apache License 2.0', - python_requires='>=3.6', - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Environment :: Plugins', - 'Intended Audience :: System Administrators', - 'License :: OSI Approved :: Apache Software License', - 'Operating System :: POSIX :: Linux', - 'Programming Language :: Python', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Topic :: Internet :: WWW/HTTP', - 'Topic :: Security', - 'Topic :: System :: Installation/Setup', - 'Topic :: System :: Networking', - 'Topic :: System :: Systems Administration', - 'Topic :: Utilities', - ], - - packages=find_packages(), - include_package_data=True, - install_requires=install_requires, - extras_require={ - 'docs': docs_extras, - }, - entry_points={ - 'certbot.plugins': [ - 'dns-google = certbot_dns_google._internal.dns_google:Authenticator', - ], - }, -) diff --git a/certbot-dns-linode/setup.py b/certbot-dns-linode/setup.py deleted file mode 100644 index 63da31df29c..00000000000 --- a/certbot-dns-linode/setup.py +++ /dev/null @@ -1,72 +0,0 @@ -import os -import sys - -from setuptools import find_packages -from setuptools import setup - -version = '1.14.0.dev0' - -# Please update tox.ini when modifying dependency version requirements -install_requires = [ - 'dns-lexicon>=2.2.3', - 'setuptools>=39.0.1', - 'zope.interface', -] - -if not os.environ.get('SNAP_BUILD'): - install_requires.extend([ - 'acme>=0.31.0', - 'certbot>=1.1.0', - ]) -elif 'bdist_wheel' in sys.argv[1:]: - raise RuntimeError('Unset SNAP_BUILD when building wheels ' - 'to include certbot dependencies.') -if os.environ.get('SNAP_BUILD'): - install_requires.append('packaging') - -docs_extras = [ - 'Sphinx>=1.0', # autodoc_member_order = 'bysource', autodoc_default_flags - 'sphinx_rtd_theme', -] - -setup( - name='certbot-dns-linode', - version=version, - description="Linode DNS Authenticator plugin for Certbot", - url='https://github.com/certbot/certbot', - author="Certbot Project", - author_email='client-dev@letsencrypt.org', - license='Apache License 2.0', - python_requires='>=3.6', - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Environment :: Plugins', - 'Intended Audience :: System Administrators', - 'License :: OSI Approved :: Apache Software License', - 'Operating System :: POSIX :: Linux', - 'Programming Language :: Python', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Topic :: Internet :: WWW/HTTP', - 'Topic :: Security', - 'Topic :: System :: Installation/Setup', - 'Topic :: System :: Networking', - 'Topic :: System :: Systems Administration', - 'Topic :: Utilities', - ], - - packages=find_packages(), - include_package_data=True, - install_requires=install_requires, - extras_require={ - 'docs': docs_extras, - }, - entry_points={ - 'certbot.plugins': [ - 'dns-linode = certbot_dns_linode._internal.dns_linode:Authenticator', - ], - }, -) diff --git a/certbot-dns-luadns/setup.py b/certbot-dns-luadns/setup.py deleted file mode 100644 index 61b9dfa785e..00000000000 --- a/certbot-dns-luadns/setup.py +++ /dev/null @@ -1,73 +0,0 @@ -import os -import sys - -from setuptools import find_packages -from setuptools import setup - -version = '1.14.0.dev0' - -# Remember to update local-oldest-requirements.txt when changing the minimum -# acme/certbot version. -install_requires = [ - 'dns-lexicon>=2.2.1', # Support for >1 TXT record per name - 'setuptools>=39.0.1', - 'zope.interface', -] - -if not os.environ.get('SNAP_BUILD'): - install_requires.extend([ - 'acme>=0.31.0', - 'certbot>=1.1.0', - ]) -elif 'bdist_wheel' in sys.argv[1:]: - raise RuntimeError('Unset SNAP_BUILD when building wheels ' - 'to include certbot dependencies.') -if os.environ.get('SNAP_BUILD'): - install_requires.append('packaging') - -docs_extras = [ - 'Sphinx>=1.0', # autodoc_member_order = 'bysource', autodoc_default_flags - 'sphinx_rtd_theme', -] - -setup( - name='certbot-dns-luadns', - version=version, - description="LuaDNS Authenticator plugin for Certbot", - url='https://github.com/certbot/certbot', - author="Certbot Project", - author_email='client-dev@letsencrypt.org', - license='Apache License 2.0', - python_requires='>=3.6', - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Environment :: Plugins', - 'Intended Audience :: System Administrators', - 'License :: OSI Approved :: Apache Software License', - 'Operating System :: POSIX :: Linux', - 'Programming Language :: Python', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Topic :: Internet :: WWW/HTTP', - 'Topic :: Security', - 'Topic :: System :: Installation/Setup', - 'Topic :: System :: Networking', - 'Topic :: System :: Systems Administration', - 'Topic :: Utilities', - ], - - packages=find_packages(), - include_package_data=True, - install_requires=install_requires, - extras_require={ - 'docs': docs_extras, - }, - entry_points={ - 'certbot.plugins': [ - 'dns-luadns = certbot_dns_luadns._internal.dns_luadns:Authenticator', - ], - }, -) diff --git a/certbot-dns-nsone/setup.py b/certbot-dns-nsone/setup.py deleted file mode 100644 index d60412f27bd..00000000000 --- a/certbot-dns-nsone/setup.py +++ /dev/null @@ -1,73 +0,0 @@ -import os -import sys - -from setuptools import find_packages -from setuptools import setup - -version = '1.14.0.dev0' - -# Remember to update local-oldest-requirements.txt when changing the minimum -# acme/certbot version. -install_requires = [ - 'dns-lexicon>=2.2.1', # Support for >1 TXT record per name - 'setuptools>=39.0.1', - 'zope.interface', -] - -if not os.environ.get('SNAP_BUILD'): - install_requires.extend([ - 'acme>=0.31.0', - 'certbot>=1.1.0', - ]) -elif 'bdist_wheel' in sys.argv[1:]: - raise RuntimeError('Unset SNAP_BUILD when building wheels ' - 'to include certbot dependencies.') -if os.environ.get('SNAP_BUILD'): - install_requires.append('packaging') - -docs_extras = [ - 'Sphinx>=1.0', # autodoc_member_order = 'bysource', autodoc_default_flags - 'sphinx_rtd_theme', -] - -setup( - name='certbot-dns-nsone', - version=version, - description="NS1 DNS Authenticator plugin for Certbot", - url='https://github.com/certbot/certbot', - author="Certbot Project", - author_email='client-dev@letsencrypt.org', - license='Apache License 2.0', - python_requires='>=3.6', - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Environment :: Plugins', - 'Intended Audience :: System Administrators', - 'License :: OSI Approved :: Apache Software License', - 'Operating System :: POSIX :: Linux', - 'Programming Language :: Python', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Topic :: Internet :: WWW/HTTP', - 'Topic :: Security', - 'Topic :: System :: Installation/Setup', - 'Topic :: System :: Networking', - 'Topic :: System :: Systems Administration', - 'Topic :: Utilities', - ], - - packages=find_packages(), - include_package_data=True, - install_requires=install_requires, - extras_require={ - 'docs': docs_extras, - }, - entry_points={ - 'certbot.plugins': [ - 'dns-nsone = certbot_dns_nsone._internal.dns_nsone:Authenticator', - ], - }, -) diff --git a/certbot-dns-ovh/setup.py b/certbot-dns-ovh/setup.py deleted file mode 100644 index 4d6131ff76b..00000000000 --- a/certbot-dns-ovh/setup.py +++ /dev/null @@ -1,73 +0,0 @@ -import os -import sys - -from setuptools import find_packages -from setuptools import setup - -version = '1.14.0.dev0' - -# Remember to update local-oldest-requirements.txt when changing the minimum -# acme/certbot version. -install_requires = [ - 'dns-lexicon>=2.7.14', # Correct proxy use on OVH provider - 'setuptools>=39.0.1', - 'zope.interface', -] - -if not os.environ.get('SNAP_BUILD'): - install_requires.extend([ - 'acme>=0.31.0', - 'certbot>=1.1.0', - ]) -elif 'bdist_wheel' in sys.argv[1:]: - raise RuntimeError('Unset SNAP_BUILD when building wheels ' - 'to include certbot dependencies.') -if os.environ.get('SNAP_BUILD'): - install_requires.append('packaging') - -docs_extras = [ - 'Sphinx>=1.0', # autodoc_member_order = 'bysource', autodoc_default_flags - 'sphinx_rtd_theme', -] - -setup( - name='certbot-dns-ovh', - version=version, - description="OVH DNS Authenticator plugin for Certbot", - url='https://github.com/certbot/certbot', - author="Certbot Project", - author_email='client-dev@letsencrypt.org', - license='Apache License 2.0', - python_requires='>=3.6', - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Environment :: Plugins', - 'Intended Audience :: System Administrators', - 'License :: OSI Approved :: Apache Software License', - 'Operating System :: POSIX :: Linux', - 'Programming Language :: Python', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Topic :: Internet :: WWW/HTTP', - 'Topic :: Security', - 'Topic :: System :: Installation/Setup', - 'Topic :: System :: Networking', - 'Topic :: System :: Systems Administration', - 'Topic :: Utilities', - ], - - packages=find_packages(), - include_package_data=True, - install_requires=install_requires, - extras_require={ - 'docs': docs_extras, - }, - entry_points={ - 'certbot.plugins': [ - 'dns-ovh = certbot_dns_ovh._internal.dns_ovh:Authenticator', - ], - }, -) diff --git a/certbot-dns-rfc2136/setup.py b/certbot-dns-rfc2136/setup.py deleted file mode 100644 index 18d006732f6..00000000000 --- a/certbot-dns-rfc2136/setup.py +++ /dev/null @@ -1,73 +0,0 @@ -import os -import sys - -from setuptools import find_packages -from setuptools import setup - -version = '1.14.0.dev0' - -# Remember to update local-oldest-requirements.txt when changing the minimum -# acme/certbot version. -install_requires = [ - 'dnspython', - 'setuptools>=39.0.1', - 'zope.interface', -] - -if not os.environ.get('SNAP_BUILD'): - install_requires.extend([ - 'acme>=0.29.0', - 'certbot>=1.1.0', - ]) -elif 'bdist_wheel' in sys.argv[1:]: - raise RuntimeError('Unset SNAP_BUILD when building wheels ' - 'to include certbot dependencies.') -if os.environ.get('SNAP_BUILD'): - install_requires.append('packaging') - -docs_extras = [ - 'Sphinx>=1.0', # autodoc_member_order = 'bysource', autodoc_default_flags - 'sphinx_rtd_theme', -] - -setup( - name='certbot-dns-rfc2136', - version=version, - description="RFC 2136 DNS Authenticator plugin for Certbot", - url='https://github.com/certbot/certbot', - author="Certbot Project", - author_email='client-dev@letsencrypt.org', - license='Apache License 2.0', - python_requires='>=3.6', - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Environment :: Plugins', - 'Intended Audience :: System Administrators', - 'License :: OSI Approved :: Apache Software License', - 'Operating System :: POSIX :: Linux', - 'Programming Language :: Python', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Topic :: Internet :: WWW/HTTP', - 'Topic :: Security', - 'Topic :: System :: Installation/Setup', - 'Topic :: System :: Networking', - 'Topic :: System :: Systems Administration', - 'Topic :: Utilities', - ], - - packages=find_packages(), - include_package_data=True, - install_requires=install_requires, - extras_require={ - 'docs': docs_extras, - }, - entry_points={ - 'certbot.plugins': [ - 'dns-rfc2136 = certbot_dns_rfc2136._internal.dns_rfc2136:Authenticator', - ], - }, -) diff --git a/certbot-dns-route53/setup.py b/certbot-dns-route53/setup.py deleted file mode 100644 index fdc931bbe42..00000000000 --- a/certbot-dns-route53/setup.py +++ /dev/null @@ -1,74 +0,0 @@ -import os -import sys - -from setuptools import find_packages -from setuptools import setup - -version = '1.14.0.dev0' - -# Remember to update local-oldest-requirements.txt when changing the minimum -# acme/certbot version. -install_requires = [ - 'boto3', - 'setuptools>=39.0.1', - 'zope.interface', -] - -if not os.environ.get('SNAP_BUILD'): - install_requires.extend([ - 'acme>=0.29.0', - 'certbot>=1.1.0', - ]) -elif 'bdist_wheel' in sys.argv[1:]: - raise RuntimeError('Unset SNAP_BUILD when building wheels ' - 'to include certbot dependencies.') -if os.environ.get('SNAP_BUILD'): - install_requires.append('packaging') - -docs_extras = [ - 'Sphinx>=1.0', # autodoc_member_order = 'bysource', autodoc_default_flags - 'sphinx_rtd_theme', -] - -setup( - name='certbot-dns-route53', - version=version, - description="Route53 DNS Authenticator plugin for Certbot", - url='https://github.com/certbot/certbot', - author="Certbot Project", - author_email='client-dev@letsencrypt.org', - license='Apache License 2.0', - python_requires='>=3.6', - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Environment :: Plugins', - 'Intended Audience :: System Administrators', - 'License :: OSI Approved :: Apache Software License', - 'Operating System :: POSIX :: Linux', - 'Programming Language :: Python', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Topic :: Internet :: WWW/HTTP', - 'Topic :: Security', - 'Topic :: System :: Installation/Setup', - 'Topic :: System :: Networking', - 'Topic :: System :: Systems Administration', - 'Topic :: Utilities', - ], - packages=find_packages(), - include_package_data=True, - install_requires=install_requires, - keywords=['certbot', 'route53', 'aws'], - extras_require={ - 'docs': docs_extras, - }, - entry_points={ - 'certbot.plugins': [ - 'dns-route53 = certbot_dns_route53._internal.dns_route53:Authenticator', - 'certbot-route53:auth = certbot_dns_route53.authenticator:Authenticator' - ], - }, -) diff --git a/certbot-dns-sakuracloud/setup.py b/certbot-dns-sakuracloud/setup.py deleted file mode 100644 index 55f140d7648..00000000000 --- a/certbot-dns-sakuracloud/setup.py +++ /dev/null @@ -1,72 +0,0 @@ -import os -import sys - -from setuptools import find_packages -from setuptools import setup - -version = '1.14.0.dev0' - -# Please update tox.ini when modifying dependency version requirements -install_requires = [ - 'dns-lexicon>=2.1.23', - 'setuptools>=39.0.1', - 'zope.interface', -] - -if not os.environ.get('SNAP_BUILD'): - install_requires.extend([ - 'acme>=0.31.0', - 'certbot>=1.1.0', - ]) -elif 'bdist_wheel' in sys.argv[1:]: - raise RuntimeError('Unset SNAP_BUILD when building wheels ' - 'to include certbot dependencies.') -if os.environ.get('SNAP_BUILD'): - install_requires.append('packaging') - -docs_extras = [ - 'Sphinx>=1.0', # autodoc_member_order = 'bysource', autodoc_default_flags - 'sphinx_rtd_theme', -] - -setup( - name='certbot-dns-sakuracloud', - version=version, - description="Sakura Cloud DNS Authenticator plugin for Certbot", - url='https://github.com/certbot/certbot', - author="Certbot Project", - author_email='client-dev@letsencrypt.org', - license='Apache License 2.0', - python_requires='>=3.6', - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Environment :: Plugins', - 'Intended Audience :: System Administrators', - 'License :: OSI Approved :: Apache Software License', - 'Operating System :: POSIX :: Linux', - 'Programming Language :: Python', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Topic :: Internet :: WWW/HTTP', - 'Topic :: Security', - 'Topic :: System :: Installation/Setup', - 'Topic :: System :: Networking', - 'Topic :: System :: Systems Administration', - 'Topic :: Utilities', - ], - - packages=find_packages(), - include_package_data=True, - install_requires=install_requires, - extras_require={ - 'docs': docs_extras, - }, - entry_points={ - 'certbot.plugins': [ - 'dns-sakuracloud = certbot_dns_sakuracloud._internal.dns_sakuracloud:Authenticator', - ], - }, -) diff --git a/certbot-nginx/setup.py b/certbot-nginx/setup.py deleted file mode 100644 index 8b638f28e5c..00000000000 --- a/certbot-nginx/setup.py +++ /dev/null @@ -1,54 +0,0 @@ -from setuptools import find_packages -from setuptools import setup - -version = '1.14.0.dev0' - -# Remember to update local-oldest-requirements.txt when changing the minimum -# acme/certbot version. -install_requires = [ - 'acme>=1.4.0', - 'certbot>=1.6.0', - 'PyOpenSSL>=17.3.0', - 'pyparsing>=2.2.0', - 'setuptools>=39.0.1', - 'zope.interface', -] - -setup( - name='certbot-nginx', - version=version, - description="Nginx plugin for Certbot", - url='https://github.com/letsencrypt/letsencrypt', - author="Certbot Project", - author_email='client-dev@letsencrypt.org', - license='Apache License 2.0', - python_requires='>=3.6', - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Environment :: Plugins', - 'Intended Audience :: System Administrators', - 'License :: OSI Approved :: Apache Software License', - 'Operating System :: POSIX :: Linux', - 'Programming Language :: Python', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Topic :: Internet :: WWW/HTTP', - 'Topic :: Security', - 'Topic :: System :: Installation/Setup', - 'Topic :: System :: Networking', - 'Topic :: System :: Systems Administration', - 'Topic :: Utilities', - ], - - packages=find_packages(), - include_package_data=True, - install_requires=install_requires, - entry_points={ - 'certbot.plugins': [ - 'nginx = certbot_nginx._internal.configurator:NginxConfigurator', - ], - }, -) diff --git a/certbot/setup.py b/certbot/setup.py deleted file mode 100644 index 8b2874f20df..00000000000 --- a/certbot/setup.py +++ /dev/null @@ -1,150 +0,0 @@ -import codecs -from distutils.version import LooseVersion -import os -import re -import sys - -from setuptools import __version__ as setuptools_version -from setuptools import find_packages -from setuptools import setup - -# Workaround for https://bugs.python.org/issue8876, see -# https://bugs.python.org/issue8876#msg208792 -# This can be removed when using Python 2.7.9 or later: -# https://hg.python.org/cpython/raw-file/v2.7.9/Misc/NEWS -if os.path.abspath(__file__).split(os.path.sep)[1] == 'vagrant': - del os.link - - -def read_file(filename, encoding='utf8'): - """Read unicode from given file.""" - with codecs.open(filename, encoding=encoding) as fd: - return fd.read() - - -here = os.path.abspath(os.path.dirname(__file__)) - -# read version number (and other metadata) from package init -init_fn = os.path.join(here, 'certbot', '__init__.py') -meta = dict(re.findall(r"""__([a-z]+)__ = '([^']+)""", read_file(init_fn))) - -readme = read_file(os.path.join(here, 'README.rst')) -version = meta['version'] - -# This package relies on PyOpenSSL and requests, however, it isn't specified -# here to avoid masking the more specific request requirements in acme. See -# https://github.com/pypa/pip/issues/988 for more info. -install_requires = [ - 'acme>=1.8.0', - # We technically need ConfigArgParse 0.10.0 for Python 2.6 support, but - # saying so here causes a runtime error against our temporary fork of 0.9.3 - # in which we added 2.6 support (see #2243), so we relax the requirement. - 'ConfigArgParse>=0.9.3', - 'configobj>=5.0.6', - 'cryptography>=2.1.4', - 'distro>=1.0.1', - # 1.1.0+ is required to avoid the warnings described at - # https://github.com/certbot/josepy/issues/13. - 'josepy>=1.1.0', - 'parsedatetime>=2.4', - 'pyrfc3339', - 'pytz', - 'setuptools>=39.0.1', - 'zope.component', - 'zope.interface', -] - -# Add pywin32 on Windows platforms to handle low-level system calls. -# This dependency needs to be added using environment markers to avoid its installation on Linux. -# However environment markers are supported only with setuptools >= 36.2. -# So this dependency is not added for old Linux distributions with old setuptools, -# in order to allow these systems to build certbot from sources. -pywin32_req = 'pywin32>=300' # do not forget to edit pywin32 dependency accordingly in windows-installer/construct.py -setuptools_known_environment_markers = (LooseVersion(setuptools_version) >= LooseVersion('36.2')) -if setuptools_known_environment_markers: - install_requires.append(pywin32_req + " ; sys_platform == 'win32'") -elif 'bdist_wheel' in sys.argv[1:]: - raise RuntimeError('Error, you are trying to build certbot wheels using an old version ' - 'of setuptools. Version 36.2+ of setuptools is required.') -elif os.name == 'nt': - # This branch exists to improve this package's behavior on Windows. Without - # it, if the sdist is installed on Windows with an old version of - # setuptools, pywin32 will not be specified as a dependency. - install_requires.append(pywin32_req) - -dev_extras = [ - 'astroid', - 'azure-devops', - 'coverage', - 'ipdb', - 'mypy', - 'PyGithub', - 'pylint', - 'pytest', - 'pytest-cov', - 'pytest-xdist', - 'tox', - 'twine', - 'wheel', -] - -docs_extras = [ - # If you have Sphinx<1.5.1, you need docutils<0.13.1 - # https://github.com/sphinx-doc/sphinx/issues/3212 - 'repoze.sphinx.autointerface', - 'Sphinx>=1.2', # Annotation support - 'sphinx_rtd_theme', -] - -setup( - name='certbot', - version=version, - description="ACME client", - long_description=readme, - url='https://github.com/letsencrypt/letsencrypt', - author="Certbot Project", - author_email='client-dev@letsencrypt.org', - license='Apache License 2.0', - python_requires='>=3.6', - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Environment :: Console', - 'Environment :: Console :: Curses', - 'Intended Audience :: System Administrators', - 'License :: OSI Approved :: Apache Software License', - 'Operating System :: POSIX :: Linux', - 'Programming Language :: Python', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Topic :: Internet :: WWW/HTTP', - 'Topic :: Security', - 'Topic :: System :: Installation/Setup', - 'Topic :: System :: Networking', - 'Topic :: System :: Systems Administration', - 'Topic :: Utilities', - ], - - packages=find_packages(exclude=['docs', 'examples', 'tests', 'venv']), - include_package_data=True, - - install_requires=install_requires, - extras_require={ - 'dev': dev_extras, - 'docs': docs_extras, - }, - - entry_points={ - 'console_scripts': [ - 'certbot = certbot.main:main', - ], - 'certbot.plugins': [ - 'manual = certbot._internal.plugins.manual:Authenticator', - 'null = certbot._internal.plugins.null:Installer', - 'standalone = certbot._internal.plugins.standalone:Authenticator', - 'webroot = certbot._internal.plugins.webroot:Authenticator', - ], - }, -) From 87c9405a3205baf7cac08fcfa3db852cb6fd3ea2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Mar 2021 21:44:26 +0000 Subject: [PATCH 8/8] Bump httplib2 from 0.9.2 to 0.19.0 in /tools Bumps [httplib2](https://github.com/httplib2/httplib2) from 0.9.2 to 0.19.0. - [Release notes](https://github.com/httplib2/httplib2/releases) - [Changelog](https://github.com/httplib2/httplib2/blob/master/CHANGELOG) - [Commits](https://github.com/httplib2/httplib2/compare/0.9.2...v0.19.0) Signed-off-by: dependabot[bot] --- tools/oldest_constraints.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/oldest_constraints.txt b/tools/oldest_constraints.txt index f6528f396e5..90640c2cb6b 100644 --- a/tools/oldest_constraints.txt +++ b/tools/oldest_constraints.txt @@ -62,7 +62,7 @@ distro==1.0.1 # Lexicon oldest constraint is overridden appropriately on relevant DNS provider plugins # using their local-oldest-requirements.txt dns-lexicon==2.2.1 -httplib2==0.9.2 +httplib2==0.19.0 idna==2.6 setuptools==39.0.1 six==1.11.0