[med-svn] [Git][med-team/mypy][master] moved from rst2man to sphinx-build

[Étienne Mollier]

Étienne Mollier pushed to branch master at Debian Med / mypy


Commits:
9f0c1126 by Étienne Mollier at 2020-04-06T22:28:45+02:00
moved from rst2man to sphinx-build

To address #952757, Debian packaging now makes use of sphinx-build,
as upstream does.  Debian specific RST pages are moved into sphinx/
because the tool does not accept having the same directory as
source and build target.  Title and author definition moved from
RST files to sphinx/conf.py.

- - - - -


6 changed files:

- debian/rules
- + debian/sphinx/conf.py
- debian/dmypy.rst → debian/sphinx/dmypy.rst
- + debian/sphinx/index.rst
- debian/mypy.rst → debian/sphinx/mypy.rst
- debian/stubgen.rst → debian/sphinx/stubgen.rst


Changes:

=====================================
debian/rules
=====================================
@@ -29,17 +29,17 @@ else
 manpages:
 endif
 
-debian/%.1: debian/%.rst debian/%_options.rst
-	rst2man $< > $@
+debian/%.1: debian/sphinx/%.rst debian/sphinx/%_options.rst
+	sphinx-build -N -b man debian/sphinx debian $<
 
 # create an empty file to simplify the makefile logic
-debian/dmypy_options.rst:
+debian/sphinx/dmypy_options.rst:
 	touch $@
 
-debian/mypy_options.rst: docs/source/command_line.rst
+debian/sphinx/mypy_options.rst: docs/source/command_line.rst
 	sed 's,The .* command line,OPTIONS,g' $< > $@
 
-debian/stubgen_options.rst: docs/source/stubgen.rst
+debian/sphinx/stubgen_options.rst: docs/source/stubgen.rst
 	sed -n -e '/stubgen --help/,$$ {/stubgen --help/d; p}' $< > $@
 
 override_dh_auto_build: manpages
@@ -56,6 +56,10 @@ override_dh_auto_clean:
 	dh_auto_clean
 ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)))
 	$(MAKE) -C docs 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:


=====================================
debian/sphinx/conf.py
=====================================
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+project = 'Mypy'
+author = 'Jukka Lehtosalo and contributors'
+master_doc = 'index'
+source_suffix = '.rst'
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    ('mypy', 'mypy',
+     u'Optional static typing for Python',
+     [author], 1),
+    ('dmypy', 'dmypy',
+     u'mypy daemon mode client',
+     [author], 1),
+    ('stubgen', 'stubgen',
+     u'Generate draft type hint stubs for Python modules',
+     [author], 1)
+]


=====================================
debian/dmypy.rst → debian/sphinx/dmypy.rst
=====================================
@@ -2,13 +2,6 @@
 dmypy
 =====
 
------------------------
-mypy daemon mode client
------------------------
-
-:Author: Jukka Lehtosalo and contributors
-:Manual section: 1
-
 SYNOPSIS
 ========
 


=====================================
debian/sphinx/index.rst
=====================================
@@ -0,0 +1,2 @@
+.. toctree::
+   :maxdepth: 2


=====================================
debian/mypy.rst → debian/sphinx/mypy.rst
=====================================
@@ -2,13 +2,6 @@
 mypy
 ====
 
----------------------------------
-Optional static typing for Python
----------------------------------
-
-:Author: Jukka Lehtosalo and contributors
-:Manual section: 1
-
 SYNOPSIS
 ========
 


=====================================
debian/stubgen.rst → debian/sphinx/stubgen.rst
=====================================
@@ -2,13 +2,6 @@
 stubgen
 =======
 
--------------------------------------------------
-Generate draft type hint stubs for Python modules
--------------------------------------------------
-
-:Author: Jukka Lehtosalo and contributors
-:Manual section: 1
-
 SYNOPSIS
 ========
 



View it on GitLab: https://salsa.debian.org/med-team/mypy/-/commit/9f0c11265c00c30adbc31bf7888a817e12acb69c

-- 
View it on GitLab: https://salsa.debian.org/med-team/mypy/-/commit/9f0c11265c00c30adbc31bf7888a817e12acb69c
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/20200406/602a96cb/attachment-0001.html>