From 210c1a0c5b3340f18c0bc7e54682c3d9a55a0673 Mon Sep 17 00:00:00 2001 From: Jens Vagelpohl Date: Thu, 10 Oct 2024 15:27:20 +0200 Subject: [PATCH] - cosmetics: clean up spacing around setuptools version specifier --- src/zope/meta/default/tox-testenv.j2 | 2 +- src/zope/meta/shared/packages.py | 4 ++-- src/zope/meta/toolkit/tox.ini.j2 | 2 +- src/zope/meta/zope-product/tox.ini.j2 | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/zope/meta/default/tox-testenv.j2 b/src/zope/meta/default/tox-testenv.j2 index 57f3fe7..fa338e9 100644 --- a/src/zope/meta/default/tox-testenv.j2 +++ b/src/zope/meta/default/tox-testenv.j2 @@ -11,7 +11,7 @@ wheel_build_env = .pkg pip_pre = py%(future_python_shortversion)s: true {% endif %} deps = - setuptools %(setuptools_version_spec)s + setuptools %(setuptools_version_spec)s {% for line in testenv_deps %} %(line)s {% endfor %} diff --git a/src/zope/meta/shared/packages.py b/src/zope/meta/shared/packages.py index de5ef3c..1ea97e5 100644 --- a/src/zope/meta/shared/packages.py +++ b/src/zope/meta/shared/packages.py @@ -24,14 +24,14 @@ NEWEST_PYTHON_VERSION = '3.13' FUTURE_PYTHON_VERSION = '3.14' PYPY_VERSION = '3.10' -SETUPTOOLS_VERSION_SPEC = '<74' +SETUPTOOLS_VERSION_SPEC = '< 74' MANYLINUX_PYTHON_VERSION = '3.11' MANYLINUX_AARCH64 = 'manylinux2014_aarch64' MANYLINUX_I686 = 'manylinux2014_i686' MANYLINUX_X86_64 = 'manylinux2014_x86_64' PYPROJECT_TOML_DEFAULTS = { 'build-system': { - 'requires': [f'setuptools{SETUPTOOLS_VERSION_SPEC}'], + 'requires': [f'setuptools {SETUPTOOLS_VERSION_SPEC}'], 'build-backend': 'setuptools.build_meta', }, 'tool': { diff --git a/src/zope/meta/toolkit/tox.ini.j2 b/src/zope/meta/toolkit/tox.ini.j2 index 76a6d13..f686e48 100644 --- a/src/zope/meta/toolkit/tox.ini.j2 +++ b/src/zope/meta/toolkit/tox.ini.j2 @@ -4,7 +4,7 @@ [testenv] skip_install = true deps = - setuptools %(setuptools_version_spec)s + setuptools %(setuptools_version_spec)s zc.buildout >= 3.1 wheel > 0.37 {% for line in testenv_deps %} diff --git a/src/zope/meta/zope-product/tox.ini.j2 b/src/zope/meta/zope-product/tox.ini.j2 index 45bd35c..bfff9cf 100644 --- a/src/zope/meta/zope-product/tox.ini.j2 +++ b/src/zope/meta/zope-product/tox.ini.j2 @@ -4,7 +4,7 @@ [testenv] skip_install = true deps = - setuptools %(setuptools_version_spec)s + setuptools %(setuptools_version_spec)s zc.buildout >= 3.1 wheel > 0.37 {% for line in testenv_deps %}