From a7674548ab6d5f79cf8eb9a4e99ba0e3af3f5d1b Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Thu, 6 Jul 2023 20:14:05 -0700 Subject: [PATCH] Fix snap builds (#9729) * release script change * fix setup.py * match setup.py logic --- certbot-dns-cloudflare/setup.py | 9 +++------ certbot-dns-digitalocean/setup.py | 9 +++------ certbot-dns-dnsimple/setup.py | 9 +++------ certbot-dns-dnsmadeeasy/setup.py | 9 +++------ certbot-dns-gehirn/setup.py | 9 +++------ certbot-dns-google/setup.py | 9 +++------ certbot-dns-linode/setup.py | 9 +++------ certbot-dns-luadns/setup.py | 9 +++------ certbot-dns-nsone/setup.py | 9 +++------ certbot-dns-ovh/setup.py | 9 +++------ certbot-dns-rfc2136/setup.py | 9 +++------ certbot-dns-route53/setup.py | 9 +++------ certbot-dns-sakuracloud/setup.py | 9 +++------ tools/release.sh | 9 +++++++++ 14 files changed, 48 insertions(+), 78 deletions(-) diff --git a/certbot-dns-cloudflare/setup.py b/certbot-dns-cloudflare/setup.py index 5e388acd6..83d31830d 100644 --- a/certbot-dns-cloudflare/setup.py +++ b/certbot-dns-cloudflare/setup.py @@ -11,7 +11,9 @@ install_requires = [ 'setuptools>=41.6.0', ] -if not os.environ.get('SNAP_BUILD'): +if os.environ.get('SNAP_BUILD'): + install_requires.append('packaging') +else: install_requires.extend([ # We specify the minimum acme and certbot version as the current plugin # version for simplicity. See @@ -19,11 +21,6 @@ if not os.environ.get('SNAP_BUILD'): f'acme>={version}', f'certbot>={version}', ]) -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 diff --git a/certbot-dns-digitalocean/setup.py b/certbot-dns-digitalocean/setup.py index b7659b435..7dc342048 100644 --- a/certbot-dns-digitalocean/setup.py +++ b/certbot-dns-digitalocean/setup.py @@ -11,7 +11,9 @@ install_requires = [ 'setuptools>=41.6.0', ] -if not os.environ.get('SNAP_BUILD'): +if os.environ.get('SNAP_BUILD'): + install_requires.append('packaging') +else: install_requires.extend([ # We specify the minimum acme and certbot version as the current plugin # version for simplicity. See @@ -19,11 +21,6 @@ if not os.environ.get('SNAP_BUILD'): f'acme>={version}', f'certbot>={version}', ]) -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 diff --git a/certbot-dns-dnsimple/setup.py b/certbot-dns-dnsimple/setup.py index 51ff8eac8..7a988382d 100644 --- a/certbot-dns-dnsimple/setup.py +++ b/certbot-dns-dnsimple/setup.py @@ -13,7 +13,9 @@ install_requires = [ 'setuptools>=41.6.0', ] -if not os.environ.get('SNAP_BUILD'): +if os.environ.get('SNAP_BUILD'): + install_requires.append('packaging') +else: install_requires.extend([ # We specify the minimum acme and certbot version as the current plugin # version for simplicity. See @@ -21,11 +23,6 @@ if not os.environ.get('SNAP_BUILD'): f'acme>={version}', f'certbot>={version}', ]) -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 diff --git a/certbot-dns-dnsmadeeasy/setup.py b/certbot-dns-dnsmadeeasy/setup.py index d664587fc..ced2a9602 100644 --- a/certbot-dns-dnsmadeeasy/setup.py +++ b/certbot-dns-dnsmadeeasy/setup.py @@ -11,7 +11,9 @@ install_requires = [ 'setuptools>=41.6.0', ] -if not os.environ.get('SNAP_BUILD'): +if os.environ.get('SNAP_BUILD'): + install_requires.append('packaging') +else: install_requires.extend([ # We specify the minimum acme and certbot version as the current plugin # version for simplicity. See @@ -19,11 +21,6 @@ if not os.environ.get('SNAP_BUILD'): f'acme>={version}', f'certbot>={version}', ]) -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 diff --git a/certbot-dns-gehirn/setup.py b/certbot-dns-gehirn/setup.py index 77846326f..df61affaf 100644 --- a/certbot-dns-gehirn/setup.py +++ b/certbot-dns-gehirn/setup.py @@ -11,7 +11,9 @@ install_requires = [ 'setuptools>=41.6.0', ] -if not os.environ.get('SNAP_BUILD'): +if os.environ.get('SNAP_BUILD'): + install_requires.append('packaging') +else: install_requires.extend([ # We specify the minimum acme and certbot version as the current plugin # version for simplicity. See @@ -19,11 +21,6 @@ if not os.environ.get('SNAP_BUILD'): f'acme>={version}', f'certbot>={version}', ]) -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 diff --git a/certbot-dns-google/setup.py b/certbot-dns-google/setup.py index b74bba0b8..edb5c4d5d 100644 --- a/certbot-dns-google/setup.py +++ b/certbot-dns-google/setup.py @@ -12,7 +12,9 @@ install_requires = [ 'setuptools>=41.6.0', ] -if not os.environ.get('SNAP_BUILD'): +if os.environ.get('SNAP_BUILD'): + install_requires.append('packaging') +else: install_requires.extend([ # We specify the minimum acme and certbot version as the current plugin # version for simplicity. See @@ -20,11 +22,6 @@ if not os.environ.get('SNAP_BUILD'): f'acme>={version}', f'certbot>={version}', ]) -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 diff --git a/certbot-dns-linode/setup.py b/certbot-dns-linode/setup.py index 40cb730ea..7aff11fad 100644 --- a/certbot-dns-linode/setup.py +++ b/certbot-dns-linode/setup.py @@ -11,7 +11,9 @@ install_requires = [ 'setuptools>=41.6.0', ] -if not os.environ.get('SNAP_BUILD'): +if os.environ.get('SNAP_BUILD'): + install_requires.append('packaging') +else: install_requires.extend([ # We specify the minimum acme and certbot version as the current plugin # version for simplicity. See @@ -19,11 +21,6 @@ if not os.environ.get('SNAP_BUILD'): f'acme>={version}', f'certbot>={version}', ]) -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 diff --git a/certbot-dns-luadns/setup.py b/certbot-dns-luadns/setup.py index 3be44321a..8ce2f98ae 100644 --- a/certbot-dns-luadns/setup.py +++ b/certbot-dns-luadns/setup.py @@ -11,7 +11,9 @@ install_requires = [ 'setuptools>=41.6.0', ] -if not os.environ.get('SNAP_BUILD'): +if os.environ.get('SNAP_BUILD'): + install_requires.append('packaging') +else: install_requires.extend([ # We specify the minimum acme and certbot version as the current plugin # version for simplicity. See @@ -19,11 +21,6 @@ if not os.environ.get('SNAP_BUILD'): f'acme>={version}', f'certbot>={version}', ]) -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 diff --git a/certbot-dns-nsone/setup.py b/certbot-dns-nsone/setup.py index 995b537cb..23610d824 100644 --- a/certbot-dns-nsone/setup.py +++ b/certbot-dns-nsone/setup.py @@ -11,7 +11,9 @@ install_requires = [ 'setuptools>=41.6.0', ] -if not os.environ.get('SNAP_BUILD'): +if os.environ.get('SNAP_BUILD'): + install_requires.append('packaging') +else: install_requires.extend([ # We specify the minimum acme and certbot version as the current plugin # version for simplicity. See @@ -19,11 +21,6 @@ if not os.environ.get('SNAP_BUILD'): f'acme>={version}', f'certbot>={version}', ]) -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 diff --git a/certbot-dns-ovh/setup.py b/certbot-dns-ovh/setup.py index e0ea2a4ab..37ccf7207 100644 --- a/certbot-dns-ovh/setup.py +++ b/certbot-dns-ovh/setup.py @@ -11,7 +11,9 @@ install_requires = [ 'setuptools>=41.6.0', ] -if not os.environ.get('SNAP_BUILD'): +if os.environ.get('SNAP_BUILD'): + install_requires.append('packaging') +else: install_requires.extend([ # We specify the minimum acme and certbot version as the current plugin # version for simplicity. See @@ -19,11 +21,6 @@ if not os.environ.get('SNAP_BUILD'): f'acme>={version}', f'certbot>={version}', ]) -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 diff --git a/certbot-dns-rfc2136/setup.py b/certbot-dns-rfc2136/setup.py index bcd06efb6..79bfe58f6 100644 --- a/certbot-dns-rfc2136/setup.py +++ b/certbot-dns-rfc2136/setup.py @@ -11,7 +11,9 @@ install_requires = [ 'setuptools>=41.6.0', ] -if not os.environ.get('SNAP_BUILD'): +if os.environ.get('SNAP_BUILD'): + install_requires.append('packaging') +else: install_requires.extend([ # We specify the minimum acme and certbot version as the current plugin # version for simplicity. See @@ -19,11 +21,6 @@ if not os.environ.get('SNAP_BUILD'): f'acme>={version}', f'certbot>={version}', ]) -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 diff --git a/certbot-dns-route53/setup.py b/certbot-dns-route53/setup.py index 0237a0969..d74e764d9 100644 --- a/certbot-dns-route53/setup.py +++ b/certbot-dns-route53/setup.py @@ -11,7 +11,9 @@ install_requires = [ 'setuptools>=41.6.0', ] -if not os.environ.get('SNAP_BUILD'): +if os.environ.get('SNAP_BUILD'): + install_requires.append('packaging') +else: install_requires.extend([ # We specify the minimum acme and certbot version as the current plugin # version for simplicity. See @@ -19,11 +21,6 @@ if not os.environ.get('SNAP_BUILD'): f'acme>={version}', f'certbot>={version}', ]) -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 diff --git a/certbot-dns-sakuracloud/setup.py b/certbot-dns-sakuracloud/setup.py index bbce635c4..7573774c5 100644 --- a/certbot-dns-sakuracloud/setup.py +++ b/certbot-dns-sakuracloud/setup.py @@ -11,7 +11,9 @@ install_requires = [ 'setuptools>=41.6.0', ] -if not os.environ.get('SNAP_BUILD'): +if os.environ.get('SNAP_BUILD'): + install_requires.append('packaging') +else: install_requires.extend([ # We specify the minimum acme and certbot version as the current plugin # version for simplicity. See @@ -19,11 +21,6 @@ if not os.environ.get('SNAP_BUILD'): f'acme>={version}', f'certbot>={version}', ]) -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 diff --git a/tools/release.sh b/tools/release.sh index ae3e78dc1..296b63f11 100755 --- a/tools/release.sh +++ b/tools/release.sh @@ -31,6 +31,15 @@ if ! command -v script >/dev/null 2>&1; then exit 1 fi +if [ -n "$SNAP_BUILD" ]; then + echo "Running the release script with the environment variable SNAP_BUILD" + echo "set will cause plugins' wheels to be built without dependencies" + echo "on Certbot. See https://github.com/certbot/certbot/pull/8091 for more" + echo "info. Please unset this environment variable and run this script" + echo "again." + exit 1 +fi + export RELEASE_DIR="./releases" mv "$RELEASE_DIR" "$RELEASE_DIR.$(date +%s).bak" || true LOG_PATH="log"