diff --git a/AUTHORS.md b/AUTHORS.md index a00d20375..6b6b5d118 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -85,6 +85,7 @@ Authors * [Felix Schwarz](https://github.com/FelixSchwarz) * [Felix Yan](https://github.com/felixonmars) * [Filip Ochnik](https://github.com/filipochnik) +* [Florian Klink](https://github.com/flokli) * [Francois Marier](https://github.com/fmarier) * [Frank](https://github.com/Frankkkkk) * [Frederic BLANC](https://github.com/fblanc) diff --git a/acme/setup.py b/acme/setup.py index c993b0f2e..3d0cbf126 100644 --- a/acme/setup.py +++ b/acme/setup.py @@ -1,4 +1,4 @@ -from distutils.version import StrictVersion +from distutils.version import LooseVersion import sys from setuptools import __version__ as setuptools_version @@ -27,7 +27,7 @@ install_requires = [ 'six>=1.9.0', # needed for python_2_unicode_compatible ] -setuptools_known_environment_markers = (StrictVersion(setuptools_version) >= StrictVersion('36.2')) +setuptools_known_environment_markers = (LooseVersion(setuptools_version) >= LooseVersion('36.2')) if setuptools_known_environment_markers: install_requires.append('mock ; python_version < "3.3"') elif 'bdist_wheel' in sys.argv[1:]: diff --git a/certbot-apache/setup.py b/certbot-apache/setup.py index 719bea004..54ff59ff1 100644 --- a/certbot-apache/setup.py +++ b/certbot-apache/setup.py @@ -1,4 +1,4 @@ -from distutils.version import StrictVersion +from distutils.version import LooseVersion import sys from setuptools import __version__ as setuptools_version @@ -19,7 +19,7 @@ install_requires = [ 'zope.interface', ] -setuptools_known_environment_markers = (StrictVersion(setuptools_version) >= StrictVersion('36.2')) +setuptools_known_environment_markers = (LooseVersion(setuptools_version) >= LooseVersion('36.2')) if setuptools_known_environment_markers: install_requires.append('mock ; python_version < "3.3"') elif 'bdist_wheel' in sys.argv[1:]: diff --git a/certbot-ci/setup.py b/certbot-ci/setup.py index 75d2cc96a..128eab18a 100644 --- a/certbot-ci/setup.py +++ b/certbot-ci/setup.py @@ -1,4 +1,4 @@ -from distutils.version import StrictVersion +from distutils.version import LooseVersion import sys from setuptools import __version__ as setuptools_version @@ -26,7 +26,7 @@ install_requires = [ # However environment markers are supported only with setuptools >= 36.2. # So this dependency is not added for old Linux distributions with old setuptools, # in order to allow these systems to build certbot from sources. -if StrictVersion(setuptools_version) >= StrictVersion('36.2'): +if LooseVersion(setuptools_version) >= LooseVersion('36.2'): install_requires.append("pywin32>=224 ; sys_platform == 'win32'") elif 'bdist_wheel' in sys.argv[1:]: raise RuntimeError('Error, you are trying to build certbot wheels using an old version ' diff --git a/certbot-compatibility-test/setup.py b/certbot-compatibility-test/setup.py index 9a646d7ce..53875123f 100644 --- a/certbot-compatibility-test/setup.py +++ b/certbot-compatibility-test/setup.py @@ -1,4 +1,4 @@ -from distutils.version import StrictVersion +from distutils.version import LooseVersion import sys from setuptools import __version__ as setuptools_version @@ -15,7 +15,7 @@ install_requires = [ 'zope.interface', ] -setuptools_known_environment_markers = (StrictVersion(setuptools_version) >= StrictVersion('36.2')) +setuptools_known_environment_markers = (LooseVersion(setuptools_version) >= LooseVersion('36.2')) if setuptools_known_environment_markers: install_requires.append('mock ; python_version < "3.3"') elif 'bdist_wheel' in sys.argv[1:]: diff --git a/certbot-dns-cloudflare/setup.py b/certbot-dns-cloudflare/setup.py index 91c3683b6..54b31b44e 100644 --- a/certbot-dns-cloudflare/setup.py +++ b/certbot-dns-cloudflare/setup.py @@ -1,4 +1,4 @@ -from distutils.version import StrictVersion +from distutils.version import LooseVersion import sys from setuptools import __version__ as setuptools_version @@ -18,7 +18,7 @@ install_requires = [ 'zope.interface', ] -setuptools_known_environment_markers = (StrictVersion(setuptools_version) >= StrictVersion('36.2')) +setuptools_known_environment_markers = (LooseVersion(setuptools_version) >= LooseVersion('36.2')) if setuptools_known_environment_markers: install_requires.append('mock ; python_version < "3.3"') elif 'bdist_wheel' in sys.argv[1:]: diff --git a/certbot-dns-cloudxns/setup.py b/certbot-dns-cloudxns/setup.py index 579637dab..7d3097976 100644 --- a/certbot-dns-cloudxns/setup.py +++ b/certbot-dns-cloudxns/setup.py @@ -1,4 +1,4 @@ -from distutils.version import StrictVersion +from distutils.version import LooseVersion import sys from setuptools import __version__ as setuptools_version @@ -18,7 +18,7 @@ install_requires = [ 'zope.interface', ] -setuptools_known_environment_markers = (StrictVersion(setuptools_version) >= StrictVersion('36.2')) +setuptools_known_environment_markers = (LooseVersion(setuptools_version) >= LooseVersion('36.2')) if setuptools_known_environment_markers: install_requires.append('mock ; python_version < "3.3"') elif 'bdist_wheel' in sys.argv[1:]: diff --git a/certbot-dns-digitalocean/setup.py b/certbot-dns-digitalocean/setup.py index d30167a14..32376aff8 100644 --- a/certbot-dns-digitalocean/setup.py +++ b/certbot-dns-digitalocean/setup.py @@ -1,4 +1,4 @@ -from distutils.version import StrictVersion +from distutils.version import LooseVersion import sys from setuptools import __version__ as setuptools_version @@ -19,7 +19,7 @@ install_requires = [ 'zope.interface', ] -setuptools_known_environment_markers = (StrictVersion(setuptools_version) >= StrictVersion('36.2')) +setuptools_known_environment_markers = (LooseVersion(setuptools_version) >= LooseVersion('36.2')) if setuptools_known_environment_markers: install_requires.append('mock ; python_version < "3.3"') elif 'bdist_wheel' in sys.argv[1:]: diff --git a/certbot-dns-dnsimple/setup.py b/certbot-dns-dnsimple/setup.py index 6efebcd41..769a1c032 100644 --- a/certbot-dns-dnsimple/setup.py +++ b/certbot-dns-dnsimple/setup.py @@ -1,4 +1,4 @@ -from distutils.version import StrictVersion +from distutils.version import LooseVersion import os import sys @@ -25,7 +25,7 @@ elif 'bdist_wheel' in sys.argv[1:]: raise RuntimeError('Unset EXCLUDE_CERTBOT_DEPS when building wheels ' 'to include certbot dependencies.') -setuptools_known_environment_markers = (StrictVersion(setuptools_version) >= StrictVersion('36.2')) +setuptools_known_environment_markers = (LooseVersion(setuptools_version) >= LooseVersion('36.2')) if setuptools_known_environment_markers: install_requires.append('mock ; python_version < "3.3"') elif 'bdist_wheel' in sys.argv[1:]: diff --git a/certbot-dns-dnsmadeeasy/setup.py b/certbot-dns-dnsmadeeasy/setup.py index a5e025e66..01525afca 100644 --- a/certbot-dns-dnsmadeeasy/setup.py +++ b/certbot-dns-dnsmadeeasy/setup.py @@ -1,4 +1,4 @@ -from distutils.version import StrictVersion +from distutils.version import LooseVersion import sys from setuptools import __version__ as setuptools_version @@ -18,7 +18,7 @@ install_requires = [ 'zope.interface', ] -setuptools_known_environment_markers = (StrictVersion(setuptools_version) >= StrictVersion('36.2')) +setuptools_known_environment_markers = (LooseVersion(setuptools_version) >= LooseVersion('36.2')) if setuptools_known_environment_markers: install_requires.append('mock ; python_version < "3.3"') elif 'bdist_wheel' in sys.argv[1:]: diff --git a/certbot-dns-gehirn/setup.py b/certbot-dns-gehirn/setup.py index 8965e6b8c..224ea53b2 100644 --- a/certbot-dns-gehirn/setup.py +++ b/certbot-dns-gehirn/setup.py @@ -1,4 +1,4 @@ -from distutils.version import StrictVersion +from distutils.version import LooseVersion import sys from setuptools import __version__ as setuptools_version @@ -17,7 +17,7 @@ install_requires = [ 'zope.interface', ] -setuptools_known_environment_markers = (StrictVersion(setuptools_version) >= StrictVersion('36.2')) +setuptools_known_environment_markers = (LooseVersion(setuptools_version) >= LooseVersion('36.2')) if setuptools_known_environment_markers: install_requires.append('mock ; python_version < "3.3"') elif 'bdist_wheel' in sys.argv[1:]: diff --git a/certbot-dns-google/setup.py b/certbot-dns-google/setup.py index 27c5e6b05..de9d172bb 100644 --- a/certbot-dns-google/setup.py +++ b/certbot-dns-google/setup.py @@ -1,4 +1,4 @@ -from distutils.version import StrictVersion +from distutils.version import LooseVersion import sys from setuptools import __version__ as setuptools_version @@ -21,7 +21,7 @@ install_requires = [ 'httplib2' ] -setuptools_known_environment_markers = (StrictVersion(setuptools_version) >= StrictVersion('36.2')) +setuptools_known_environment_markers = (LooseVersion(setuptools_version) >= LooseVersion('36.2')) if setuptools_known_environment_markers: install_requires.append('mock ; python_version < "3.3"') elif 'bdist_wheel' in sys.argv[1:]: diff --git a/certbot-dns-linode/setup.py b/certbot-dns-linode/setup.py index ebe9660fa..068c04b06 100644 --- a/certbot-dns-linode/setup.py +++ b/certbot-dns-linode/setup.py @@ -1,4 +1,4 @@ -from distutils.version import StrictVersion +from distutils.version import LooseVersion import sys from setuptools import __version__ as setuptools_version @@ -17,7 +17,7 @@ install_requires = [ 'zope.interface', ] -setuptools_known_environment_markers = (StrictVersion(setuptools_version) >= StrictVersion('36.2')) +setuptools_known_environment_markers = (LooseVersion(setuptools_version) >= LooseVersion('36.2')) if setuptools_known_environment_markers: install_requires.append('mock ; python_version < "3.3"') elif 'bdist_wheel' in sys.argv[1:]: diff --git a/certbot-dns-luadns/setup.py b/certbot-dns-luadns/setup.py index 21daf4c57..d9723491c 100644 --- a/certbot-dns-luadns/setup.py +++ b/certbot-dns-luadns/setup.py @@ -1,4 +1,4 @@ -from distutils.version import StrictVersion +from distutils.version import LooseVersion import sys from setuptools import __version__ as setuptools_version @@ -18,7 +18,7 @@ install_requires = [ 'zope.interface', ] -setuptools_known_environment_markers = (StrictVersion(setuptools_version) >= StrictVersion('36.2')) +setuptools_known_environment_markers = (LooseVersion(setuptools_version) >= LooseVersion('36.2')) if setuptools_known_environment_markers: install_requires.append('mock ; python_version < "3.3"') elif 'bdist_wheel' in sys.argv[1:]: diff --git a/certbot-dns-nsone/setup.py b/certbot-dns-nsone/setup.py index ad42991f9..073b6458c 100644 --- a/certbot-dns-nsone/setup.py +++ b/certbot-dns-nsone/setup.py @@ -1,4 +1,4 @@ -from distutils.version import StrictVersion +from distutils.version import LooseVersion import sys from setuptools import __version__ as setuptools_version @@ -18,7 +18,7 @@ install_requires = [ 'zope.interface', ] -setuptools_known_environment_markers = (StrictVersion(setuptools_version) >= StrictVersion('36.2')) +setuptools_known_environment_markers = (LooseVersion(setuptools_version) >= LooseVersion('36.2')) if setuptools_known_environment_markers: install_requires.append('mock ; python_version < "3.3"') elif 'bdist_wheel' in sys.argv[1:]: diff --git a/certbot-dns-ovh/setup.py b/certbot-dns-ovh/setup.py index eee6ddc82..10d22e7a7 100644 --- a/certbot-dns-ovh/setup.py +++ b/certbot-dns-ovh/setup.py @@ -1,4 +1,4 @@ -from distutils.version import StrictVersion +from distutils.version import LooseVersion import sys from setuptools import __version__ as setuptools_version @@ -18,7 +18,7 @@ install_requires = [ 'zope.interface', ] -setuptools_known_environment_markers = (StrictVersion(setuptools_version) >= StrictVersion('36.2')) +setuptools_known_environment_markers = (LooseVersion(setuptools_version) >= LooseVersion('36.2')) if setuptools_known_environment_markers: install_requires.append('mock ; python_version < "3.3"') elif 'bdist_wheel' in sys.argv[1:]: diff --git a/certbot-dns-rfc2136/setup.py b/certbot-dns-rfc2136/setup.py index d9863aedd..1f035d88f 100644 --- a/certbot-dns-rfc2136/setup.py +++ b/certbot-dns-rfc2136/setup.py @@ -1,4 +1,4 @@ -from distutils.version import StrictVersion +from distutils.version import LooseVersion import sys from setuptools import __version__ as setuptools_version @@ -18,7 +18,7 @@ install_requires = [ 'zope.interface', ] -setuptools_known_environment_markers = (StrictVersion(setuptools_version) >= StrictVersion('36.2')) +setuptools_known_environment_markers = (LooseVersion(setuptools_version) >= LooseVersion('36.2')) if setuptools_known_environment_markers: install_requires.append('mock ; python_version < "3.3"') elif 'bdist_wheel' in sys.argv[1:]: diff --git a/certbot-dns-route53/setup.py b/certbot-dns-route53/setup.py index c207e5db5..b0d0d1beb 100644 --- a/certbot-dns-route53/setup.py +++ b/certbot-dns-route53/setup.py @@ -1,4 +1,4 @@ -from distutils.version import StrictVersion +from distutils.version import LooseVersion import sys from setuptools import __version__ as setuptools_version @@ -18,7 +18,7 @@ install_requires = [ 'zope.interface', ] -setuptools_known_environment_markers = (StrictVersion(setuptools_version) >= StrictVersion('36.2')) +setuptools_known_environment_markers = (LooseVersion(setuptools_version) >= LooseVersion('36.2')) if setuptools_known_environment_markers: install_requires.append('mock ; python_version < "3.3"') elif 'bdist_wheel' in sys.argv[1:]: diff --git a/certbot-dns-sakuracloud/setup.py b/certbot-dns-sakuracloud/setup.py index 06ce9613e..1b4ea512e 100644 --- a/certbot-dns-sakuracloud/setup.py +++ b/certbot-dns-sakuracloud/setup.py @@ -1,4 +1,4 @@ -from distutils.version import StrictVersion +from distutils.version import LooseVersion import sys from setuptools import __version__ as setuptools_version @@ -17,7 +17,7 @@ install_requires = [ 'zope.interface', ] -setuptools_known_environment_markers = (StrictVersion(setuptools_version) >= StrictVersion('36.2')) +setuptools_known_environment_markers = (LooseVersion(setuptools_version) >= LooseVersion('36.2')) if setuptools_known_environment_markers: install_requires.append('mock ; python_version < "3.3"') elif 'bdist_wheel' in sys.argv[1:]: diff --git a/certbot-nginx/setup.py b/certbot-nginx/setup.py index 6138a06c2..073a1a4d2 100644 --- a/certbot-nginx/setup.py +++ b/certbot-nginx/setup.py @@ -1,4 +1,4 @@ -from distutils.version import StrictVersion +from distutils.version import LooseVersion import sys from setuptools import __version__ as setuptools_version @@ -19,7 +19,7 @@ install_requires = [ 'zope.interface', ] -setuptools_known_environment_markers = (StrictVersion(setuptools_version) >= StrictVersion('36.2')) +setuptools_known_environment_markers = (LooseVersion(setuptools_version) >= LooseVersion('36.2')) if setuptools_known_environment_markers: install_requires.append('mock ; python_version < "3.3"') elif 'bdist_wheel' in sys.argv[1:]: diff --git a/certbot/CHANGELOG.md b/certbot/CHANGELOG.md index a429f9a2e..815ad66ca 100644 --- a/certbot/CHANGELOG.md +++ b/certbot/CHANGELOG.md @@ -24,6 +24,9 @@ Certbot adheres to [Semantic Versioning](https://semver.org/). ### Fixed * Cloudflare API Tokens may now be restricted to individual zones. +* Don't use `StrictVersion`, but `LooseVersion` to check version requirements with setuptools, + to fix some packaging issues with libraries respecting PEP404 for version string, + with doesn't match `StrictVersion` requirements. More details about these changes can be found on our GitHub repo. diff --git a/certbot/setup.py b/certbot/setup.py index 54dcea071..31a5d19d2 100644 --- a/certbot/setup.py +++ b/certbot/setup.py @@ -1,5 +1,5 @@ import codecs -from distutils.version import StrictVersion +from distutils.version import LooseVersion import os import re import sys @@ -61,7 +61,7 @@ install_requires = [ # So this dependency is not added for old Linux distributions with old setuptools, # in order to allow these systems to build certbot from sources. pywin32_req = 'pywin32>=227' # do not forget to edit pywin32 dependency accordingly in windows-installer/construct.py -setuptools_known_environment_markers = (StrictVersion(setuptools_version) >= StrictVersion('36.2')) +setuptools_known_environment_markers = (LooseVersion(setuptools_version) >= LooseVersion('36.2')) if setuptools_known_environment_markers: install_requires.append(pywin32_req + " ; sys_platform == 'win32'") elif 'bdist_wheel' in sys.argv[1:]: