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 8a45a7949..d4ba3789b 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 cde0b61ef..305e628bc 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 66607d9e1..5f3c49104 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