From 97033e444fb33978f4e02e5ba17989be5477df7d Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Mon, 24 May 2021 15:05:00 -0700 Subject: [PATCH] remove local-oldest-requirements files --- certbot-apache/local-oldest-requirements.txt | 3 -- certbot-apache/setup.py | 9 +++-- .../local-oldest-requirements.txt | 3 -- certbot-dns-cloudflare/setup.py | 9 +++-- .../local-oldest-requirements.txt | 3 -- certbot-dns-cloudxns/setup.py | 9 +++-- .../local-oldest-requirements.txt | 3 -- certbot-dns-digitalocean/setup.py | 9 +++-- .../local-oldest-requirements.txt | 3 -- certbot-dns-dnsimple/setup.py | 9 +++-- .../local-oldest-requirements.txt | 3 -- certbot-dns-dnsmadeeasy/setup.py | 9 +++-- .../local-oldest-requirements.txt | 3 -- certbot-dns-gehirn/setup.py | 7 +++- .../local-oldest-requirements.txt | 3 -- certbot-dns-google/setup.py | 9 +++-- .../local-oldest-requirements.txt | 3 -- certbot-dns-linode/setup.py | 7 +++- .../local-oldest-requirements.txt | 3 -- certbot-dns-luadns/setup.py | 9 +++-- .../local-oldest-requirements.txt | 3 -- certbot-dns-nsone/setup.py | 9 +++-- certbot-dns-ovh/local-oldest-requirements.txt | 3 -- certbot-dns-ovh/setup.py | 9 +++-- .../local-oldest-requirements.txt | 3 -- certbot-dns-rfc2136/setup.py | 9 +++-- .../local-oldest-requirements.txt | 3 -- certbot-dns-route53/setup.py | 9 +++-- .../local-oldest-requirements.txt | 3 -- certbot-dns-sakuracloud/setup.py | 7 +++- certbot-nginx/local-oldest-requirements.txt | 3 -- certbot-nginx/setup.py | 9 +++-- certbot/local-oldest-requirements.txt | 2 - certbot/setup.py | 5 ++- tools/_release.sh | 8 ---- tools/oldest_constraints.txt | 2 - tools/pip_install.py | 38 ++----------------- 37 files changed, 88 insertions(+), 153 deletions(-) delete mode 100644 certbot-apache/local-oldest-requirements.txt delete mode 100644 certbot-dns-cloudflare/local-oldest-requirements.txt delete mode 100644 certbot-dns-cloudxns/local-oldest-requirements.txt delete mode 100644 certbot-dns-digitalocean/local-oldest-requirements.txt delete mode 100644 certbot-dns-dnsimple/local-oldest-requirements.txt delete mode 100644 certbot-dns-dnsmadeeasy/local-oldest-requirements.txt delete mode 100644 certbot-dns-gehirn/local-oldest-requirements.txt delete mode 100644 certbot-dns-google/local-oldest-requirements.txt delete mode 100644 certbot-dns-linode/local-oldest-requirements.txt delete mode 100644 certbot-dns-luadns/local-oldest-requirements.txt delete mode 100644 certbot-dns-nsone/local-oldest-requirements.txt delete mode 100644 certbot-dns-ovh/local-oldest-requirements.txt delete mode 100644 certbot-dns-rfc2136/local-oldest-requirements.txt delete mode 100644 certbot-dns-route53/local-oldest-requirements.txt delete mode 100644 certbot-dns-sakuracloud/local-oldest-requirements.txt delete mode 100644 certbot-nginx/local-oldest-requirements.txt delete mode 100644 certbot/local-oldest-requirements.txt diff --git a/certbot-apache/local-oldest-requirements.txt b/certbot-apache/local-oldest-requirements.txt deleted file mode 100644 index 323e315f1..000000000 --- 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]==1.8.0 -certbot[dev]==1.10.1 diff --git a/certbot-apache/setup.py b/certbot-apache/setup.py index d780cb723..931823333 100644 --- a/certbot-apache/setup.py +++ b/certbot-apache/setup.py @@ -3,11 +3,12 @@ from setuptools import setup version = '1.16.0.dev0' -# Remember to update local-oldest-requirements.txt when changing the minimum -# acme/certbot version. install_requires = [ - 'acme>=1.8.0', - 'certbot>=1.10.1', + # We specify the minimum acme and certbot version as the current plugin + # version for simplicity. See + # https://github.com/certbot/certbot/issues/8761 for more info. + f'acme>={version}', + f'certbot>={version}', 'python-augeas', 'setuptools>=39.0.1', 'zope.component', diff --git a/certbot-dns-cloudflare/local-oldest-requirements.txt b/certbot-dns-cloudflare/local-oldest-requirements.txt deleted file mode 100644 index cf61c15a5..000000000 --- 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/setup.py b/certbot-dns-cloudflare/setup.py index 3e3a3d1ba..6c621e51e 100644 --- a/certbot-dns-cloudflare/setup.py +++ b/certbot-dns-cloudflare/setup.py @@ -6,8 +6,6 @@ from setuptools import setup version = '1.16.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', @@ -16,8 +14,11 @@ install_requires = [ if not os.environ.get('SNAP_BUILD'): install_requires.extend([ - 'acme>=0.29.0', - 'certbot>=1.1.0', + # We specify the minimum acme and certbot version as the current plugin + # version for simplicity. See + # https://github.com/certbot/certbot/issues/8761 for more info. + f'acme>={version}', + f'certbot>={version}', ]) elif 'bdist_wheel' in sys.argv[1:]: raise RuntimeError('Unset SNAP_BUILD when building wheels ' diff --git a/certbot-dns-cloudxns/local-oldest-requirements.txt b/certbot-dns-cloudxns/local-oldest-requirements.txt deleted file mode 100644 index 1307698d4..000000000 --- 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/setup.py b/certbot-dns-cloudxns/setup.py index 153e373bd..e61dcf857 100644 --- a/certbot-dns-cloudxns/setup.py +++ b/certbot-dns-cloudxns/setup.py @@ -6,8 +6,6 @@ from setuptools import setup version = '1.16.0.dev0' -# Remember to update local-oldest-requirements.txt when changing the minimum -# acme/certbot version. install_requires = [ 'dns-lexicon>=3.1.0', # Changed `rtype` parameter name 'setuptools>=39.0.1', @@ -16,8 +14,11 @@ install_requires = [ if not os.environ.get('SNAP_BUILD'): install_requires.extend([ - 'acme>=0.31.0', - 'certbot>=1.1.0', + # We specify the minimum acme and certbot version as the current plugin + # version for simplicity. See + # https://github.com/certbot/certbot/issues/8761 for more info. + f'acme>={version}', + f'certbot>={version}', ]) elif 'bdist_wheel' in sys.argv[1:]: raise RuntimeError('Unset SNAP_BUILD when building wheels ' diff --git a/certbot-dns-digitalocean/local-oldest-requirements.txt b/certbot-dns-digitalocean/local-oldest-requirements.txt deleted file mode 100644 index cf61c15a5..000000000 --- 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/setup.py b/certbot-dns-digitalocean/setup.py index fba2fbc5f..6edbcec41 100644 --- a/certbot-dns-digitalocean/setup.py +++ b/certbot-dns-digitalocean/setup.py @@ -6,8 +6,6 @@ from setuptools import setup version = '1.16.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', @@ -16,8 +14,11 @@ install_requires = [ if not os.environ.get('SNAP_BUILD'): install_requires.extend([ - 'acme>=0.29.0', - 'certbot>=1.1.0', + # We specify the minimum acme and certbot version as the current plugin + # version for simplicity. See + # https://github.com/certbot/certbot/issues/8761 for more info. + f'acme>={version}', + f'certbot>={version}', ]) elif 'bdist_wheel' in sys.argv[1:]: raise RuntimeError('Unset SNAP_BUILD when building wheels ' diff --git a/certbot-dns-dnsimple/local-oldest-requirements.txt b/certbot-dns-dnsimple/local-oldest-requirements.txt deleted file mode 100644 index 1307698d4..000000000 --- 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/setup.py b/certbot-dns-dnsimple/setup.py index 70181ae78..4467dd46b 100644 --- a/certbot-dns-dnsimple/setup.py +++ b/certbot-dns-dnsimple/setup.py @@ -6,8 +6,6 @@ from setuptools import setup version = '1.16.0.dev0' -# Remember to update local-oldest-requirements.txt when changing the minimum -# acme/certbot version. install_requires = [ 'setuptools>=39.0.1', 'zope.interface', @@ -15,8 +13,11 @@ install_requires = [ if not os.environ.get('SNAP_BUILD'): install_requires.extend([ - 'acme>=0.31.0', - 'certbot>=1.1.0', + # We specify the minimum acme and certbot version as the current plugin + # version for simplicity. See + # https://github.com/certbot/certbot/issues/8761 for more info. + f'acme>={version}', + f'certbot>={version}', ]) elif 'bdist_wheel' in sys.argv[1:]: raise RuntimeError('Unset SNAP_BUILD when building wheels ' diff --git a/certbot-dns-dnsmadeeasy/local-oldest-requirements.txt b/certbot-dns-dnsmadeeasy/local-oldest-requirements.txt deleted file mode 100644 index 1307698d4..000000000 --- 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/setup.py b/certbot-dns-dnsmadeeasy/setup.py index 852eac606..9a15c7a21 100644 --- a/certbot-dns-dnsmadeeasy/setup.py +++ b/certbot-dns-dnsmadeeasy/setup.py @@ -6,8 +6,6 @@ from setuptools import setup version = '1.16.0.dev0' -# Remember to update local-oldest-requirements.txt when changing the minimum -# acme/certbot version. install_requires = [ 'dns-lexicon>=3.1.0', # Changed `rtype` parameter name 'setuptools>=39.0.1', @@ -16,8 +14,11 @@ install_requires = [ if not os.environ.get('SNAP_BUILD'): install_requires.extend([ - 'acme>=0.31.0', - 'certbot>=1.1.0', + # We specify the minimum acme and certbot version as the current plugin + # version for simplicity. See + # https://github.com/certbot/certbot/issues/8761 for more info. + f'acme>={version}', + f'certbot>={version}', ]) elif 'bdist_wheel' in sys.argv[1:]: raise RuntimeError('Unset SNAP_BUILD when building wheels ' diff --git a/certbot-dns-gehirn/local-oldest-requirements.txt b/certbot-dns-gehirn/local-oldest-requirements.txt deleted file mode 100644 index 1307698d4..000000000 --- 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/setup.py b/certbot-dns-gehirn/setup.py index 85058ab90..5f4380847 100644 --- a/certbot-dns-gehirn/setup.py +++ b/certbot-dns-gehirn/setup.py @@ -15,8 +15,11 @@ install_requires = [ if not os.environ.get('SNAP_BUILD'): install_requires.extend([ - 'acme>=0.31.0', - 'certbot>=1.1.0', + # We specify the minimum acme and certbot version as the current plugin + # version for simplicity. See + # https://github.com/certbot/certbot/issues/8761 for more info. + f'acme>={version}', + f'certbot>={version}', ]) elif 'bdist_wheel' in sys.argv[1:]: raise RuntimeError('Unset SNAP_BUILD when building wheels ' diff --git a/certbot-dns-google/local-oldest-requirements.txt b/certbot-dns-google/local-oldest-requirements.txt deleted file mode 100644 index cf61c15a5..000000000 --- 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/setup.py b/certbot-dns-google/setup.py index dd43f4992..3aeecf822 100644 --- a/certbot-dns-google/setup.py +++ b/certbot-dns-google/setup.py @@ -6,8 +6,6 @@ from setuptools import setup version = '1.16.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', @@ -19,8 +17,11 @@ install_requires = [ if not os.environ.get('SNAP_BUILD'): install_requires.extend([ - 'acme>=0.29.0', - 'certbot>=1.1.0', + # We specify the minimum acme and certbot version as the current plugin + # version for simplicity. See + # https://github.com/certbot/certbot/issues/8761 for more info. + f'acme>={version}', + f'certbot>={version}', ]) elif 'bdist_wheel' in sys.argv[1:]: raise RuntimeError('Unset SNAP_BUILD when building wheels ' diff --git a/certbot-dns-linode/local-oldest-requirements.txt b/certbot-dns-linode/local-oldest-requirements.txt deleted file mode 100644 index 1307698d4..000000000 --- a/certbot-dns-linode/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-linode/setup.py b/certbot-dns-linode/setup.py index 293dc25c3..2e1e8b41a 100644 --- a/certbot-dns-linode/setup.py +++ b/certbot-dns-linode/setup.py @@ -15,8 +15,11 @@ install_requires = [ if not os.environ.get('SNAP_BUILD'): install_requires.extend([ - 'acme>=0.31.0', - 'certbot>=1.1.0', + # We specify the minimum acme and certbot version as the current plugin + # version for simplicity. See + # https://github.com/certbot/certbot/issues/8761 for more info. + f'acme>={version}', + f'certbot>={version}', ]) elif 'bdist_wheel' in sys.argv[1:]: raise RuntimeError('Unset SNAP_BUILD when building wheels ' diff --git a/certbot-dns-luadns/local-oldest-requirements.txt b/certbot-dns-luadns/local-oldest-requirements.txt deleted file mode 100644 index 1307698d4..000000000 --- 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/setup.py b/certbot-dns-luadns/setup.py index 9ecacdd26..8cf19c8e2 100644 --- a/certbot-dns-luadns/setup.py +++ b/certbot-dns-luadns/setup.py @@ -6,8 +6,6 @@ from setuptools import setup version = '1.16.0.dev0' -# Remember to update local-oldest-requirements.txt when changing the minimum -# acme/certbot version. install_requires = [ 'dns-lexicon>=3.1.0', # Changed `rtype` parameter name 'setuptools>=39.0.1', @@ -16,8 +14,11 @@ install_requires = [ if not os.environ.get('SNAP_BUILD'): install_requires.extend([ - 'acme>=0.31.0', - 'certbot>=1.1.0', + # We specify the minimum acme and certbot version as the current plugin + # version for simplicity. See + # https://github.com/certbot/certbot/issues/8761 for more info. + f'acme>={version}', + f'certbot>={version}', ]) elif 'bdist_wheel' in sys.argv[1:]: raise RuntimeError('Unset SNAP_BUILD when building wheels ' diff --git a/certbot-dns-nsone/local-oldest-requirements.txt b/certbot-dns-nsone/local-oldest-requirements.txt deleted file mode 100644 index 1307698d4..000000000 --- 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/setup.py b/certbot-dns-nsone/setup.py index cf88a118a..f87b0aeb7 100644 --- a/certbot-dns-nsone/setup.py +++ b/certbot-dns-nsone/setup.py @@ -6,8 +6,6 @@ from setuptools import setup version = '1.16.0.dev0' -# Remember to update local-oldest-requirements.txt when changing the minimum -# acme/certbot version. install_requires = [ 'dns-lexicon>=3.1.0', # Changed `rtype` parameter name 'setuptools>=39.0.1', @@ -16,8 +14,11 @@ install_requires = [ if not os.environ.get('SNAP_BUILD'): install_requires.extend([ - 'acme>=0.31.0', - 'certbot>=1.1.0', + # We specify the minimum acme and certbot version as the current plugin + # version for simplicity. See + # https://github.com/certbot/certbot/issues/8761 for more info. + f'acme>={version}', + f'certbot>={version}', ]) elif 'bdist_wheel' in sys.argv[1:]: raise RuntimeError('Unset SNAP_BUILD when building wheels ' diff --git a/certbot-dns-ovh/local-oldest-requirements.txt b/certbot-dns-ovh/local-oldest-requirements.txt deleted file mode 100644 index 1307698d4..000000000 --- a/certbot-dns-ovh/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-ovh/setup.py b/certbot-dns-ovh/setup.py index e4dd4d712..ce8260585 100644 --- a/certbot-dns-ovh/setup.py +++ b/certbot-dns-ovh/setup.py @@ -6,8 +6,6 @@ from setuptools import setup version = '1.16.0.dev0' -# Remember to update local-oldest-requirements.txt when changing the minimum -# acme/certbot version. install_requires = [ 'dns-lexicon>=3.1.0', # Changed `rtype` parameter name 'setuptools>=39.0.1', @@ -16,8 +14,11 @@ install_requires = [ if not os.environ.get('SNAP_BUILD'): install_requires.extend([ - 'acme>=0.31.0', - 'certbot>=1.1.0', + # We specify the minimum acme and certbot version as the current plugin + # version for simplicity. See + # https://github.com/certbot/certbot/issues/8761 for more info. + f'acme>={version}', + f'certbot>={version}', ]) elif 'bdist_wheel' in sys.argv[1:]: raise RuntimeError('Unset SNAP_BUILD when building wheels ' diff --git a/certbot-dns-rfc2136/local-oldest-requirements.txt b/certbot-dns-rfc2136/local-oldest-requirements.txt deleted file mode 100644 index cf61c15a5..000000000 --- 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/setup.py b/certbot-dns-rfc2136/setup.py index a19753e79..49fc77fbc 100644 --- a/certbot-dns-rfc2136/setup.py +++ b/certbot-dns-rfc2136/setup.py @@ -6,8 +6,6 @@ from setuptools import setup version = '1.16.0.dev0' -# Remember to update local-oldest-requirements.txt when changing the minimum -# acme/certbot version. install_requires = [ 'dnspython', 'setuptools>=39.0.1', @@ -16,8 +14,11 @@ install_requires = [ if not os.environ.get('SNAP_BUILD'): install_requires.extend([ - 'acme>=0.29.0', - 'certbot>=1.1.0', + # We specify the minimum acme and certbot version as the current plugin + # version for simplicity. See + # https://github.com/certbot/certbot/issues/8761 for more info. + f'acme>={version}', + f'certbot>={version}', ]) elif 'bdist_wheel' in sys.argv[1:]: raise RuntimeError('Unset SNAP_BUILD when building wheels ' diff --git a/certbot-dns-route53/local-oldest-requirements.txt b/certbot-dns-route53/local-oldest-requirements.txt deleted file mode 100644 index cf61c15a5..000000000 --- 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/setup.py b/certbot-dns-route53/setup.py index b1c1d786c..85407509e 100644 --- a/certbot-dns-route53/setup.py +++ b/certbot-dns-route53/setup.py @@ -6,8 +6,6 @@ from setuptools import setup version = '1.16.0.dev0' -# Remember to update local-oldest-requirements.txt when changing the minimum -# acme/certbot version. install_requires = [ 'boto3', 'setuptools>=39.0.1', @@ -16,8 +14,11 @@ install_requires = [ if not os.environ.get('SNAP_BUILD'): install_requires.extend([ - 'acme>=0.29.0', - 'certbot>=1.1.0', + # We specify the minimum acme and certbot version as the current plugin + # version for simplicity. See + # https://github.com/certbot/certbot/issues/8761 for more info. + f'acme>={version}', + f'certbot>={version}', ]) elif 'bdist_wheel' in sys.argv[1:]: raise RuntimeError('Unset SNAP_BUILD when building wheels ' diff --git a/certbot-dns-sakuracloud/local-oldest-requirements.txt b/certbot-dns-sakuracloud/local-oldest-requirements.txt deleted file mode 100644 index 1307698d4..000000000 --- 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/setup.py b/certbot-dns-sakuracloud/setup.py index 353111ec2..43702cbf7 100644 --- a/certbot-dns-sakuracloud/setup.py +++ b/certbot-dns-sakuracloud/setup.py @@ -15,8 +15,11 @@ install_requires = [ if not os.environ.get('SNAP_BUILD'): install_requires.extend([ - 'acme>=0.31.0', - 'certbot>=1.1.0', + # We specify the minimum acme and certbot version as the current plugin + # version for simplicity. See + # https://github.com/certbot/certbot/issues/8761 for more info. + f'acme>={version}', + f'certbot>={version}', ]) elif 'bdist_wheel' in sys.argv[1:]: raise RuntimeError('Unset SNAP_BUILD when building wheels ' diff --git a/certbot-nginx/local-oldest-requirements.txt b/certbot-nginx/local-oldest-requirements.txt deleted file mode 100644 index 323e315f1..000000000 --- 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.8.0 -certbot[dev]==1.10.1 diff --git a/certbot-nginx/setup.py b/certbot-nginx/setup.py index 96d8f7f1b..fdb1f5a76 100644 --- a/certbot-nginx/setup.py +++ b/certbot-nginx/setup.py @@ -3,11 +3,12 @@ from setuptools import setup version = '1.16.0.dev0' -# Remember to update local-oldest-requirements.txt when changing the minimum -# acme/certbot version. install_requires = [ - 'acme>=1.8.0', - 'certbot>=1.10.1', + # We specify the minimum acme and certbot version as the current plugin + # version for simplicity. See + # https://github.com/certbot/certbot/issues/8761 for more info. + f'acme>={version}', + f'certbot>={version}', 'PyOpenSSL>=17.3.0', 'pyparsing>=2.2.0', 'setuptools>=39.0.1', diff --git a/certbot/local-oldest-requirements.txt b/certbot/local-oldest-requirements.txt deleted file mode 100644 index 983f11cca..000000000 --- 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/setup.py b/certbot/setup.py index e0078bd6e..eba0db3d7 100644 --- a/certbot/setup.py +++ b/certbot/setup.py @@ -41,7 +41,10 @@ version = meta['version'] # 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 specify the minimum acme version as the current Certbot version for + # simplicity. See https://github.com/certbot/certbot/issues/8761 for more + # info. + f'acme>={version}', # 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. diff --git a/tools/_release.sh b/tools/_release.sh index 7dd4601ff..03945da21 100755 --- a/tools/_release.sh +++ b/tools/_release.sh @@ -87,14 +87,6 @@ for pkg_dir in $SUBPKGS certbot-compatibility-test do sed -i 's/\.dev0//' "$pkg_dir/setup.py" git add "$pkg_dir/setup.py" - - if [ -f "$pkg_dir/local-oldest-requirements.txt" ]; then - sed -i "s/-e acme\[dev\]/acme[dev]==$version/" "$pkg_dir/local-oldest-requirements.txt" - sed -i "s/-e acme/acme[dev]==$version/" "$pkg_dir/local-oldest-requirements.txt" - sed -i "s/-e certbot\[dev\]/certbot[dev]==$version/" "$pkg_dir/local-oldest-requirements.txt" - sed -i "s/-e certbot/certbot[dev]==$version/" "$pkg_dir/local-oldest-requirements.txt" - git add "$pkg_dir/local-oldest-requirements.txt" - fi done SetVersion() { diff --git a/tools/oldest_constraints.txt b/tools/oldest_constraints.txt index c0f114639..c31c5d4f8 100644 --- a/tools/oldest_constraints.txt +++ b/tools/oldest_constraints.txt @@ -74,6 +74,4 @@ parsedatetime==2.4 # Tracking at https://github.com/certbot/certbot/issues/6473 boto3==1.4.7 botocore==1.7.41 -# Lexicon oldest constraint is overridden appropriately on relevant DNS provider plugins -# using their local-oldest-requirements.txt dns-lexicon==3.1.0 diff --git a/tools/pip_install.py b/tools/pip_install.py index 07e1e5b13..047b93f08 100755 --- a/tools/pip_install.py +++ b/tools/pip_install.py @@ -1,10 +1,7 @@ #!/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 -# top level of the package's directory is used, otherwise, -# tools/requirements.txt is used. If CERTBOT_OLDEST is set, this script must -# be run with `-e ` and no other arguments. +# to 1, a combination of tools/oldest_constraints.txt and +# tools/dev_constraints.txt is used, otherwise, tools/requirements.txt is used. from __future__ import absolute_import from __future__ import print_function @@ -37,27 +34,13 @@ def find_tools_path(): return os.path.dirname(readlink.main(__file__)) -def certbot_oldest_processing(tools_path, args, constraints_path): - if args[0] != '-e' or len(args) != 2: - raise ValueError('When CERTBOT_OLDEST is set, this script must be run ' - 'with a single -e argument.') - # remove any extras such as [dev] - pkg_dir = re.sub(r'\[\w+\]', '', args[1]) +def certbot_oldest_processing(tools_path, constraints_path): # The order of the files in this list matters as files specified later can # override the pinnings found in earlier files. pinning_files = [os.path.join(tools_path, 'dev_constraints.txt'), os.path.join(tools_path, 'oldest_constraints.txt')] - requirements = os.path.join(pkg_dir, 'local-oldest-requirements.txt') - # packages like acme don't have any local oldest requirements - if os.path.isfile(requirements): - # We add requirements to the end of the list so it can override - # anything that it needs to. - pinning_files.append(requirements) - else: - requirements = None with open(constraints_path, 'w') as fd: fd.write(merge_module.main(*pinning_files)) - return requirements def certbot_normal_processing(tools_path, constraints_path): @@ -91,27 +74,14 @@ def main(args): else: # Otherwise, we merge requirements to build the constraints and pin dependencies constraints_path = os.path.join(working_dir, 'constraints.txt') - requirements = None if os.environ.get('CERTBOT_OLDEST') == '1': - requirements = certbot_oldest_processing(tools_path, args, constraints_path) + certbot_oldest_processing(tools_path, constraints_path) else: certbot_normal_processing(tools_path, constraints_path) env = os.environ.copy() env["PIP_CONSTRAINT"] = constraints_path - if requirements: # This branch is executed during the oldest tests - # First step, install the transitive dependencies of oldest requirements - # in respect with oldest constraints. - pip_install_with_print('--requirement "{0}"'.format(requirements), - env=env) - # Second step, ensure that oldest requirements themselves are effectively - # installed using --force-reinstall, and avoid corner cases like the one described - # in https://github.com/certbot/certbot/issues/7014. - pip_install_with_print('--force-reinstall --no-deps --requirement "{0}"' - .format(requirements)) - - print(' '.join(args)) pip_install_with_print(' '.join(args), env=env)