[med-svn] [Git][python-team/packages/mypy][master] 10 commits: d/rules: add "-Wno-misleading-indentation" as there are too many lines of...

Michael R. Crusoe (@crusoe) gitlab at salsa.debian.org
Sun Aug 18 11:00:24 BST 2024 


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


Commits:
36a69910 by Michael R. Crusoe at 2024-08-15T09:01:57+02:00
d/rules: add "-Wno-misleading-indentation" as there are too many lines of autogenerated code to care about such a thing.

- - - - -
efc06f14 by Michael R. Crusoe at 2024-08-15T14:17:11+02:00
Include snapshot of the sphinx objects from monkeytype.org, updated intersphinx patch to use them to generate valid links to those external docs.

- - - - -
1144da3a by Michael R. Crusoe at 2024-08-15T14:17:12+02:00
Silence many lintian warnings that have been reported upstream

- - - - -
862d70b7 by Michael R. Crusoe at 2024-08-15T14:17:12+02:00
clean up some extra LICENSE files

- - - - -
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

- - - - -
8c841ce7 by Michael R. Crusoe at 2024-08-17T00:39:39+02:00
d/rules: compile with less debugging on i386/x32 to avoid running out of virtual memory.

- - - - -
119cdd81 by Michael R. Crusoe at 2024-08-18T11:56:20+02:00
Upload to unstable.

- - - - -


9 changed files:

- debian/changelog
- debian/control
- debian/copyright
- + debian/intersphinx/monkeytype_objects.inv
- debian/mypy-doc.docs
- debian/patches/intersphinx
- + debian/python3-mypy.lintian-overrides
- debian/rules
- + debian/source/include-binaries


Changes:

=====================================
debian/changelog
=====================================
@@ -1,7 +1,29 @@
-mypy (1.11.1-2) UNRELEASED; urgency=medium
+mypy (1.11.1-2) unstable; urgency=medium
+
+  * Upload to unstable.
+
+ -- Michael R. Crusoe <crusoe at debian.org>  Sun, 18 Aug 2024 11:55:57 +0200
+
+mypy (1.11.1-2~0exp1) experimental; urgency=medium
+
+  * d/rules: compile with less debugging on i386 to avoid running out of
+    virtual memory.
+
+ -- Michael R. Crusoe <crusoe at debian.org>  Fri, 16 Aug 2024 12:46:40 +0200
+
+mypy (1.11.1-2~0exp0) experimental; urgency=medium
 
   * d/patches: cherry-pick 3 patches from upstream to fix a regression
     found in SQLalchemy
+  * d/rules: add "-Wno-misleading-indentation" as there are too many
+    lines of autogenerated code to care about such a thing.
+  * Include snapshot of the sphinx objects from monkeytype.org, updated
+    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/copyright
=====================================
@@ -6,6 +6,39 @@ Files: *
 Copyright: © 2015-2016 Jukka Lehtosalo and contributors
 License: Expat
 
+Files: mypy/typeshed/*
+Copyright: (c) 2015 Jukka Lehtosalo and contributors
+License: Apache-2.0
+
+Files: mypyc/external/googletest/*
+Copyright: 2005-2009, 2015 Google Inc.
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+     * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following disclaimer
+ in the documentation and/or other materials provided with the
+ distribution.
+     * Neither the name of Google Inc. nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 Files: debian/*
 Copyright: © 2016-2022 Michael R. Crusoe <crusoe at debian.org>
 License: Expat
@@ -28,3 +61,19 @@ License: Expat
  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  DEALINGS IN THE SOFTWARE.
+
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+    http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems you can find a copy of the Apache license version
+ 2.0 at /usr/share/common-licenses/Apache-2.0.


=====================================
debian/intersphinx/monkeytype_objects.inv
=====================================
Binary files /dev/null and b/debian/intersphinx/monkeytype_objects.inv differ


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


=====================================
debian/patches/intersphinx
=====================================
@@ -7,22 +7,24 @@ Forwarded: not-needed
  docs/source/conf.py | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
-diff --git a/docs/source/conf.py b/docs/source/conf.py
-index fa76734..3057f4f 100644
---- a/docs/source/conf.py
-+++ b/docs/source/conf.py
-@@ -265,11 +265,11 @@ texinfo_documents = [
+--- mypy.orig/docs/source/conf.py
++++ mypy/docs/source/conf.py
+@@ -265,11 +265,14 @@
  rst_prolog = ".. |...| unicode:: U+2026   .. ellipsis\n"
  
  intersphinx_mapping = {
 -    "python": ("https://docs.python.org/3", None),
 -    "attrs": ("https://www.attrs.org/en/stable/", None),
 -    "cython": ("https://docs.cython.org/en/latest", None),
+-    "monkeytype": ("https://monkeytype.readthedocs.io/en/latest", None),
+-    "setuptools": ("https://setuptools.readthedocs.io/en/latest", None),
 +    "python": ("/usr/share/doc/python3/html/", None),
 +    "attrs": ("/usr/share/doc/python-attr-doc/html/", None),
 +    "cython": ("/usr/share/doc/cython3/html/", None),
-     "monkeytype": ("https://monkeytype.readthedocs.io/en/latest", None),
--    "setuptools": ("https://setuptools.readthedocs.io/en/latest", None),
++    "monkeytype": (
++        "https://monkeytype.readthedocs.io/en/latest",
++        "../../debian/intersphinx/monkeytype_objects.inv"
++    ),
 +    "setuptools": ("/usr/share/doc/python-setuptools-doc/html/", None),
  }
  


=====================================
debian/python3-mypy.lintian-overrides
=====================================
@@ -0,0 +1,3 @@
+# https://github.com/mypyc/mypyc/issues/704
+python3-mypy: shared-library-lacks-prerequisites [usr/lib/python3/dist-packages/mypy/*.so]
+python3-mypy: shared-library-lacks-prerequisites [usr/lib/python3/dist-packages/mypyc/*.so]


=====================================
debian/rules
=====================================
@@ -5,22 +5,27 @@ 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
 
-ifneq (,$(filter $(DEB_BUILD_ARCH),armel armhf hppa riscv64 mipsel alpha ia64 m68k powerpc sh4 sparc64))
+ifneq (,$(filter $(DEB_HOST_ARCH),armel armhf hppa riscv64 mipsel alpha ia64 m68k powerpc sh4 sparc64))
   export MYPYC_MULTI_FILE=1
 endif
 ifneq (,$(filter $(DEB_HOST_ARCH),mips64el))
   export DEB_CFLAGS_MAINT_APPEND += -mxgot
 endif
 
+export DEB_CFLAGS_MAINT_APPEND += -Wno-misleading-indentation
+
+ifneq (,$(filter $(DEB_HOST_ARCH),i386 x32))
+  export MYPYC_DEBUG_LEVEL=1
+else
+  export MYPYC_DEBUG_LEVEL=2
+endif
+
 %:
-	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
@@ -48,23 +53,28 @@ 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)))
@@ -86,4 +96,7 @@ endif
 override_dh_auto_test-indep:
 	echo No tests to run for the "mypy" package, only for "python3-mypy"
 
+download_remote_intersphinx_inventories:
+	curl https://monkeytype.readthedocs.io/en/latest/objects.inv -o debian/intersphinx/monkeytype_objects.inv
+
 .PHONY: manpages


=====================================
debian/source/include-binaries
=====================================
@@ -0,0 +1,2 @@
+# regenerate with "debian/rules download_remote_intersphinx_inventories"
+debian/intersphinx/monkeytype_objects.inv



View it on GitLab: https://salsa.debian.org/python-team/packages/mypy/-/compare/f07cec31fe205ea923882096b0b5a677d4ffde65...119cdd810804cc634693444227a341a24bf9fce1

-- 
View it on GitLab: https://salsa.debian.org/python-team/packages/mypy/-/compare/f07cec31fe205ea923882096b0b5a677d4ffde65...119cdd810804cc634693444227a341a24bf9fce1
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/20240818/60097e33/attachment-0001.htm>

More information about the debian-med-commit mailing list