From f67ac14775705a09f32f5b67daf45472dedc2d04 Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Mon, 24 May 2021 10:30:59 -0700 Subject: [PATCH] use normal constraints file with pipstrap --- tools/pipstrap.py | 7 +------ tools/pipstrap_constraints.txt | 18 ------------------ 2 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 tools/pipstrap_constraints.txt diff --git a/tools/pipstrap.py b/tools/pipstrap.py index 2b2e3dcbb..d2dbfaba9 100755 --- a/tools/pipstrap.py +++ b/tools/pipstrap.py @@ -1,15 +1,10 @@ #!/usr/bin/env python """Uses pip to upgrade Python packaging tools to pinned versions.""" -import os - import pip_install -_REQUIREMENTS_PATH = os.path.join(os.path.dirname(__file__), "pipstrap_constraints.txt") - def main(): - pip_install_args = '--requirement "{0}"'.format(_REQUIREMENTS_PATH) - pip_install.pip_install_with_print(pip_install_args) + pip_install.main('pip setuptools wheel'.split()) if __name__ == '__main__': diff --git a/tools/pipstrap_constraints.txt b/tools/pipstrap_constraints.txt deleted file mode 100644 index 54ab8b429..000000000 --- a/tools/pipstrap_constraints.txt +++ /dev/null @@ -1,18 +0,0 @@ -# Constraints 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 -# builds of Certbot that we ship to our users such as our Docker images. -# -# An older version of setuptools is currently used here in order to keep -# compatibility with Python 2 since newer versions of setuptools have dropped -# support for it. -pip==20.2.4 \ - --hash=sha256:51f1c7514530bd5c145d8f13ed936ad6b8bfcb8cf74e10403d0890bc986f0033 \ - --hash=sha256:85c99a857ea0fb0aedf23833d9be5c40cf253fe24443f0829c7b472e23c364a1 -setuptools==54.1.2 \ - --hash=sha256:dd20743f36b93cbb8724f4d2ccd970dce8b6e6e823a13aa7e5751bb4e674c20b \ - --hash=sha256:ebd0148faf627b569c8d2a1b20f5d3b09c873f12739d71c7ee88f037d5be82ff -wheel==0.35.1 \ - --hash=sha256:497add53525d16c173c2c1c733b8f655510e909ea78cc0e29d374243544b77a2 \ - --hash=sha256:99a22d87add3f634ff917310a3d87e499f19e663413a52eb9232c447aa646c9f