Version in base suite: 1.0.3+dfsg-2 Base version: mu-editor_1.0.3+dfsg-2 Target version: mu-editor_1.0.3+dfsg-5 Base file: /srv/ftp-master.debian.org/ftp/pool/main/m/mu-editor/mu-editor_1.0.3+dfsg-2.dsc Target file: /srv/ftp-master.debian.org/policy/pool/main/m/mu-editor/mu-editor_1.0.3+dfsg-5.dsc changelog | 40 ++++++++++++++++++++++++ control | 28 ++++++++-------- copyright | 2 - mu-editor.lintian-overrides | 2 - patches/avoid-floats-for-int-arguments | 33 +++++++++++++++++++ patches/fix-missing-kernel-attr-qtkernelmanager | 28 ++++++++++++++++ patches/fix-semver-deprecation-warnings | 38 ++++++++++++++++++++++ patches/series | 4 ++ patches/tests-reduce-builtin-mock-scope | 19 +++++++++++ source/lintian-overrides | 2 + upstream/metadata | 1 watch | 4 -- 12 files changed, 181 insertions(+), 20 deletions(-) diff -Nru mu-editor-1.0.3+dfsg/debian/changelog mu-editor-1.0.3+dfsg/debian/changelog --- mu-editor-1.0.3+dfsg/debian/changelog 2021-02-07 13:35:47.000000000 +0000 +++ mu-editor-1.0.3+dfsg/debian/changelog 2023-02-09 03:20:50.000000000 +0000 @@ -1,3 +1,43 @@ +mu-editor (1.0.3+dfsg-5) unstable; urgency=medium + + * d/control: + - Declare compliance with Debian Policy 4.6.2 (no changes) + * d/copyright: + - Bump years of Debian copyright + * d/mu-editor.lintian-overrides: + - Refresh overrides + * d/patches: + - Add patch tests-reduce-builtin-mock-scope + + -- Nick Morrott Thu, 09 Feb 2023 03:20:50 +0000 + +mu-editor (1.0.3+dfsg-4) unstable; urgency=medium + + * d/patches: + - Add patch avoid-floats-for-int-arguments + + -- Nick Morrott Tue, 17 May 2022 23:42:29 +0100 + +mu-editor (1.0.3+dfsg-3) unstable; urgency=medium + + * d/control: + - Update standards version to 4.6.0, no changes needed. + - Drop unnecessary version constraints for dependencies + * d/copyright: + - Refresh years of Debian copyright + - Use 4-digit years for Debian copyright ranges + * d/patches: + - Add patch fix-missing-kernel-attr-qtkernelmanager (Closes: #1005259) + - Add patch fix-semver-deprecation-warnings + * d/s/lintian-overrides: + - Add override for long lines in source + * d/u/metadata: + - Remove unknown field Bug-Repository + * d/watch: + - Update pattern for GitHub archive URLs + + -- Nick Morrott Tue, 15 Feb 2022 01:39:04 +0000 + mu-editor (1.0.3+dfsg-2) unstable; urgency=medium [ Debian Janitor ] diff -Nru mu-editor-1.0.3+dfsg/debian/control mu-editor-1.0.3+dfsg/debian/control --- mu-editor-1.0.3+dfsg/debian/control 2021-02-07 13:35:47.000000000 +0000 +++ mu-editor-1.0.3+dfsg/debian/control 2023-02-09 03:20:50.000000000 +0000 @@ -8,31 +8,31 @@ dh-python, fonts-inconsolata, pandoc, - python3 (>= 3.6), - python3-appdirs (>= 1.4.3), - python3-matplotlib (>= 2.2.2), + python3, + python3-appdirs, + python3-matplotlib, python3-mock, python3-nudatus, python3-pil, - python3-pycodestyle (>= 2.4.0), - python3-pyflakes (>= 2.0.0), - python3-pyqt5 (>= 5.11.3), - python3-pyqt5.qsci (>= 2.10.4), - python3-pyqt5.qtchart (>= 5.10.1), - python3-pyqt5.qtserialport (>= 5.11.3), + python3-pycodestyle, + python3-pyflakes, + python3-pyqt5, + python3-pyqt5.qsci, + python3-pyqt5.qtchart, + python3-pyqt5.qtserialport, python3-pytest, python3-pytest-random-order, python3-pytest-xvfb, - python3-qtconsole (>= 4.3.1), + python3-qtconsole, python3-requests, - python3-semver (>= 2.0.1), - python3-serial (>= 3.4), + python3-semver, + python3-serial, python3-setuptools, python3-sphinx, python3-tk, python3-uflash, Rules-Requires-Root: no -Standards-Version: 4.5.1 +Standards-Version: 4.6.2 Homepage: https://codewith.mu/ Vcs-Browser: https://salsa.debian.org/python-team/packages/mu-editor Vcs-Git: https://salsa.debian.org/python-team/packages/mu-editor.git @@ -41,7 +41,7 @@ Architecture: all Depends: fonts-inconsolata, - python3 (>= 3.6), + python3, python3-guizero, python3-pyqt5, python3-pyqt5.qsci, diff -Nru mu-editor-1.0.3+dfsg/debian/copyright mu-editor-1.0.3+dfsg/debian/copyright --- mu-editor-1.0.3+dfsg/debian/copyright 2021-02-07 13:35:47.000000000 +0000 +++ mu-editor-1.0.3+dfsg/debian/copyright 2023-02-09 03:20:50.000000000 +0000 @@ -139,7 +139,7 @@ Comment: Licensing information taken from pgzero source package Files: debian/* -Copyright: 2018-21 Nick Morrott +Copyright: 2018-2023 Nick Morrott License: GPL-3.0+ License: GPL-3.0+ diff -Nru mu-editor-1.0.3+dfsg/debian/mu-editor.lintian-overrides mu-editor-1.0.3+dfsg/debian/mu-editor.lintian-overrides --- mu-editor-1.0.3+dfsg/debian/mu-editor.lintian-overrides 2021-02-07 13:35:47.000000000 +0000 +++ mu-editor-1.0.3+dfsg/debian/mu-editor.lintian-overrides 2023-02-09 03:20:50.000000000 +0000 @@ -1,5 +1,5 @@ # mu-editor is sectioned in Python rather than editors -mu-editor: application-in-library-section python usr/bin/mu-editor +mu-editor: application-in-library-section python [usr/bin/mu-editor] # This is triggered by the Python Egg metadata package-contains-documentation-outside-usr-share-doc diff -Nru mu-editor-1.0.3+dfsg/debian/patches/avoid-floats-for-int-arguments mu-editor-1.0.3+dfsg/debian/patches/avoid-floats-for-int-arguments --- mu-editor-1.0.3+dfsg/debian/patches/avoid-floats-for-int-arguments 1970-01-01 00:00:00.000000000 +0000 +++ mu-editor-1.0.3+dfsg/debian/patches/avoid-floats-for-int-arguments 2023-02-09 03:20:50.000000000 +0000 @@ -0,0 +1,33 @@ +Description: On Python 3.10+, we cannot use floats for int arguments +Origin: https://github.com/mu-editor/mu/issues/2228 +Bug: https://github.com/mu-editor/mu/issues/2228 +Applied-Upstream: https://github.com/mu-editor/mu/commit/05ed288f80d3786373bd814a7d5b0048666e1f03 +Reviewed-by: Nick Morrott +Last-Update: 2022-05-17 +--- +--- a/mu/interface/main.py ++++ b/mu/interface/main.py +@@ -771,8 +771,8 @@ + h = int(screen.height() * 0.8) + self.resize(w, h) + size = self.geometry() +- self.move((screen.width() - size.width()) / 2, +- (screen.height() - size.height()) / 2) ++ self.move((screen.width() - size.width()) // 2, ++ (screen.height() - size.height()) // 2) + + def reset_annotations(self): + """ +--- a/tests/interface/test_main.py ++++ b/tests/interface/test_main.py +@@ -1306,8 +1306,8 @@ + mock_qdw.assert_called_once_with() + w.resize.assert_called_once_with(int(1024 * 0.8), int(768 * 0.8)) + w.geometry.assert_called_once_with() +- x = (1024 - 819) / 2 +- y = (768 - 614) / 2 ++ x = (1024 - 819) // 2 ++ y = (768 - 614) // 2 + w.move.assert_called_once_with(x, y) + + diff -Nru mu-editor-1.0.3+dfsg/debian/patches/fix-missing-kernel-attr-qtkernelmanager mu-editor-1.0.3+dfsg/debian/patches/fix-missing-kernel-attr-qtkernelmanager --- mu-editor-1.0.3+dfsg/debian/patches/fix-missing-kernel-attr-qtkernelmanager 1970-01-01 00:00:00.000000000 +0000 +++ mu-editor-1.0.3+dfsg/debian/patches/fix-missing-kernel-attr-qtkernelmanager 2023-02-09 03:20:50.000000000 +0000 @@ -0,0 +1,28 @@ +Description: Do not attempt to access 'kernel' attr in QtKernelManager + Updates to qtconsole.manager have removed the 'kernel' attribute, so do not + attempt to use it and use default setting for GUI +Author: Nick Morrott +Bug: https://github.com/mu-editor/mu/issues/2036 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1005259 +Last-Update: 2022-02-14 +--- +--- a/mu/interface/main.py ++++ b/mu/interface/main.py +@@ -460,7 +460,6 @@ + """ + Adds a Jupyter based REPL pane to the application. + """ +- kernel_manager.kernel.gui = 'qt4' + kernel_client.start_channels() + ipython_widget = JupyterREPLPane() + ipython_widget.kernel_manager = kernel_manager +--- a/tests/interface/test_main.py ++++ b/tests/interface/test_main.py +@@ -812,7 +812,6 @@ + mock_pane_class.assert_called_once_with() + assert mock_pane.kernel_manager == mock_kernel_manager + assert mock_pane.kernel_client == mock_kernel_client +- assert mock_kernel_manager.kernel.gui == 'qt4' + w.add_repl.assert_called_once_with(mock_pane, 'Python3 (Jupyter)') + + diff -Nru mu-editor-1.0.3+dfsg/debian/patches/fix-semver-deprecation-warnings mu-editor-1.0.3+dfsg/debian/patches/fix-semver-deprecation-warnings --- mu-editor-1.0.3+dfsg/debian/patches/fix-semver-deprecation-warnings 1970-01-01 00:00:00.000000000 +0000 +++ mu-editor-1.0.3+dfsg/debian/patches/fix-semver-deprecation-warnings 2023-02-09 03:20:50.000000000 +0000 @@ -0,0 +1,38 @@ +Description: Update semver calls to use non-deprecated functions + semver.parse and semver.compare are deprecated and will be removed + in semver 3 +Author: Nick Morrott +Forwarded: not-needed +Last-Update: 2022-02-15 +--- +--- a/mu/modes/microbit.py ++++ b/mu/modes/microbit.py +@@ -338,24 +338,22 @@ + # in the "release" field. + try: + # Check the release is a correct semantic version. +- semver.parse(version_info['release']) +- board_version = version_info['release'] ++ board_version = semver.VersionInfo.parse(version_info['release']) + except ValueError: + # If it's an invalid semver, set to unknown version to + # force flash. +- board_version = '0.0.1' ++ board_version = semver.VersionInfo.parse('0.0.1') + else: + # 0.0.1 indicates an old unknown version. This is just a + # valid arbitrary flag for semver comparison a couple of + # lines below. +- board_version = '0.0.1' ++ board_version = semver.VersionInfo.parse('0.0.1') + logger.info('Board MicroPython: {}'.format(board_version)) + logger.info( + 'Mu MicroPython: {}'.format(uflash.MICROPYTHON_VERSION)) + # If there's an older version of MicroPython on the device, + # update it with the one packaged with Mu. +- if semver.compare(board_version, +- uflash.MICROPYTHON_VERSION) < 0: ++ if board_version.compare(uflash.MICROPYTHON_VERSION) < 0: + force_flash = True + except Exception: + # Could not get version of MicroPython. This means either the diff -Nru mu-editor-1.0.3+dfsg/debian/patches/series mu-editor-1.0.3+dfsg/debian/patches/series --- mu-editor-1.0.3+dfsg/debian/patches/series 2021-02-07 13:35:47.000000000 +0000 +++ mu-editor-1.0.3+dfsg/debian/patches/series 2023-02-09 03:20:50.000000000 +0000 @@ -9,3 +9,7 @@ remove-non-dfsg-resources update-rtp-for-mu-debug use-https-urls-in-appstream-data +fix-missing-kernel-attr-qtkernelmanager +fix-semver-deprecation-warnings +avoid-floats-for-int-arguments +tests-reduce-builtin-mock-scope diff -Nru mu-editor-1.0.3+dfsg/debian/patches/tests-reduce-builtin-mock-scope mu-editor-1.0.3+dfsg/debian/patches/tests-reduce-builtin-mock-scope --- mu-editor-1.0.3+dfsg/debian/patches/tests-reduce-builtin-mock-scope 1970-01-01 00:00:00.000000000 +0000 +++ mu-editor-1.0.3+dfsg/debian/patches/tests-reduce-builtin-mock-scope 2023-02-09 03:20:50.000000000 +0000 @@ -0,0 +1,19 @@ +Description: Fix tests by reducing builtin mock scope from global to module +Author: Carlos Pereira Atencio +Origin: upstream +Bug: https://github.com/mu-editor/mu/issues/2091 +Applied-Upstream: https://github.com/mu-editor/mu/commit/85cacb48ea2243c727ac236cf7d70c29dc7a52b9 +Reviewed-by: Nick Morrott +Last-Update: 2023-02-09 +--- +--- a/tests/interface/test_main.py ++++ b/tests/interface/test_main.py +@@ -115,7 +115,7 @@ + addAction. + """ + bb = mu.interface.main.ButtonBar(None) +- with mock.patch('builtins.super') as mock_s: ++ with mock.patch('mu.interface.main.super') as mock_s: + bb.addAction('save', 'Save', 'save stuff') + mock_s.assert_called_once_with() + assert 'save' in bb.slots diff -Nru mu-editor-1.0.3+dfsg/debian/source/lintian-overrides mu-editor-1.0.3+dfsg/debian/source/lintian-overrides --- mu-editor-1.0.3+dfsg/debian/source/lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ mu-editor-1.0.3+dfsg/debian/source/lintian-overrides 2023-02-09 03:20:50.000000000 +0000 @@ -0,0 +1,2 @@ +# Add override for long lines in source code +mu-editor source: very-long-line-length-in-source-file diff -Nru mu-editor-1.0.3+dfsg/debian/upstream/metadata mu-editor-1.0.3+dfsg/debian/upstream/metadata --- mu-editor-1.0.3+dfsg/debian/upstream/metadata 2021-02-07 13:35:47.000000000 +0000 +++ mu-editor-1.0.3+dfsg/debian/upstream/metadata 2023-02-09 03:20:50.000000000 +0000 @@ -1,5 +1,4 @@ Bug-Database: https://github.com/mu-editor/mu/issues -Bug-Repository: https://github.com/mu-editor/mu/issues Bug-Submit: https://github.com/mu-editor/mu/issues/new Repository: https://github.com/mu-editor/mu.git Repository-Browse: https://github.com/mu-editor/mu diff -Nru mu-editor-1.0.3+dfsg/debian/watch mu-editor-1.0.3+dfsg/debian/watch --- mu-editor-1.0.3+dfsg/debian/watch 2021-02-07 13:35:47.000000000 +0000 +++ mu-editor-1.0.3+dfsg/debian/watch 2023-02-09 03:20:50.000000000 +0000 @@ -1,4 +1,2 @@ version=4 - -opts="dversionmangle=s/\+dfsg//, repacksuffix=+dfsg, filenamemangle=s/.+\/v?@ANY_VERSION@\.tar\.gz/@PACKAGE@-$1\.tar\.gz/" \ - https://github.com/mu-editor/mu/tags .*/archive/v?@ANY_VERSION@@ARCHIVE_EXT@ +opts="dversionmangle=s/\+dfsg//, repacksuffix=+dfsg, filenamemangle=s/.+\/v?@ANY_VERSION@\.tar\.gz/@PACKAGE@-$1\.tar\.gz/" https://github.com/mu-editor/mu/tags .*/archive/refs/tags/v?@ANY_VERSION@@ARCHIVE_EXT@