[med-svn] [Git][med-team/mypy][master] 4 commits: skip known failing tests on 32-bit systems.

Tue Sep 21 16:49:01 BST 2021


Michael R. Crusoe pushed to branch master at Debian Med / mypy


Commits:
3b5a7cb5 by Michael R. Crusoe at 2021-09-21T15:01:05+02:00
skip known failing tests on 32-bit systems.

- - - - -
0ee41c36 by Michael R. Crusoe at 2021-09-21T17:06:25+02:00
link docs

- - - - -
1c80a28c by Michael R. Crusoe at 2021-09-21T17:06:56+02:00
split -arch and -indep

- - - - -
9d86d49c by Michael R. Crusoe at 2021-09-21T17:07:23+02:00
routine-update: Ready to upload to unstable

- - - - -


8 changed files:

- debian/changelog
- debian/control
- + debian/patches/intersphinx
- − debian/patches/older_pytest
- debian/patches/series
- debian/patches/verbose
- debian/rules
- debian/tests/run-unit-test


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+mypy (0.910-2) unstable; urgency=medium
+
+  * skip known failing tests on 32-bit systems.
+  * -docs: link to the relevant Debian -doc packages
+  * indep builds now skip compiling mypy
+
+ -- Michael R. Crusoe <crusoe at debian.org>  Tue, 21 Sep 2021 17:07:23 +0200
+
 mypy (0.910-1) unstable; urgency=medium
 
   * New upstream version


=====================================
debian/control
=====================================
@@ -23,7 +23,12 @@ Build-Depends: debhelper-compat (= 13),
                python3-mypy-extensions,
                python3-typing-extensions,
                python3-virtualenv <!nocheck>,
-               python3-all-dev
+               python3-all-dev,
+               python3-doc <!nodoc>,
+               cython-doc <!nodoc>,
+               python-six-doc <!nodoc>,
+               python-setuptools-doc <!nodoc>,
+               python-attr-doc <!nodoc>
 Standards-Version: 4.6.0
 Vcs-Browser: https://salsa.debian.org/med-team/mypy
 Vcs-Git: https://salsa.debian.org/med-team/mypy.git
@@ -52,6 +57,11 @@ Architecture: all
 Section: doc
 Depends: ${misc:Depends},
          ${sphinxdoc:Depends}
+Suggests: python3-doc,
+          cython-doc,
+          python-six-doc,
+          python-setuptools-doc,
+          python-attr-doc
 Built-Using: ${sphinxdoc:Built-Using}
 Description: documentation for mypy
  Add type annotations to your Python programs, and use mypy to type check them.


=====================================
debian/patches/intersphinx
=====================================
@@ -0,0 +1,23 @@
+Author: Michael R. Crusoe <crusoe at debian.org>
+Description: link to local documenatin
+Forwarded: not-needed
+--- mypy.orig/docs/source/conf.py
++++ mypy/docs/source/conf.py
+@@ -271,12 +271,12 @@
+ rst_prolog = '.. |...| unicode:: U+2026   .. ellipsis\n'
+ 
+ intersphinx_mapping = {
+-    'python': ('https://docs.python.org/3', None),
+-    'six': ('https://six.readthedocs.io', None),
+-    'attrs': ('http://www.attrs.org/en/stable', None),
+-    'cython': ('http://docs.cython.org/en/latest', None),
++    'python': ('https://docs.python.org/3', f'/usr/share/doc/python{sys.version_info.major}.{sys.version_info.minor}/html/objects.inv'),
++    'six': ('https://six.readthedocs.io', '/usr/share/doc/python-six/html/objects.inv'),
++    'attrs': ('http://www.attrs.org/en/stable', '/usr/share/doc/python-attr-doc/html/objects.inv'),
++    'cython': ('http://docs.cython.org/en/latest', '/usr/share/doc/cython-doc/html/objects.inv'),
+     'monkeytype': ('https://monkeytype.readthedocs.io/en/latest', None),
+-    'setuptools': ('https://setuptools.readthedocs.io/en/latest', None),
++    'setuptools': ('https://setuptools.readthedocs.io/en/latest', '/usr/share/doc/python-setuptools-doc/html/objects.inv'),
+ }
+ 
+ 


=====================================
debian/patches/older_pytest deleted
=====================================
@@ -1,12 +0,0 @@
-Author: Michael R. Crusoe <crusoe at debian.org>
-Description: allow use of older pytest package
-Forwarded: not-needed
---- mypy.orig/pytest.ini
-+++ mypy/pytest.ini
-@@ -1,5 +1,5 @@
- [pytest]
--minversion = 6.0.0
-+#minversion = 6.0.0
- 
- testpaths = mypy/test mypyc/test
- 


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,2 @@
-older_pytest
 verbose
+intersphinx


=====================================
debian/patches/verbose
=====================================
@@ -3,7 +3,7 @@ Description: make the build more verbose
 Forwarded: not-needed
 --- mypy.orig/setup.py
 +++ mypy/setup.py
-@@ -150,6 +150,7 @@
+@@ -151,6 +151,7 @@
          # Use multi-file compilation mode on windows because without it
          # our Appveyor builds run out of memory sometimes.
          multi_file=sys.platform == 'win32' or force_multifile,


=====================================
debian/rules
=====================================
@@ -26,7 +26,7 @@ endif
 	dh $@ --with python3$(WITH) --buildsystem=pybuild
 
 ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)))
-manpages: debian/dmypy.1 debian/mypy.1 debian/stubgen.1
+manpages: debian/sphinx/mypy_options.rst debian/sphinx/stubgen_options.rst debian/dmypy.1 debian/mypy.1 debian/stubgen.1
 else
 manpages:
 endif
@@ -44,16 +44,19 @@ debian/sphinx/mypy_options.rst: docs/source/command_line.rst
 debian/sphinx/stubgen_options.rst: docs/source/stubgen.rst
 	sed -n -e '/stubgen --help/,$$ {/stubgen --help/d; p}' $< > $@
 
-override_dh_auto_build: manpages
+override_dh_auto_build-arch:
 ifneq (,$(filter $(DEB_BUILD_ARCH),mips64el mipsel alpha ia64 m68k powerpc riscv64 sh4 sparc64))
 	MYPY_USE_MYPYC=0 dh_auto_build
 else
 	MYPY_USE_MYPYC=1 dh_auto_build
 endif
+
+override_dh_auto_build-indep: manpages
 ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)))
 	PYTHONPATH=$(CURDIR) $(MAKE) -C docs html
 endif
 
+
 override_dh_auto_clean:
 	dh_auto_clean
 ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)))
@@ -79,7 +82,7 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_PROFILES)))
 	set -e; for v in $(PY3VERS); do \
 		PATH=$$PATH:$(CURDIR)/debian/mypy/usr/bin/ python$$v -m pytest -n auto \
 		-o testpaths="mypy/test mypyc/test" -o python_files=test*.py \
-		-k "not (StubtestMiscUnit or StubtestUnit)" \
+		-k "not (StubtestMiscUnit or StubtestUnit or testSubclassSpecialize1 or testSubclassSpecialize2 or testMultiModuleSpecialize or testMultiModuleSpecialize_multi or testMultiModuleSpecialize_separate)" \
 		-o python_classes= -o python_functions=; \
 	done
 endif


=====================================
debian/tests/run-unit-test
=====================================
@@ -16,7 +16,7 @@ export TEST_MYPYC=1
 
 MYPY_TEST_PREFIX=${START} pytest-3 -n auto -v -o testpaths="mypy/test mypyc/test" \
 	-o python_files=test*.py -o python_classes= \
-	-o python_functions= -k 'not (StubtestMiscUnit or StubtestUnit)' \
+	-o python_functions= -k 'not (StubtestMiscUnit or StubtestUnit or testSubclassSpecialize1 or testSubclassSpecialize2 or testMultiModuleSpecialize or testMultiModuleSpecialize_multi or testMultiModuleSpecialize_separate)' \
 	--pyargs mypy
 
 cp -r /usr/lib/python3/dist-packages/mypy ./



View it on GitLab: https://salsa.debian.org/med-team/mypy/-/compare/d09e50eebe9b80a681c81f4f77bf4b99c9168770...9d86d49c6871c92e4e66cdf94799c80f0e2feb00

-- 
View it on GitLab: https://salsa.debian.org/med-team/mypy/-/compare/d09e50eebe9b80a681c81f4f77bf4b99c9168770...9d86d49c6871c92e4e66cdf94799c80f0e2feb00
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/20210921/46abf5ff/attachment-0001.htm>
