Merge version 0.11.1-3+rpi1 and 0.12.0-2 to produce 0.12.0-2+rpi1

diff --cc debian/changelog
index 12f9d6216e38bb6d7976152c4e1b66b9ef10a328,bf052b1eacf6e7cf4c45d2245f14a6c7f81ef59d..e6d94a591a02f4fba42ed2354010408fdf00314b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,36 +1,46 @@@
- statsmodels (0.11.1-3+rpi1) bullseye-staging; urgency=medium
++statsmodels (0.12.0-2+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 0.10.2-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 04 Feb 2020 00:34:03 +0000]
 +  * Disable testsuite.
 +
 +  [changes introduced in 0.11.1-2+rpi1 by Peter Michael Green]
 +  * Disable documentation build due to timeouts.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 18 Jul 2020 01:48:48 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 21 Sep 2020 08:39:37 +0000
++
+ statsmodels (0.12.0-2) unstable; urgency=medium
+ 
+   * Loosen some test tolerances on i386.
+   * Require scipy >= 1.5 to avoid autopkgtest failure.
+ 
+  -- Rebecca N. Palmer <rebecca_palmer@zoho.com>  Fri, 11 Sep 2020 07:24:40 +0100
+ 
+ statsmodels (0.12.0-1) unstable; urgency=medium
+ 
+   * New upstream release.  Drop / refresh patches.
+   * Update d/copyright.
+   * Stop using pytest-forked everywhere: it doesn't fully
+     handle conditional xfails.
+   * Skip slow autopkgtests on non-amd64.
+   * On armel, warn on import and ignore all tests (see #968210).
+ 
+  -- Rebecca N. Palmer <rebecca_palmer@zoho.com>  Tue, 08 Sep 2020 18:35:08 +0100
+ 
+ statsmodels (0.11.1-5) unstable; urgency=medium
+ 
+   * Ignore test failures on arm* (see #968210).
+   * Use pytest-forked in case there are more crashing tests.
+ 
+  -- Rebecca N. Palmer <rebecca_palmer@zoho.com>  Sun, 16 Aug 2020 19:00:44 +0100
+ 
+ statsmodels (0.11.1-4) unstable; urgency=medium
+ 
+   * Tests: ignore changes due to matplotlib 3.3 and scipy 1.5.
+     Closes: #966712.
+   * Bump debhelper compat to 13.
+   * Override Lintian warning from test references.
+ 
+  -- Rebecca N. Palmer <rebecca_palmer@zoho.com>  Sun, 09 Aug 2020 22:12:11 +0100
  
  statsmodels (0.11.1-3) unstable; urgency=medium
  

diff --cc debian/rules
index 2431835d41a8ca54fa9c3ec659076ae7cdc9be8d,34a4ce63cd1c424bfd690629d7ae59cbe1c8a0cc..85c2941fc7a247a08e2768d07eee1806d5822952
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -111,8 -111,9 +111,9 @@@ override_dh_install
  # the cd is to be "anywhere but pkgroot" to avoid subprocesses (test_lazy_imports) importing the source tree (current directory is tried before PYTHONPATH), which doesn't work because the built .so files aren't there
  # the inner 'for' (expected to be a single item, cpython3_${testpy3ver}_statsmodels/build) is because globs aren't expanded when setting env vars
  # TEST_SUCCESS is used because the return status of a for-loop is its last item, not the "fail if any of them do" wanted here
+ # Tests are ignored (and expected to crash) on armel, #968210
  override_dh_auto_test:
 -ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 +ifeq (testsuitedisabled,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
        TEST_SUCCESS=true ; cd tools && for testpy3ver in `py3versions -vs` ; do \
        for testpath in ../.pybuild/*$${testpy3ver}*/*/statsmodels ; do \
        PYTHONPATH=$${testpath}/.. python$${testpy3ver} -m pytest -v $${testpath} || TEST_SUCCESS=false ; \