[med-svn] [Git][med-team/python-awkward][master] 3 commits: Refresh patches for 2.14.0
Andreas Tille (@tille)
gitlab at salsa.debian.org
Wed Oct 28 21:27:17 GMT 2026
Andreas Tille pushed to branch master at Debian Med / python-awkward
Commits:
459ac2e3 by Andreas Tille at 2026-10-28T20:43:41+01:00
Refresh patches for 2.14.0
drop-importlib-metadata.diff had to be updated for the bumped
awkward_cpp version; also switch it to the usual a/ b/ prefixes.
New scikit-build-core-version.patch: upstream now requires
scikit-build-core >= 1.0, which Debian does not have yet (unstable has
0.12.2). The configuration used here and the build itself need
nothing newer than 0.12.
- - - - -
76ea4d9a by Andreas Tille at 2026-10-28T22:19:01+01:00
Build only for the default Python version
Closes: #1151980
- - - - -
40000f0c by Andreas Tille at 2026-10-28T22:25:34+01:00
Upload to unstable
- - - - -
6 changed files:
- debian/changelog
- debian/control
- debian/patches/drop-importlib-metadata.diff
- + debian/patches/scikit-build-core-version.patch
- debian/patches/series
- + debian/patches/use-python3-in-noxfile.patch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,11 +1,17 @@
-python-awkward (2.14.0-1) UNRELEASED; urgency=medium
+python-awkward (2.14.0-1) unstable; urgency=medium
* Team upload.
- * Use Github template
- * New upstream version
+ * New upstream version 2.14.0
+ * Refresh patches
+ * Build against the packaged scikit-build-core 0.12 instead of the
+ unreleased 1.0
+ * Build for the default Python version only; the build no longer
+ produces two differing copies of the C++ libraries that dh_python3
+ cannot merge (Closes: #1151980)
+ * Call python3 instead of python in noxfile.py
* Set upstream metadata fields: Documentation.
- -- Andreas Tille <tille at debian.org> Wed, 28 Oct 2026 14:02:26 +0100
+ -- Andreas Tille <tille at debian.org> Wed, 28 Oct 2026 22:19:32 +0100
python-awkward (2.12.0-1) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -8,12 +8,11 @@ Build-Depends:
debhelper-compat (= 14),
dh-sequence-python3,
cmake,
- libpython3-all-dev,
nox (>= 2025.2.09~),
pybind11-dev,
pybuild-plugin-pyproject,
- python-is-python3,
- python3-all,
+ python3,
+ python3-dev,
python3-fsspec,
python3-hatch-fancy-pypi-readme,
python3-hatchling,
=====================================
debian/patches/drop-importlib-metadata.diff
=====================================
@@ -10,12 +10,12 @@ Author: Alexandre Detiste <tchet at debian.org>
Forwarded: no
Last-Update: 2026-08-04
---- python-awkward-2.12.0.orig/pyproject.toml
-+++ python-awkward-2.12.0/pyproject.toml
+--- a/pyproject.toml
++++ b/pyproject.toml
@@ -43,7 +43,6 @@ classifiers = [
]
dependencies = [
- "awkward_cpp==55",
+ "awkward_cpp==57",
- "importlib_metadata>=4.13.0;python_version < \"3.12\"",
"numpy>=1.21.3",
"packaging",
=====================================
debian/patches/scikit-build-core-version.patch
=====================================
@@ -0,0 +1,19 @@
+Description: Build with the scikit-build-core available in Debian
+ Upstream requires scikit-build-core >= 1.0, which is not packaged in
+ Debian yet (unstable has 0.12.2). The configuration used by this
+ package and the build itself need nothing newer than 0.12, so relax
+ the requirement so that the package can be built.
+Author: Andreas Tille <tille at debian.org>
+Forwarded: not-needed
+Last-Update: 2026-10-28
+
+--- a/awkward-cpp/pyproject.toml
++++ b/awkward-cpp/pyproject.toml
+@@ -1,6 +1,6 @@
+ [build-system]
+ requires = [
+- "scikit-build-core>=1.0",
++ "scikit-build-core>=0.12",
+ "pybind11>=3",
+ ]
+ build-backend = "scikit_build_core.build"
=====================================
debian/patches/series
=====================================
@@ -1,3 +1,5 @@
no-internet.patch
remove-rapidjson-license-reference.diff
drop-importlib-metadata.diff
+scikit-build-core-version.patch
+use-python3-in-noxfile.patch
=====================================
debian/patches/use-python3-in-noxfile.patch
=====================================
@@ -0,0 +1,64 @@
+Description: Call python3 instead of python in noxfile.py
+ The sessions invoke "python", which only exists if a package such as
+ python-is-python3 is installed. Call "python3" instead so that the
+ build does not need to depend on one of the what-is-python packages.
+Author: Andreas Tille <tille at debian.org>
+Forwarded: not-needed
+Last-Update: 2026-10-28
+
+--- a/noxfile.py
++++ b/noxfile.py
+@@ -98,7 +98,7 @@ def docs(session):
+ shutil.copytree("awkward-cpp/docs/html", "docs/_static/doxygen", dirs_exist_ok=True)
+
+ # Generate kernel documentation
+- session.run("python", "dev/generate-kernel-docs.py")
++ session.run("python3", "dev/generate-kernel-docs.py")
+
+ # Build Sphinx docs
+ with session.chdir("docs"):
+@@ -107,7 +107,7 @@ def docs(session):
+
+ if args.serve:
+ session.log("Launching docs at http://localhost:8000/ - use Ctrl-C to quit")
+- session.run("python", "-m", "http.server", "8000", "-d", "_build/html")
++ session.run("python3", "-m", "http.server", "8000", "-d", "_build/html")
+
+
+ @nox.session(reuse_venv=True)
+@@ -163,13 +163,13 @@ def prepare(session):
+ prepare_all = not session.posargs
+
+ if args.headers or prepare_all:
+- session.run("python", "dev/copy-cpp-headers.py")
++ session.run("python3", "dev/copy-cpp-headers.py")
+ if args.signatures or prepare_all:
+- session.run("python", "dev/generate-kernel-signatures.py")
++ session.run("python3", "dev/generate-kernel-signatures.py")
+ if args.tests or prepare_all:
+- session.run("python", "dev/generate-tests.py")
++ session.run("python3", "dev/generate-tests.py")
+ if args.docs or prepare_all:
+- session.run("python", "dev/generate-kernel-docs.py")
++ session.run("python3", "dev/generate-kernel-docs.py")
+
+
+ @nox.session(reuse_venv=True)
+@@ -178,7 +178,7 @@ def check_cpp_constraint(session):
+ Check that the awkward-cpp version is compatible with awkward.
+ """
+ session.install(*requirements_dev)
+- session.run("python", "dev/check-awkward-uses-awkward-cpp.py")
++ session.run("python3", "dev/check-awkward-uses-awkward-cpp.py")
+
+
+ @nox.session(reuse_venv=True)
+@@ -198,7 +198,7 @@ def diagnostics(session):
+ Check that the CPU kernels are defined correctly.
+ """
+ session.install(*requirements_dev)
+- session.run("python", "dev/kernel-diagnostics.py", *session.posargs)
++ session.run("python3", "dev/kernel-diagnostics.py", *session.posargs)
+
+
+ if __name__ == "__main__":
View it on GitLab: https://salsa.debian.org/med-team/python-awkward/-/compare/97fc1237e1c749006e66a5a720f882682a399935...40000f0c9dd7090ec75fb404b919367e5e1a421f
--
View it on GitLab: https://salsa.debian.org/med-team/python-awkward/-/compare/97fc1237e1c749006e66a5a720f882682a399935...40000f0c9dd7090ec75fb404b919367e5e1a421f
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20261028/d53ff90a/attachment-0001.htm>
More information about the debian-med-commit
mailing list