[med-svn] [Git][med-team/pydicom][master] 5 commits: Do not hack around sphinx. This is an issue w/ sphinx-gallery which has been fixed in latest upload

[Nilesh Patra (@nilesh)]

Nilesh Patra pushed to branch master at Debian Med / pydicom


Commits:
055717d2 by Nilesh Patra at 2024-01-26T15:56:02+05:30
Do not hack around sphinx. This is an issue w/ sphinx-gallery which has been fixed in latest upload

- - - - -
9ad448bd by Nilesh Patra at 2024-01-26T16:25:16+05:30
Properly copy tests dir during build

- - - - -
51ccaaf8 by Nilesh Patra at 2024-01-26T17:22:51+05:30
Run tests after install step

- - - - -
3030db7d by Nilesh Patra at 2024-01-26T17:38:43+05:30
d/clean: Cleanup generated docs

- - - - -
590d8dfe by Nilesh Patra at 2024-01-26T17:38:51+05:30
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- + debian/clean
- debian/control
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,5 +1,6 @@
-pydicom (2.4.3-1) UNRELEASED; urgency=medium
+pydicom (2.4.3-1) unstable; urgency=medium
 
+  [ Andreas Tille ]
   * Team upload.
   * New upstream version
   * Drop transitional package python3-dicom
@@ -11,7 +12,14 @@ pydicom (2.4.3-1) UNRELEASED; urgency=medium
     python3-mpl-sphinx-theme, python3-scipy
   * Hack around strange error of sphinx by simply ignoring it
 
- -- Andreas Tille <tille at debian.org>  Wed, 16 Aug 2023 10:34:49 +0200
+  [ Nilesh Patra ]
+  * Add versioned Builddep against sphinx-gallery to fixup sphinx 7.2 issues
+    Closes: #1042612
+  * Properly copy tests dir during build
+  * Run tests after install step
+  * d/clean: Cleanup generated docs
+
+ -- Nilesh Patra <nilesh at debian.org>  Fri, 26 Jan 2024 17:38:13 +0530
 
 pydicom (2.3.1-1) unstable; urgency=medium
 


=====================================
debian/clean
=====================================
@@ -0,0 +1,5 @@
+doc/build/
+doc/generated/
+doc/auto_examples/
+doc/reference/generated/
+pydicom.egg-info/


=====================================
debian/control
=====================================
@@ -15,7 +15,7 @@ Build-Depends: debhelper-compat (= 13),
                python3-docutils,
                python3-pil,
                python3-sphinx,
-               python3-sphinx-gallery,
+               python3-sphinx-gallery (>= 0.10.1-4~),
                python3-sphinx-rtd-theme,
                python3-sphinx-issues,
                python3-sphinx-copybutton,


=====================================
debian/rules
=====================================
@@ -8,16 +8,26 @@ PYS = $(shell pyversions -r)
 export  http_proxy=http://127.0.0.1:9/
 export  https_proxy=http://127.0.0.1:9/
 
+# Copy the test package, as it is inside the root package (pydicom/tests).
+export PYBUILD_BEFORE_TEST=cp -r {dir}/pydicom/tests {build_dir}/pydicom
+# Cleanup the test package after dh_auto_test has run
+export PYBUILD_AFTER_TEST=rm -r {build_dir}/pydicom/tests
+
 %:
 	dh $@ --buildsystem=pybuild --with python3,sphinxdoc
 
 override_dh_auto_build:
 	dh_auto_build
-	cd doc; PYTHONPATH=.. python3 /usr/bin/sphinx-build -N -bhtml . build/html || true # FIXME: This ends in some error, but the doc seems OK so far
+	cd doc; PYTHONPATH=.. python3 /usr/bin/sphinx-build -N -bhtml . build/html
+
+override_dh_auto_test:
 
 override_dh_auto_install:
 	-find -name __pycache__ | xargs rm -r
 	dh_auto_install
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	dh_auto_test
+endif
 
 override_dh_clean:
 	dh_clean



View it on GitLab: https://salsa.debian.org/med-team/pydicom/-/compare/397bb810563ff0d604522d5411c57e5b69adb517...590d8dfe91cd0c26d957689d2d154402f01b8ffd

-- 
View it on GitLab: https://salsa.debian.org/med-team/pydicom/-/compare/397bb810563ff0d604522d5411c57e5b69adb517...590d8dfe91cd0c26d957689d2d154402f01b8ffd
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20240126/e500be2b/attachment-0001.htm>