Merged with branch 'eric7' in order to prepare a new release. eric7-maintenance release-23.06

Sun, 28 May 2023 14:40:05 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sun, 28 May 2023 14:40:05 +0200
branch
eric7-maintenance
changeset 10081
30c2be3e738b
parent 10079
0222a480e93d (diff)
parent 10080
f834e57a5b13 (current diff)
child 10082
816bc1c6db77

Merged with branch 'eric7' in order to prepare a new release.

--- a/.hgtags	Sat May 27 20:03:31 2023 +0200
+++ b/.hgtags	Sun May 28 14:40:05 2023 +0200
@@ -25,3 +25,31 @@
 7c5fef569684f5e7edda2e6bf3c466bc812f8cae release-6.0.0-RC1
 8ff05a7798ac183732bb9fb34cff249c9a4ece69 release-16.11
 112840bac20c339e7de897deebf7b5cf9016cc4e release-16.11.1
+7d6fc4ad380c16efaf86736760aab70c7c30e550 release-21.12
+7b0f8a130d9785b62e1078967c1b6732e56409c2 release-22.01
+5f2ca5b8dcad102c998054c8e3906a527827e74b release-22.01.1
+e1f6a9e5397913983a7fb5586fe19e104e92d5e6 release-22.02
+3f77fa22d9d2fe39d9f0ca159e8feac607d0d3f8 release-22.03
+248ca0be0cb659a63a7401fa68cf5474cbe3c8aa release-22.04
+59b4315a4f62e97233616bf07e4f7e316c9f864d release-22.05
+4ac66b6c33a45f7340f947456d80c844d0f69980 release-22.06
+9e0cf68f727bc1b07e566c968f0aae0101fa416b release-22.06.1
+a763d57e23bcfe1f4dbf242bcb7948f39f63c865 release-22.07
+a763d57e23bcfe1f4dbf242bcb7948f39f63c865 release-22.07
+0000000000000000000000000000000000000000 release-22.07
+0000000000000000000000000000000000000000 release-22.07
+3387472dda78633c231a5b13bb7460f838d8775d release-22.07
+18a7312cfdb3c7c077f2ac552c9f654b0863a7b5 release-22.08
+3b7ef53c34c745f1b59261c2e28f483827af84b0 release-22.09
+1da8bc75946f9cb55cfd4f0b166013088d974542 release-22.10
+c6d5762136144272c29efffa1eaeb0d0371e6b2d release-22.11
+3505206c09ace1b0f33a3f7498a3e7685dfc84ba release-22.11.1
+fe8c29d7cf967c83831e09c9c82c3713d0f9eda9 release-22.12
+7328efba128b4caba62da603f1b37d8407001093 release-23.01
+73a9cf535429b099a2bb1d5fcff03db69763333b release-23.01.1
+b9a29a7aa820d65ae6693aa4673ca8bf03b02a86 release-23.02
+3885b9d7bd31ce1d1a482a7cae6244d940c088d9 release-23.03
+a57c188857e94ffb2de92fcb0d3f2433627d3a10 release-23.04
+a6ec52ed5c99a4ff33ea96e9aca052af322d1ac6 release-23.04.1
+78ca3b21467e852c7439e2eab9029db3c5d449ef release-23.04.2
+983477114d3caac9cfe756e1c1f708cf72bfb916 release-23.05
--- a/eric7.epj	Sat May 27 20:03:31 2023 +0200
+++ b/eric7.epj	Sun May 28 14:40:05 2023 +0200
@@ -64,7 +64,7 @@
         "CopyrightMinFileSize": 0,
         "DocstringType": "eric_black",
         "EnabledCheckerCategories": "C, D, E, I, M, NO, N, Y, U, W",
-        "ExcludeFiles": "*/ThirdParty/*, */coverage/*, */Ui_*.py, */Examples/*, */pycodestyle.py,*/pyflakes/checker.py,*/mccabe.py,*/eradicate.py,*/ast_unparse.py,*/piplicenses.py,*/pipdeptree.py,*/MCUScripts/*,*/MicroPython/Tools/*",
+        "ExcludeFiles": "*/ThirdParty/*, */coverage/*, */Ui_*.py, */Examples/*, */pycodestyle.py,*/pyflakes/checker.py,*/mccabe.py,*/eradicate.py,*/ast_unparse.py,*/piplicenses.py,*/pipdeptree.py",
         "ExcludeMessages": "C101,E203,E265,E266,E305,E402,M201,M301,M302,M303,M304,M305,M306,M307,M308,M311,M312,M313,M314,M315,M321,M701,M702,M811,M834,N802,N803,N807,N808,N821,W293,W503,Y119,Y401,Y402",
         "FixCodes": "",
         "FixIssues": false,
@@ -212,8 +212,7 @@
           "data",
           "pyflakes",
           ".eric6project",
-          "_eric6project",
-          "MCUScripts"
+          "_eric6project"
         ],
         "ignoreFilePatterns": [
           "Ui_*"
@@ -863,7 +862,6 @@
       "src/eric7/IconEditor/cursors/eraser-cursor.xpm",
       "src/eric7/IconEditor/cursors/fill-cursor.xpm",
       "src/eric7/IconEditor/cursors/paintbrush-cursor.xpm",
-      "src/eric7/MicroPython/Tools/uf2families.json",
       "src/eric7/Plugins/UiExtensionPlugins/Translator/icons/engines/deepl-dark.svg",
       "src/eric7/Plugins/UiExtensionPlugins/Translator/icons/engines/deepl-light.svg",
       "src/eric7/Plugins/UiExtensionPlugins/Translator/icons/engines/googlev1.svg",
@@ -1015,7 +1013,7 @@
     "OTHERTOOLSPARMS": {
       "Black": {
         "exclude": "/(\\.direnv|\\.eggs|\\.git|\\.hg|\\.mypy_cache|\\.nox|\\.tox|\\.venv|venv|\\.svn|\\.ipynb_checkpoints|_build|buck-out|build|dist|__pypackages__)/",
-        "extend-exclude": "/(\n\tExamples/\n\t| ThirdParty/\n\t| coverage/\n  | MCUScripts/\n  | MicroPython/Tools/\n\t| Ui_.*\\.py\n\t| pycodestyle\\.py\n\t| pyflakes/checker\\.py\n\t| mccabe\\.py\n\t| eradicate\\.py\n\t| ast_unparse\\.py\n\t| piplicenses\\.py\n\t| pipdeptree\\.py\n)",
+        "extend-exclude": "/(\n\tExamples/\n\t| ThirdParty/\n\t| coverage/\n\t| Ui_.*\\.py\n\t| pycodestyle\\.py\n\t| pyflakes/checker\\.py\n\t| mccabe\\.py\n\t| eradicate\\.py\n\t| ast_unparse\\.py\n\t| piplicenses\\.py\n\t| pipdeptree\\.py\n)",
         "force-exclude": "",
         "line-length": 88,
         "skip-magic-trailing-comma": false,
@@ -1042,8 +1040,6 @@
           "*/Examples/*",
           "*/ThirdParty/*",
           "*/coverage/*",
-          "*/MCUScripts/*",
-          "*/MicroPython/Tools/*",
           "*/Ui_*.py",
           "*/pycodestyle.py",
           "*/pyflakes/checker.py",

eric ide

mercurial