[med-svn] [Git][python-team/packages/mypy][debian/experimental] 4 commits: Also build the mypyc docs

[Michael R. Crusoe (@crusoe)]

Michael R. Crusoe pushed to branch debian/experimental at Debian Python Team / packages / mypy


Commits:
a4d9b2bd by Michael R. Crusoe at 2024-08-15T16:35:42+02:00
Also build the mypyc docs

- - - - -
38353206 by Michael R. Crusoe at 2024-08-15T16:35:42+02:00
d/rules: compile with a normal debugging level: -g2

- - - - -
123b754a by Michael R. Crusoe at 2024-08-15T16:35:42+02:00
Simplify the nodoc logic

- - - - -
1179f1bb by Michael R. Crusoe at 2024-08-15T16:35:42+02:00
upload to experimental

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/mypy-doc.docs
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-mypy (1.11.1-2) UNRELEASED; urgency=medium
+mypy (1.11.1-2~0exp0) experimental; urgency=medium
 
   * d/patches: cherry-pick 3 patches from upstream to fix a regression
     found in SQLalchemy
@@ -8,6 +8,9 @@ mypy (1.11.1-2) UNRELEASED; urgency=medium
     intersphinx patch to use them to generate valid links to those external
     docs.
   * Silence many lintian warnings that have been reported upstream
+  * Also build the mypyc docs
+  * d/rules: compile with a normal debugging level: -g2
+  * Simplify the nodoc logic
 
  -- Michael R. Crusoe <crusoe at debian.org>  Wed, 14 Aug 2024 15:51:13 +0200
 


=====================================
debian/control
=====================================
@@ -6,6 +6,7 @@ Testsuite: autopkgtest-pkg-python
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
                dh-sequence-python3,
+               dh-sequence-sphinxdoc <!nodoc>,
                python3-setuptools,
                pybuild-plugin-pyproject,
                python3-wheel,


=====================================
debian/mypy-doc.docs
=====================================
@@ -1 +1,2 @@
 docs/build/html
+mypyc/doc/_build/mypyc


=====================================
debian/rules
=====================================
@@ -5,9 +5,6 @@ export PYBUILD_NAME=mypy
 PY3VERS=$(shell py3versions -vr)
 
 include /usr/share/dpkg/pkg-info.mk
-ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)))
-	WITH += --with sphinxdoc
-endif
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 include /usr/share/dpkg/default.mk
@@ -20,9 +17,10 @@ ifneq (,$(filter $(DEB_HOST_ARCH),mips64el))
 endif
 
 export DEB_CFLAGS_MAINT_APPEND += -Wno-misleading-indentation
+export MYPYC_DEBUG_LEVEL=2
 
 %:
-	dh $@ $(WITH) --buildsystem=pybuild
+	dh $@  --buildsystem=pybuild
 
 ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)))
 manpages: debian/sphinx/mypy_options.rst debian/sphinx/stubgen_options.rst debian/dmypy.1 debian/mypy.1 debian/stubgen.1
@@ -50,25 +48,29 @@ override_dh_auto_build-indep: manpages
 	MYPY_USE_MYPYC=0 dh_auto_build
 ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)))
 	PYTHONPATH=$(CURDIR) $(MAKE) -C docs html
+	PYTHONPATH=$(CURDIR) $(MAKE) -C mypyc/doc html
+	mv mypyc/doc/_build/html mypyc/doc/_build/mypyc
 endif
 
 
-override_dh_auto_clean:
-	dh_auto_clean
+execute_after_dh_auto_clean:
 ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)))
 	$(MAKE) -C docs clean
+	$(MAKE) -C mypyc/doc clean
 	rm -rf debian/.doctrees
 	rm -f  debian/sphinx/dmypy_options.rst
 	rm -f  debian/sphinx/mypy_options.rst
 	rm -f  debian/sphinx/stubgen_options.rst
 endif
 
-override_dh_auto_install:
-	dh_auto_install
+execute_after_dh_auto_install:
 	dh_movefiles --package=mypy --sourcedir=debian/python3-mypy usr/bin
 	rm -Rf debian/python3-mypy/usr/bin
 	find debian -name LICENSE -delete
 
+execute_after_dh_python3:
+	rm -rf debian/python3-mypy/usr/lib/python3/dist-packages/mypyc/doc/
+
 override_dh_auto_test-arch:
 ifeq (,$(filter nocheck,$(DEB_BUILD_PROFILES)))
 	export TEST_MYPYC=1



View it on GitLab: https://salsa.debian.org/python-team/packages/mypy/-/compare/90667812de11044987dd41ce1009c2e72f8d5935...1179f1bbfff0d641c1a2377c80a2380482b4442e

-- 
View it on GitLab: https://salsa.debian.org/python-team/packages/mypy/-/compare/90667812de11044987dd41ce1009c2e72f8d5935...1179f1bbfff0d641c1a2377c80a2380482b4442e
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/20240816/63c56e05/attachment-0001.htm>