diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index c647dd551..a8bf27615 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 17e24ef0b..31f4ef72b 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 305e628bc..284aa7c0a 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 2b2e3dcbb..c0516d9ed 100755 --- a/tools/pipstrap.py +++ b/tools/pipstrap.py @@ -4,7 +4,7 @@ import os 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 5de9e147d..21bf9c0b1 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 5f3c49104..fdb80e6f6 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 96373d44e..a8bac904e 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)