[neon/forks/sip6/Neon/release] /: New upstream version 6.9.1
Dmitry Shachnev
null at kde.org
Sun Aug 17 07:48:50 BST 2025
Git commit 8895f2ec1d3d43e2d53c91c7a6e6ea7f897ca672 by Dmitry Shachnev.
Committed on 12/12/2024 at 10:59.
Pushed by carlosdem into branch 'Neon/release'.
New upstream version 6.9.1
M +3 -3 .git_archival.txt
M +5 -0 docs/command_line_tools.rst
M +1 -1 docs/conf.py
M +1 -2 docs/introduction.rst
M +26 -0 docs/releases.md
M +1 -1 pyproject.toml
M +1 -1 sipbuild/builder.py
M +19 -14 sipbuild/module/module.py
D +0 -2 sipbuild/module/source/12/pyproject.toml
A +2 -0 sipbuild/module/source/12/pyproject.toml.in
M +1 -1 sipbuild/module/source/12/setup.py.in
M +3 -3 sipbuild/module/source/12/sip.h.in
D +0 -2 sipbuild/module/source/13/pyproject.toml
A +2 -0 sipbuild/module/source/13/pyproject.toml.in
M +1 -1 sipbuild/module/source/13/setup.py.in
M +3 -3 sipbuild/module/source/13/sip.h.in
M +7 -1 sipbuild/py_versions.py
https://invent.kde.org/neon/forks/sip6/-/commit/8895f2ec1d3d43e2d53c91c7a6e6ea7f897ca672
diff --git a/.git_archival.txt b/.git_archival.txt
index 10b638a..22b8feb 100644
--- a/.git_archival.txt
+++ b/.git_archival.txt
@@ -1,3 +1,3 @@
-node: 179c169514095effa9653b254b11d160b2ad923a
-node-date: 2024-12-05T15:01:49Z
-describe-name: 6.9.0
+node: a619d79626cfff6678d194c7dd8d0d948bb644c0
+node-date: 2024-12-12T09:55:37Z
+describe-name: 6.9.1
diff --git a/docs/command_line_tools.rst b/docs/command_line_tools.rst
index 1cb52f4..ed3006e 100644
--- a/docs/command_line_tools.rst
+++ b/docs/command_line_tools.rst
@@ -434,6 +434,11 @@ The syntax of the :program:`sip-sdist` command line is::
sip-sdist [options]
+.. versionchanged:: 6.9.1
+
+ The name of the sdist file now conforms to PEP 625 (i.e. it is all lower
+ case).
+
The full set of command line options is:
.. program:: sip-sdist
diff --git a/docs/conf.py b/docs/conf.py
index c10b11b..8c7412c 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -13,7 +13,7 @@ project = 'sip'
copyright = '{0} Phil Thompson <phil at riverbankcomputing.com>'.format(
date.today().year)
author = 'Phil Thompson'
-version = 'v6.9.0'
+version = 'v6.9.1'
# -- General configuration ---------------------------------------------------
diff --git a/docs/introduction.rst b/docs/introduction.rst
index 9ac7d0d..4f6bc88 100644
--- a/docs/introduction.rst
+++ b/docs/introduction.rst
@@ -187,8 +187,7 @@ Collectively the above are SIP's *build tools*.
:program:`pip` can also be used as a build frontend. This has the advantage
that the user does not need to explicitly install SIP, :program:`pip` will do
-that automatically. However it has the disadvantage that :program:`pip` does
-not (yet) allow the user to configure the backend using command line options.
+that automatically.
SIP also includes some additional command line tools.
diff --git a/docs/releases.md b/docs/releases.md
index 21690c2..d35bda5 100644
--- a/docs/releases.md
+++ b/docs/releases.md
@@ -1,6 +1,32 @@
# Release Notes
+## v6.9.1
+
+### `sip-sdist` creates PEP 625 compatible file names
+
+The sdists created by `sip-sdist` are now compatible with PEP 625 in that
+they have lower case names. This ensures that they will still be able to
+be uploaded to PyPI.
+
+Resolves [#23](https://github.com/Python-SIP/sip/issues/23)
+
+### Update the minimum version of `setuptools`
+
+The minimum version of `setuptools` used by SIP and by the generated `sip`
+module sdists has been set to v69.5. This is the oldest version that
+supports PEP 625.
+
+Resolves [#55](https://github.com/Python-SIP/sip/issues/55)
+
+### `sip` module sdist `Requires-Python` is incorrect
+
+The minimum Python version in the generated `sip` module metadata is now
+set to v3.9.
+
+Resolves [#56](https://github.com/Python-SIP/sip/issues/56)
+
+
## v6.9.0
### Removal of support for Python v3.8
diff --git a/pyproject.toml b/pyproject.toml
index 1d9fab9..ad22b4a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -12,7 +12,7 @@ name = "sip"
description = "A Python bindings generator for C/C++ libraries"
readme = "README.md"
urls.homepage = "https://github.com/Python-SIP/sip"
-dependencies = ["packaging", "setuptools", "tomli; python_version<'3.11'"]
+dependencies = ["packaging", "setuptools>=69.5", "tomli; python_version<'3.11'"]
requires-python = ">=3.9"
license = {file = "LICENSE"}
classifiers = ["License :: OSI Approved :: BSD License"]
diff --git a/sipbuild/builder.py b/sipbuild/builder.py
index b98dc57..7b0f44b 100644
--- a/sipbuild/builder.py
+++ b/sipbuild/builder.py
@@ -48,7 +48,7 @@ class Builder(AbstractBuilder):
project = self.project
# The sdist name.
- sdist_name = '{}-{}'.format(project.name.replace('-', '_'),
+ sdist_name = '{}-{}'.format(project.name.replace('-', '_').lower(),
project.version_str)
# Create the sdist root directory.
diff --git a/sipbuild/module/module.py b/sipbuild/module/module.py
index ba96abd..99d804e 100644
--- a/sipbuild/module/module.py
+++ b/sipbuild/module/module.py
@@ -8,6 +8,7 @@ import shutil
import subprocess
import sys
+from ..py_versions import MINIMUM_SETUPTOOLS, OLDEST_SUPPORTED_MINOR
from ..version import SIP_VERSION, SIP_VERSION_STR
from .abi_version import (get_module_source_dir, get_sip_module_version,
@@ -110,20 +111,24 @@ def _create_patches(sip_module, abi_major_version, project='',
return {
# The public patches are those that might be needed in setup.cfg or any
# automatically generated user documentation.
- '@SIP_MODULE_FQ_NAME@': sip_module,
- '@SIP_MODULE_PROJECT_NAME@': project,
- '@SIP_MODULE_PACKAGE_NAME@': sip_module_package_name,
- '@SIP_MODULE_VERSION@': get_sip_module_version(
- abi_major_version),
-
- # These are internal to sip.h.
- '@_SIP_MODULE_FQ_NAME@': sip_module,
- '@_SIP_MODULE_NAME@': sip_module_name,
- '@_SIP_MODULE_SHARED@': '1' if sip_module else '0',
- '@_SIP_MODULE_ENTRY@': 'PyInit_' + sip_module_name,
- '@_SIP_MODULE_LEGACY@': "1" if legacy else "0",
- '@_SIP_VERSION@': hex(sip_version),
- '@_SIP_VERSION_STR@': sip_version_str
+ '@SIP_MODULE_FQ_NAME@': sip_module,
+ '@SIP_MODULE_PROJECT_NAME@': project,
+ '@SIP_MODULE_PACKAGE_NAME@': sip_module_package_name,
+ '@SIP_MODULE_VERSION@': get_sip_module_version(
+ abi_major_version),
+
+ # These are internal.
+ '@_SIP_MINIMUM_SETUPTOOLS@': MINIMUM_SETUPTOOLS,
+ '@_SIP_MODULE_FQ_NAME@': sip_module,
+ '@_SIP_MODULE_NAME@': sip_module_name,
+ '@_SIP_MODULE_SHARED@': '1' if sip_module else '0',
+ '@_SIP_MODULE_ENTRY@': 'PyInit_' + sip_module_name,
+ '@_SIP_MODULE_LEGACY@': "1" if legacy else "0",
+ '@_SIP_OLDEST_SUPPORTED_MINOR@': str(OLDEST_SUPPORTED_MINOR),
+ '@_SIP_OLDEST_SUPPORTED_MINOR_HEX@': format(OLDEST_SUPPORTED_MINOR,
+ '02x'),
+ '@_SIP_VERSION@': hex(sip_version),
+ '@_SIP_VERSION_STR@': sip_version_str
}
diff --git a/sipbuild/module/source/12/pyproject.toml b/sipbuild/module/source/12/pyproject.toml
deleted file mode 100644
index 473d2de..0000000
--- a/sipbuild/module/source/12/pyproject.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-[build-system]
-requires = ["setuptools >=30.3", "wheel"]
diff --git a/sipbuild/module/source/12/pyproject.toml.in b/sipbuild/module/source/12/pyproject.toml.in
new file mode 100644
index 0000000..cb43bda
--- /dev/null
+++ b/sipbuild/module/source/12/pyproject.toml.in
@@ -0,0 +1,2 @@
+[build-system]
+requires = ["setuptools >=@_SIP_MINIMUM_SETUPTOOLS@"]
diff --git a/sipbuild/module/source/12/setup.py.in b/sipbuild/module/source/12/setup.py.in
index 7bb71ee..d0557e3 100644
--- a/sipbuild/module/source/12/setup.py.in
+++ b/sipbuild/module/source/12/setup.py.in
@@ -18,6 +18,6 @@ setup(
name='@SIP_MODULE_PROJECT_NAME@',
version='@SIP_MODULE_VERSION@',
license='SIP',
- python_requires='>=3.8',
+ python_requires='>=3. at _SIP_OLDEST_SUPPORTED_MINOR@',
ext_modules=[module]
)
diff --git a/sipbuild/module/source/12/sip.h.in b/sipbuild/module/source/12/sip.h.in
index 4ff7695..8f33579 100644
--- a/sipbuild/module/source/12/sip.h.in
+++ b/sipbuild/module/source/12/sip.h.in
@@ -14,8 +14,8 @@
#include <Python.h>
/* Sanity check on the Python version. */
-#if PY_VERSION_HEX < 0x03090000
-#error "This version of @_SIP_MODULE_FQ_NAME@ requires Python v3.9 or later"
+#if PY_VERSION_HEX < 0x03 at _SIP_OLDEST_SUPPORTED_MINOR_HEX@0000
+#error "This version of @_SIP_MODULE_FQ_NAME@ requires Python v3. at _SIP_OLDEST_SUPPORTED_MINOR@ or later"
#endif
@@ -36,7 +36,7 @@ extern "C" {
/* The version of the ABI. */
#define SIP_ABI_MAJOR_VERSION 12
#define SIP_ABI_MINOR_VERSION 16
-#define SIP_MODULE_PATCH_VERSION 0
+#define SIP_MODULE_PATCH_VERSION 1
/*
diff --git a/sipbuild/module/source/13/pyproject.toml b/sipbuild/module/source/13/pyproject.toml
deleted file mode 100644
index 473d2de..0000000
--- a/sipbuild/module/source/13/pyproject.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-[build-system]
-requires = ["setuptools >=30.3", "wheel"]
diff --git a/sipbuild/module/source/13/pyproject.toml.in b/sipbuild/module/source/13/pyproject.toml.in
new file mode 100644
index 0000000..cb43bda
--- /dev/null
+++ b/sipbuild/module/source/13/pyproject.toml.in
@@ -0,0 +1,2 @@
+[build-system]
+requires = ["setuptools >=@_SIP_MINIMUM_SETUPTOOLS@"]
diff --git a/sipbuild/module/source/13/setup.py.in b/sipbuild/module/source/13/setup.py.in
index 7bb71ee..d0557e3 100644
--- a/sipbuild/module/source/13/setup.py.in
+++ b/sipbuild/module/source/13/setup.py.in
@@ -18,6 +18,6 @@ setup(
name='@SIP_MODULE_PROJECT_NAME@',
version='@SIP_MODULE_VERSION@',
license='SIP',
- python_requires='>=3.8',
+ python_requires='>=3. at _SIP_OLDEST_SUPPORTED_MINOR@',
ext_modules=[module]
)
diff --git a/sipbuild/module/source/13/sip.h.in b/sipbuild/module/source/13/sip.h.in
index 4cfbb24..dd452d9 100644
--- a/sipbuild/module/source/13/sip.h.in
+++ b/sipbuild/module/source/13/sip.h.in
@@ -14,8 +14,8 @@
#include <Python.h>
/* Sanity check on the Python version. */
-#if PY_VERSION_HEX < 0x03090000
-#error "This version of @_SIP_MODULE_FQ_NAME@ requires Python v3.9 or later"
+#if PY_VERSION_HEX < 0x03 at _SIP_OLDEST_SUPPORTED_MINOR_HEX@0000
+#error "This version of @_SIP_MODULE_FQ_NAME@ requires Python v3. at _SIP_OLDEST_SUPPORTED_MINOR@ or later"
#endif
@@ -36,7 +36,7 @@ extern "C" {
/* The version of the ABI. */
#define SIP_ABI_MAJOR_VERSION 13
#define SIP_ABI_MINOR_VERSION 9
-#define SIP_MODULE_PATCH_VERSION 0
+#define SIP_MODULE_PATCH_VERSION 1
/*
diff --git a/sipbuild/py_versions.py b/sipbuild/py_versions.py
index 93b64cd..5e7f325 100644
--- a/sipbuild/py_versions.py
+++ b/sipbuild/py_versions.py
@@ -3,5 +3,11 @@
# Copyright (c) 2024 Phil Thompson <phil at riverbankcomputing.com>
-# The oldest supported minor version of Python v3.
+# The minimum required version of setuptools. This is the earliest version
+# that supports PEP 625. Remember to update pyproject.toml in the root
+# directory.
+MINIMUM_SETUPTOOLS = '69.5'
+
+# The oldest supported minor version of Python v3. Remember to update
+# pyproject.toml in the root directory.
OLDEST_SUPPORTED_MINOR = 9
More information about the Neon-commits
mailing list