[med-svn] [Git][med-team/pydicom][upstream] New upstream version 2.4.4

[Andreas Tille (@tille)]

Andreas Tille pushed to branch upstream at Debian Med / pydicom


Commits:
d249a95a by Andreas Tille at 2024-01-26T10:47:03+01:00
New upstream version 2.4.4
- - - - -


5 changed files:

- doc/Makefile
- + doc/fix_search.py
- doc/make.bat
- pydicom/_version.py
- pyproject.toml


Changes:

=====================================
doc/Makefile
=====================================
@@ -59,6 +59,7 @@ html:
 	rm -rf $(BUILDDIR)/html/_images
 	#rm -rf _build/doctrees/
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	python3 fix_search.py  # TODO remove when sphinx_rtd_theme fixes upstream
 	touch $(BUILDDIR)/html/.nojekyll
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."


=====================================
doc/fix_search.py
=====================================
@@ -0,0 +1,22 @@
+"""
+A temporary fix for https://github.com/pydicom/pydicom/issues/1965
+while waiting for upstream sphinx_rtd_theme to fix/remove their
+dependency on jQuery.
+"""
+from pathlib import Path
+import re
+
+
+search_html = Path("./_build/html/search.html")
+assert search_html.exists()
+
+with open(search_html) as fp:
+    html = fp.read()
+
+pat = r"(<script>\s+jQuery.+searchindex\.js.+\s+<\/script>)"
+repl = r'<script src="searchindex.js" defer></script>'
+# re.findall(pat, html)
+html_fixed = re.sub(pat, repl, html)
+
+with open(search_html, "w") as fp:
+    fp.write(html_fixed)


=====================================
doc/make.bat
=====================================
@@ -35,6 +35,8 @@ if "%1" == "clean" (
 
 if "%1" == "html" (
 	%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
+	REM TODO remove when sphinx_rtd_theme fixes upstream
+	python fix_search.py
 	echo.
 	echo.Build finished. The HTML pages are in %BUILDDIR%/html.
 	goto end


=====================================
pydicom/_version.py
=====================================
@@ -3,7 +3,7 @@ import re
 from typing import cast, Match
 
 
-__version__: str = '2.4.2'
+__version__: str = '2.4.4'
 
 result = cast(Match[str], re.match(r'(\d+\.\d+\.\d+).*', __version__))
 __version_info__ = tuple(result.group(1).split('.'))


=====================================
pyproject.toml
=====================================
@@ -35,7 +35,7 @@ license = {text = "MIT"}
 name = "pydicom"
 readme = "README.md"
 requires-python = ">=3.7"
-version = "2.4.3"
+version = "2.4.4"
 
 
 [project.optional-dependencies]



View it on GitLab: https://salsa.debian.org/med-team/pydicom/-/commit/d249a95aad598453495da84d21d57c894cd248a7

-- 
View it on GitLab: https://salsa.debian.org/med-team/pydicom/-/commit/d249a95aad598453495da84d21d57c894cd248a7
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/e5ed10ca/attachment-0001.htm>