[med-svn] [Git][med-team/mypy][master] 3 commits: tweak patch
Michael R. Crusoe
gitlab at salsa.debian.org
Wed Oct 14 09:35:02 BST 2020
Michael R. Crusoe pushed to branch master at Debian Med / mypy
Commits:
8d81fb96 by Michael R. Crusoe at 2020-10-13T17:40:28+02:00
tweak patch
- - - - -
d7ade504 by Michael R. Crusoe at 2020-10-14T10:05:41+02:00
Disable self test until pytest >= 6.0 is in Debian
- - - - -
7b4d679f by Michael R. Crusoe at 2020-10-14T10:33:49+02:00
release 0.790-1
- - - - -
6 changed files:
- debian/changelog
- debian/patches/mypyc_analysis
- + debian/patches/older_pytest
- debian/patches/series
- debian/rules
- debian/tests/run-unit-test
Changes:
=====================================
debian/changelog
=====================================
@@ -1,12 +1,13 @@
-mypy (0.790-1) UNRELEASED; urgency=medium
+mypy (0.790-1) unstable; urgency=medium
* New upstream version
* debian/patches/ignore_mypyc: refreshed
* debian/patches/mypyc_analysis: add files accidently left out of upstream's
tarball
Closes: #972013
+ * Disable self test until pytest >= 6.0 is in Debian
- -- Michael R. Crusoe <crusoe at debian.org> Tue, 13 Oct 2020 16:04:28 +0200
+ -- Michael R. Crusoe <crusoe at debian.org> Wed, 14 Oct 2020 10:33:35 +0200
mypy (0.782-1) unstable; urgency=medium
=====================================
debian/patches/mypyc_analysis
=====================================
@@ -3,7 +3,7 @@ Subject: Add files accidently left out of the release tarball
Forwarded: https://github.com/python/mypy/pull/9587
--- /dev/null
+++ mypy/mypyc/analysis/dataflow.py
-@@ -0,0 +1,530 @@
+@@ -0,0 +1,511 @@
+"""Data-flow analyses."""
+
+from abc import abstractmethod
@@ -15,7 +15,7 @@ Forwarded: https://github.com/python/mypy/pull/9587
+ BasicBlock, OpVisitor, Assign, LoadInt, LoadErrorValue, RegisterOp, Goto, Branch, Return, Call,
+ Environment, Box, Unbox, Cast, Op, Unreachable, TupleGet, TupleSet, GetAttr, SetAttr,
+ LoadStatic, InitStatic, PrimitiveOp, MethodCall, RaiseStandardError, CallC, LoadGlobal,
-+ Truncate, BinaryIntOp, LoadMem, GetElementPtr, LoadAddress, ComparisonOp, SetMem
++ Truncate, BinaryIntOp, LoadMem, GetElementPtr, LoadAddress
+)
+
+
@@ -157,10 +157,6 @@ Forwarded: https://github.com/python/mypy/pull/9587
+ def visit_assign(self, op: Assign) -> GenAndKill:
+ raise NotImplementedError
+
-+ @abstractmethod
-+ def visit_set_mem(self, op: SetMem) -> GenAndKill:
-+ raise NotImplementedError
-+
+ def visit_call(self, op: Call) -> GenAndKill:
+ return self.visit_register_op(op)
+
@@ -218,9 +214,6 @@ Forwarded: https://github.com/python/mypy/pull/9587
+ def visit_binary_int_op(self, op: BinaryIntOp) -> GenAndKill:
+ return self.visit_register_op(op)
+
-+ def visit_comparison_op(self, op: ComparisonOp) -> GenAndKill:
-+ return self.visit_register_op(op)
-+
+ def visit_load_mem(self, op: LoadMem) -> GenAndKill:
+ return self.visit_register_op(op)
+
@@ -258,9 +251,6 @@ Forwarded: https://github.com/python/mypy/pull/9587
+ else:
+ return {op.dest}, set()
+
-+ def visit_set_mem(self, op: SetMem) -> GenAndKill:
-+ return set(), set()
-+
+
+def analyze_maybe_defined_regs(blocks: List[BasicBlock],
+ cfg: CFG,
@@ -321,9 +311,6 @@ Forwarded: https://github.com/python/mypy/pull/9587
+ return set(), {op.dest}
+ return set(), set()
+
-+ def visit_set_mem(self, op: SetMem) -> GenAndKill:
-+ return set(), set()
-+
+
+def analyze_borrowed_arguments(
+ blocks: List[BasicBlock],
@@ -358,9 +345,6 @@ Forwarded: https://github.com/python/mypy/pull/9587
+ def visit_assign(self, op: Assign) -> GenAndKill:
+ return set(), {op.dest}
+
-+ def visit_set_mem(self, op: SetMem) -> GenAndKill:
-+ return set(), set()
-+
+
+def analyze_undefined_regs(blocks: List[BasicBlock],
+ cfg: CFG,
@@ -400,9 +384,6 @@ Forwarded: https://github.com/python/mypy/pull/9587
+ def visit_assign(self, op: Assign) -> GenAndKill:
+ return set(op.sources()), {op.dest}
+
-+ def visit_set_mem(self, op: SetMem) -> GenAndKill:
-+ return set(op.sources()), set()
-+
+
+def analyze_live_regs(blocks: List[BasicBlock],
+ cfg: CFG) -> AnalysisResult[Value]:
=====================================
debian/patches/older_pytest
=====================================
@@ -0,0 +1,12 @@
+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,3 +1,4 @@
+older_pytest
mypyc_analysis
ignore_mypyc
verbose
=====================================
debian/rules
=====================================
@@ -70,9 +70,10 @@ override_dh_auto_install:
override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_PROFILES)))
export TEST_MYPYC=1
- PYBUILD_SYSTEM=custom \
- PYBUILD_TEST_ARGS="{interpreter} -m mypy \
- --config-file {dir}/mypy_self_check.ini -p mypy" dh_auto_test
+ # PYBUILD_SYSTEM=custom \
+ # PYBUILD_TEST_ARGS="{interpreter} -m mypy \
+ # --config-file {dir}/mypy_self_check.ini -p mypy" dh_auto_test
+ # ^^^ requires pytest > 6.0.0
dh_auto_install
set -e; for v in $(PY3VERS); do \
PATH=$$PATH:$(CURDIR)/debian/mypy/usr/bin/ python$$v -m pytest -n auto \
=====================================
debian/tests/run-unit-test
=====================================
@@ -19,4 +19,5 @@ MYPY_TEST_PREFIX=${START} pytest-3 -n auto -o testpaths=mypy/test \
-k 'not StubtestMiscUnit' --pyarg mypy
cp -r /usr/lib/python3/dist-packages/mypy ./
-/usr/bin/mypy --config-file ${START}/mypy_self_check.ini mypy
+#/usr/bin/mypy --config-file ${START}/mypy_self_check.ini mypy
+# skip self test until pytest >= 6.0 is in Debian
View it on GitLab: https://salsa.debian.org/med-team/mypy/-/compare/c3b967c97101500c15d03a59cfd4e01ff82515dd...7b4d679fa109b57bd25bf853131775b687548ca7
--
View it on GitLab: https://salsa.debian.org/med-team/mypy/-/compare/c3b967c97101500c15d03a59cfd4e01ff82515dd...7b4d679fa109b57bd25bf853131775b687548ca7
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/20201014/a06a9c7b/attachment-0001.html>
More information about the debian-med-commit
mailing list