Manual merge of version 2.8.0+git20220714.32dee0b+dfsg-6+rpi1 and 2.8.0+git20220826...

diff --cc debian/changelog
index 48b06c8c1846dfb4e55fc4a935446a07fb57a153,83ee3377ab91313a34d963587556ae3877fcba32..fd18c6fac0837716bd2e18614d8012e7b051580a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,12 +1,20 @@@
- pydevd (2.8.0+git20220714.32dee0b+dfsg-6+rpi1) bookworm-staging; urgency=medium
++pydevd (2.8.0+git20220826.8ee4065+ds-1+rpi1) bookworm-staging; urgency=medium
 +
++  [changes brought forward from 2.8.0+git20220714.32dee0b+dfsg-6+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 14 Aug 2022 07:56:26 +0000]
 +  * Disable testsuite,
 +  * Fix clean target.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 14 Aug 2022 07:56:26 +0000
++ -- Peter Micheal Green <plugwash@raspbian.org>  Fri, 16 Sep 2022 01:22:38 +0000
++
+ pydevd (2.8.0+git20220826.8ee4065+ds-1) unstable; urgency=medium
+ 
+   * New upstream snapshot
+   * Skip another failing test on armel
+   * Mark autopkgtests as flaky on architectures other than amd64 and i386
+     (closes: #1019151)
+   * Improve tests based on Spyder test process
+ 
+  -- Julian Gilbey <jdg@debian.org>  Mon, 05 Sep 2022 21:56:24 +0100
  
  pydevd (2.8.0+git20220714.32dee0b+dfsg-6) unstable; urgency=medium
  

diff --cc debian/rules
index e11c16a34520fa650ba0f5a9c0354eabb5bd1447,a464f130fbf1f65194df85845effe5c8e3a5eaa8..355c5e39d11bf7c6eb62360f1a941251a8b00a46
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -52,43 -50,24 +52,24 @@@ override_dh_python3
  
  ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
  override_dh_auto_test:
-       ## * Some of the tests depend on the uninstalled pycompletionserver.py
-       ## or pydev_coverage.py, so we exclude those
-       ## * Two bytecode tests fail on Python 3.10, so we exclude those too.
-       ## Reported upstream to
-       ## https://github.com/fabioz/PyDev.Debugger/issues/222
-       ## * test_case_flask_exceptions fails, and is not tested by upstream,
-       ## so we just skip it.
-       ## Reported upstream to
-       ## https://github.com/fabioz/PyDev.Debugger/issues/223
-       ## * test_py_37_breakpoint_remote_no_import does not work on the built
-       ## or installed version; reported upstream to
-       ## https://github.com/fabioz/PyDev.Debugger/issues/224
 -      # * Various tests are ignored or excluded; see
 -      # debian/get_test_exclusions for details.
 -      #
 -      # * test_matplotlib_activation and test_pandas cause failures due
 -      # to a matplotlib warning (that does seem to be easily silenced)
 -      # if the build machine has too many fonts on it, so we skip then here
 -      # (but not in the autopkgtest suite)
 -      #
 -      # * The http_proxy settings are to disable the proxies that pybuild
 -      # introduces; the tests set up and use a local http server.
 -      export PYDEVD_USE_CYTHON=YES; \
 -      export http_proxy=""; \
 -      export PYBUILD_SYSTEM=custom; \
 -      export PYBUILD_TEST_ARGS="\
 -              cd {build_dir}; \
 -              $(CURDIR)/debian/run_tests {interpreter} -m pytest \
 -              --deselect=tests_python/test_debugger.py::test_matplotlib_activation \
 -              --deselect=tests_python/test_debugger_json.py::test_pandas \
 -              $$(debian/get_test_exclusions)"; \
 -      xvfb-run -a dh_auto_test
++      ## * Various tests are ignored or excluded; see
++      ## debian/get_test_exclusions for details.
++      ##
 +      ## * test_matplotlib_activation and test_pandas cause failures due
 +      ## to a matplotlib warning (that does seem to be easily silenced)
 +      ## if the build machine has too many fonts on it, so we skip then here
 +      ## (but not in the autopkgtest suite)
-       ## * Some tests fail on various architectures, but I'm not sure why,
-       ## so we skip them; see README.Debian for some more comments on this.
 +      ##
 +      ## * The http_proxy settings are to disable the proxies that pybuild
 +      ## introduces; the tests set up and use a local http server.
-       ##
-       ## We also run the tests a second time if the first fails, as
-       ## there are occasionally intermittent errors in the tests.
 +      #export PYDEVD_USE_CYTHON=YES; \
 +      #export http_proxy=""; \
++      #export PYBUILD_SYSTEM=custom; \
 +      #export PYBUILD_TEST_ARGS="\
-       #       --ignore=tests/test_jyserver.py \
-       #       --ignore=tests/test_pyserver.py \
-       #       --ignore=tests_python/test_pydevcoverage.py \
-       #        --deselect=tests_python/test_debugger_json.py::test_case_flask_exceptions \
-       #        --deselect=tests_python/test_bytecode_manipulation.py::test_set_pydevd_break_01 \
-       #        --deselect=tests_python/test_bytecode_manipulation.py::test_set_pydevd_break_01a \
-       #        --deselect=tests_python/test_debugger.py::test_py_37_breakpoint_remote_no_import \
++      #       cd {build_dir}; \
++      #       $(CURDIR)/debian/run_tests {interpreter} -m pytest \
 +      #        --deselect=tests_python/test_debugger.py::test_matplotlib_activation \
 +      #        --deselect=tests_python/test_debugger_json.py::test_pandas \
 +      #        $$(debian/get_test_exclusions)"; \
-       #       xvfb-run -a -s "-screen 0 1024x1024x24" dh_auto_test || \
-       #       xvfb-run -a -s "-screen 0 1024x1024x24" dh_auto_test
++      #xvfb-run -a dh_auto_test
  endif