summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2022-02-16 18:06:34 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2022-02-16 18:06:34 +0000
commit3eaf1493c5d5d12bff92328972860b0e1a912316 (patch)
tree0ac5930a9c565336708be1e263fcc2af59545da0
parentMerging upstream version 1.2.2. (diff)
downloadpython-tomli-3eaf1493c5d5d12bff92328972860b0e1a912316.tar.xz
python-tomli-3eaf1493c5d5d12bff92328972860b0e1a912316.zip
Merging debian version 1.2.2-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog9
-rw-r--r--debian/patches/flit_pre_3.22
-rwxr-xr-xdebian/rules10
-rw-r--r--debian/watch2
4 files changed, 12 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog
index e0dea1a..5368a0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+python-tomli (1.2.2-1) unstable; urgency=medium
+
+ * debian/rules: #969352 and #994281 are fixed, remove workarounds. Closes: #997534
+ * debian/watch: check the tags to find the latest version
+ * New upstream version
+ * Freshen debian/patches/flit_pre_3.2
+
+ -- Michael R. Crusoe <crusoe@debian.org> Sun, 07 Nov 2021 16:14:07 +0100
+
python-tomli (1.2.1-1~progress6+u1) fuchur-backports; urgency=medium
* Initial upload to fuchur-backports.
diff --git a/debian/patches/flit_pre_3.2 b/debian/patches/flit_pre_3.2
index c824690..7975afd 100644
--- a/debian/patches/flit_pre_3.2
+++ b/debian/patches/flit_pre_3.2
@@ -10,7 +10,7 @@ To be removed once flit >= 3.2 is in the archive https://bugs.debian.org/994589
-[project]
-name = "tomli"
--version = "1.2.1" # DO NOT EDIT THIS LINE MANUALLY. LET bump2version UTILITY DO IT
+-version = "1.2.2" # DO NOT EDIT THIS LINE MANUALLY. LET bump2version UTILITY DO IT
-description = "A lil' TOML parser"
-authors = [
- { name = "Taneli Hukkinen", email = "hukkin@users.noreply.github.com" },
diff --git a/debian/rules b/debian/rules
index ba9e9fe..0c03ba1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,15 +4,7 @@
export LC_ALL=C.UTF-8
export PYBUILD_SYSTEM=flit
export PYBUILD_TEST_PYTEST=1
-export PYBUILD_TEST_ARGS=python{version} -m pytest -n auto -k "not test_own_pyproject"
-export PYBUILD_AFTER_INSTALL=rm {destdir}/usr/lib/python{version}/dist-packages/tomli-*dist-info/direct_url.json
-# ^ is due to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=969352
+export PYBUILD_TEST_ARGS=-n auto -k "not test_own_pyproject" {dir}/tests
%:
dh $@ --with python3 --buildsystem pybuild
-
-override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
- PYBUILD_SYSTEM=custom pybuild --test
-endif
-# due to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=994281
diff --git a/debian/watch b/debian/watch
index 8ceba09..be0b700 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
version=4
opts="filenamemangle=s%(?:.*?)?(\d[\d.]*)\.tar\.gz%@python-tomli-$1.tar.gz%" \
- https://github.com/hukkin/tomli/releases .*/archive/refs/tags/@ANY_VERSION@\.tar\.gz
+ https://github.com/hukkin/tomli/tags .*/refs/tags/@ANY_VERSION@\.tar\.gz