summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorThomas Goirand <zigo@debian.org>2025-12-07 11:04:47 +0100
committergit-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com>2025-12-07 16:35:23 +0000
commite1382cd7613c6dbe93264dd6931097f0efec4184 (patch)
tree0ffe7152877ea052938d564132ee4cd8e056207b /debian
parent1831634ad8e5a95c13746787a4076881f61f39c1 (diff)
1.1.2-1 (patches unapplied)import/1.1.2-1
Imported using git-ubuntu import.
Notes
Notes: * New upstream release: - Add pybuild-plugin-pyproject as build-depends. - Let pybuild handle install and tests. - Run "python3 setup.py build_ext -i -f" when building. - fixes building C extension (Closes: #1122009). * Removed Use-PyFloat_Pack8-on-Python-3.11a7-499.patch applied upstream.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog11
-rw-r--r--debian/control3
-rw-r--r--debian/patches/Use-PyFloat_Pack8-on-Python-3.11a7-499.patch69
-rw-r--r--debian/patches/series1
-rwxr-xr-xdebian/rules16
-rw-r--r--debian/tests/control13
6 files changed, 28 insertions, 85 deletions
diff --git a/debian/changelog b/debian/changelog
index 84be19a..3a1e397 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+python-msgpack (1.1.2-1) unstable; urgency=medium
+
+ * New upstream release:
+ - Add pybuild-plugin-pyproject as build-depends.
+ - Let pybuild handle install and tests.
+ - Run "python3 setup.py build_ext -i -f" when building.
+ - fixes building C extension (Closes: #1122009).
+ * Removed Use-PyFloat_Pack8-on-Python-3.11a7-499.patch applied upstream.
+
+ -- Thomas Goirand <zigo@debian.org> Sun, 07 Dec 2025 11:04:47 +0100
+
python-msgpack (1.0.3-3) unstable; urgency=medium
* Add extend-diff-ignore for the egg-info (Closes: #1045716).
diff --git a/debian/control b/debian/control
index 1b6be37..b2e94a6 100644
--- a/debian/control
+++ b/debian/control
@@ -6,10 +6,11 @@ Uploaders:
Robert S. Edmonds <edmonds@debian.org>,
Thomas Goirand <zigo@debian.org>,
Build-Depends:
- cython3,
debhelper-compat (= 12),
dh-python,
+ cython3,
openstack-pkg-tools,
+ pybuild-plugin-pyproject,
python3-all-dev,
python3-pytest,
python3-setuptools,
diff --git a/debian/patches/Use-PyFloat_Pack8-on-Python-3.11a7-499.patch b/debian/patches/Use-PyFloat_Pack8-on-Python-3.11a7-499.patch
deleted file mode 100644
index e68c906..0000000
--- a/debian/patches/Use-PyFloat_Pack8-on-Python-3.11a7-499.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Description: Use PyFloat_Pack8() on Python 3.11a7 (#499)
- Python 3.11a7 adds public functions:
- * PyFloat_Pack4(), PyFloat_Pack8()
- * PyFloat_Unpack4(), PyFloat_Unpack8()
- https://bugs.python.org/issue46906
-Author: Victor Stinner <vstinner@python.org>
-Date: Mon, 14 Mar 2022 03:23:11 +0100
-Origin: upstream, https://github.com/msgpack/msgpack-python/commit/849c8063817894f7dba166a19fbdbb9ffd8c2b80.patch
-Last-Update: 2022-11-20
-
-diff --git a/msgpack/pack_template.h b/msgpack/pack_template.h
-index 0e940b8..7d479b6 100644
---- a/msgpack/pack_template.h
-+++ b/msgpack/pack_template.h
-@@ -568,7 +568,12 @@ static inline int msgpack_pack_float(msgpack_packer* x, float d)
- {
- unsigned char buf[5];
- buf[0] = 0xca;
-+
-+#if PY_VERSION_HEX >= 0x030B00A7
-+ PyFloat_Pack4(d, (char *)&buf[1], 0);
-+#else
- _PyFloat_Pack4(d, &buf[1], 0);
-+#endif
- msgpack_pack_append_buffer(x, buf, 5);
- }
-
-@@ -576,7 +581,11 @@ static inline int msgpack_pack_double(msgpack_packer* x, double d)
- {
- unsigned char buf[9];
- buf[0] = 0xcb;
-+#if PY_VERSION_HEX >= 0x030B00A7
-+ PyFloat_Pack8(d, (char *)&buf[1], 0);
-+#else
- _PyFloat_Pack8(d, &buf[1], 0);
-+#endif
- msgpack_pack_append_buffer(x, buf, 9);
- }
-
-diff --git a/msgpack/unpack_template.h b/msgpack/unpack_template.h
-index 9924b9c..8b9fcc1 100644
---- a/msgpack/unpack_template.h
-+++ b/msgpack/unpack_template.h
-@@ -243,10 +243,20 @@ static inline int unpack_execute(unpack_context* ctx, const char* data, Py_ssize
- _msgpack_load32(uint32_t,n)+1,
- _ext_zero);
- case CS_FLOAT: {
-- double f = _PyFloat_Unpack4((unsigned char*)n, 0);
-+ double f;
-+#if PY_VERSION_HEX >= 0x030B00A7
-+ f = PyFloat_Unpack4((const char*)n, 0);
-+#else
-+ f = _PyFloat_Unpack4((unsigned char*)n, 0);
-+#endif
- push_fixed_value(_float, f); }
- case CS_DOUBLE: {
-- double f = _PyFloat_Unpack8((unsigned char*)n, 0);
-+ double f;
-+#if PY_VERSION_HEX >= 0x030B00A7
-+ f = PyFloat_Unpack8((const char*)n, 0);
-+#else
-+ f = _PyFloat_Unpack8((unsigned char*)n, 0);
-+#endif
- push_fixed_value(_double, f); }
- case CS_UINT_8:
- push_fixed_value(_uint8, *(uint8_t*)n);
---
-2.30.2
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 2c341d0..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-Use-PyFloat_Pack8-on-Python-3.11a7-499.patch
diff --git a/debian/rules b/debian/rules
index 2f220ed..a29beac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,23 +5,19 @@ include /usr/share/openstack-pkg-tools/pkgos.make
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export PYBUILD_TEST_ARGS= -v
+
%:
dh $@ --buildsystem=pybuild --with python3
-override_dh_auto_install:
- pkgos-dh_auto_install --no-py2
+override_dh_auto_build:
+ cython3 msgpack/_cmsgpack.pyx
+ dh_auto_build
override_dh_python3:
dh_python3 --shebang=/usr/bin/python3
-override_dh_auto_test:
-ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
- set -e ; for pyvers in $(PYTHON3S); do \
- python$$pyvers -m pytest test ; \
- done
-endif
-
override_dh_clean:
- dh_clean -O--buildsystem=pybuild
+ dh_clean
rm -rf build
rm -f msgpack/_cmsgpack.cpp
diff --git a/debian/tests/control b/debian/tests/control
index 0658286..50a43c7 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -2,10 +2,15 @@ Test-Command: set -e ; for py in $(py3versions -r 2>/dev/null) ; do cd "$AUTOPKG
Depends:
python3-all,
python3-msgpack,
-Restrictions: allow-stderr, superficial
-Features: test-name=python3
+Restrictions:
+ allow-stderr,
+ superficial,
+Features:
+ test-name=python3,
-Tests: unittests
+Tests:
+ unittests,
Depends:
@builddeps@,
-Restrictions: allow-stderr
+Restrictions:
+ allow-stderr,
generated by cgit v1.2.3 (git 2.25.1) at 2026-07-14 03:41:11 +0000