Sun, 19 May 2024 17:20:16 +0200
Relocated the Version information into a top level '__version__.py' module.
--- a/pyproject.toml Sat May 18 18:15:51 2024 +0200 +++ b/pyproject.toml Sun May 19 17:20:16 2024 +0200 @@ -143,7 +143,7 @@ include-package-data = false [tool.setuptools.dynamic] -version = {attr = "eric7.UI.Info.VersionOnly"} +version = {attr = "eric7.__version__.VersionOnly"} [tool.setuptools.packages.find] where = ["src"] @@ -190,7 +190,7 @@ # [tool.black] -target-version = ["py38", "py39", "py310", "py311", "py312"] +target-version = ["py38", "py39", "py310", "py311", "py312", "py313"] line-length = 88 extend-exclude = ''' /(
--- a/scripts/install.py Sat May 18 18:15:51 2024 +0200 +++ b/scripts/install.py Sun May 19 17:20:16 2024 +0200 @@ -219,12 +219,12 @@ @param dst destination file name @type str """ - if os.path.exists(os.path.join("eric", "src", "eric7", "UI", "Info.py")): + if os.path.exists(os.path.join("eric", "src", "eric7", "__version__.py")): # Installing from installer archive - from eric.src.eric7.UI.Info import Version # noqa: I101, I102 - elif os.path.exists(os.path.join("src", "eric7", "UI", "Info.py")): + from eric.src.eric7.__version__ import Version # noqa: I101, I102 + elif os.path.exists(os.path.join("src", "eric7", "__version__.py")): # Installing from source tree - from src.eric7.UI.Info import Version # noqa: I101, I102 + from src.eric7.__version__ import Version # noqa: I101, I102 else: Version = "Unknown" @@ -1231,12 +1231,12 @@ os.path.join(directories["icns"], "eric.icns"), ) - if os.path.exists(os.path.join("eric", "eric7", "UI", "Info.py")): + if os.path.exists(os.path.join("eric", "eric7", "__version__.py")): # Installing from archive - from eric.eric7.UI.Info import CopyrightShort, Version # noqa: I101, I102 - elif os.path.exists(os.path.join("eric7", "UI", "Info.py")): + from eric.eric7.__version__ import CopyrightShort, Version # noqa: I101, I102 + elif os.path.exists(os.path.join("eric7", "__version__.py")): # Installing from source tree - from eric7.UI.Info import CopyrightShort, Version # noqa: I101 + from eric7.__version__ import CopyrightShort, Version # noqa: I101 else: Version = "Unknown" CopyrightShort = "(c) 2002 - 2024 Detlev Offenbach"
--- a/src/eric7/APIs/Python3/eric7.api Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/APIs/Python3/eric7.api Sun May 19 17:20:16 2024 +0200 @@ -10689,8 +10689,6 @@ eric7.UI.Info.FeatureAddress?7 eric7.UI.Info.Homepage?7 eric7.UI.Info.Program?7 -eric7.UI.Info.Version?7 -eric7.UI.Info.VersionOnly?7 eric7.UI.InstallInfoDialog.InstallInfoDialog.on_deleteButton_clicked?4() eric7.UI.InstallInfoDialog.InstallInfoDialog.on_editButton_toggled?4(checked) eric7.UI.InstallInfoDialog.InstallInfoDialog.on_saveButton_clicked?4() @@ -13364,6 +13362,8 @@ eric7.WebBrowser.ZoomManager.ZoomValuesModel.ZoomValuesModel.removeRows?4(row, count, parent=None) eric7.WebBrowser.ZoomManager.ZoomValuesModel.ZoomValuesModel.rowCount?4(parent=None) eric7.WebBrowser.ZoomManager.ZoomValuesModel.ZoomValuesModel?1(manager, parent=None) +eric7.__version__.Version?7 +eric7.__version__.VersionOnly?7 eric7.eric7_api.createArgumentParser?4() eric7.eric7_api.main?4() eric7.eric7_browser.SettingsDir?7
--- a/src/eric7/CycloneDXInterface/CycloneDXUtilities.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/CycloneDXInterface/CycloneDXUtilities.py Sun May 19 17:20:16 2024 +0200 @@ -342,7 +342,7 @@ __EricToolVersion = str(meta_version("eric-ide")) except Exception: - from eric7.UI.Info import Version # __IGNORE_WARNING_I101__ + from eric7.__version__ import Version # __IGNORE_WARNING_I101__ __EricToolVersion = Version
--- a/src/eric7/Documentation/Help/source.qhp Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/Documentation/Help/source.qhp Sun May 19 17:20:16 2024 +0200 @@ -1539,6 +1539,7 @@ <section title="eric7.WebBrowser.WebInspector" ref="eric7.WebBrowser.WebInspector.html" /> </section> <section title="eric7.__main__" ref="eric7.__main__.html" /> + <section title="eric7.__version__" ref="eric7.__version__.html" /> <section title="eric7.eric7_api" ref="eric7.eric7_api.html" /> <section title="eric7.eric7_browser" ref="eric7.eric7_browser.html" /> <section title="eric7.eric7_compare" ref="eric7.eric7_compare.html" /> @@ -19636,6 +19637,7 @@ <keyword name="__setAction" id="__setAction" ref="eric7.Preferences.Shortcuts.html#__setAction" /> <keyword name="__showwarning" id="__showwarning" ref="eric7.Utilities.__init__.html#__showwarning" /> <keyword name="__tomlSyntaxCheck" id="__tomlSyntaxCheck" ref="eric7.Plugins.CheckerPlugins.SyntaxChecker.tomlCheckSyntax.html#__tomlSyntaxCheck" /> + <keyword name="__version__ (Module)" id="__version__ (Module)" ref="eric7.__version__.html" /> <keyword name="__yamlSyntaxCheck" id="__yamlSyntaxCheck" ref="eric7.Plugins.CheckerPlugins.SyntaxChecker.yamlCheckSyntax.html#__yamlSyntaxCheck" /> <keyword name="_addCycloneDXDependency" id="_addCycloneDXDependency" ref="eric7.CycloneDXInterface.CycloneDXUtilities.html#_addCycloneDXDependency" /> <keyword name="_add_check" id="_add_check" ref="eric7.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#_add_check" /> @@ -22056,6 +22058,7 @@ <file>eric7.WebBrowser.ZoomManager.ZoomValuesDialog.html</file> <file>eric7.WebBrowser.ZoomManager.ZoomValuesModel.html</file> <file>eric7.__main__.html</file> + <file>eric7.__version__.html</file> <file>eric7.eric7_api.html</file> <file>eric7.eric7_browser.html</file> <file>eric7.eric7_compare.html</file>
--- a/src/eric7/Documentation/Source/eric7.UI.Info.html Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/Documentation/Source/eric7.UI.Info.html Sun May 19 17:20:16 2024 +0200 @@ -19,8 +19,6 @@ <tr><td>FeatureAddress</td></tr> <tr><td>Homepage</td></tr> <tr><td>Program</td></tr> -<tr><td>Version</td></tr> -<tr><td>VersionOnly</td></tr> </table> <h3>Classes</h3>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Documentation/Source/eric7.__version__.html Sun May 19 17:20:16 2024 +0200 @@ -0,0 +1,31 @@ +<!DOCTYPE html> +<html><head> +<title>eric7.__version__</title> +<meta charset="UTF-8"> +<link rel="stylesheet" href="styles.css"> +</head> +<body> +<a NAME="top" ID="top"></a> +<h1>eric7.__version__</h1> +<p> +Module containing some eric-ide version information. +</p> + +<h3>Global Attributes</h3> +<table> +<tr><td>Version</td></tr> +<tr><td>VersionOnly</td></tr> +</table> + +<h3>Classes</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> + +<hr /> +</body></html>
--- a/src/eric7/Documentation/Source/index-eric7.html Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/Documentation/Source/index-eric7.html Sun May 19 17:20:16 2024 +0200 @@ -216,6 +216,10 @@ <td>Main script to enable starting eric7 with 'python -m eric7'.</td> </tr> <tr> +<td><a href="eric7.__version__.html">__version__</a></td> +<td>Module containing some eric-ide version information.</td> +</tr> +<tr> <td><a href="eric7.eric7_api.html">eric7_api</a></td> <td>eric API Generator.</td> </tr>
--- a/src/eric7/Network/IRC/IrcChannelWidget.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/Network/IRC/IrcChannelWidget.py Sun May 19 17:20:16 2024 +0200 @@ -36,7 +36,8 @@ from eric7.EricWidgets import EricFileDialog, EricMessageBox from eric7.EricWidgets.EricApplication import ericApp from eric7.SystemUtilities import OSUtilities -from eric7.UI.Info import Copyright, Version +from eric7.UI.Info import Copyright +from eric7.__version__ import Version from .IrcUtilities import getChannelModesDict, ircFilter, ircTimestamp from .Ui_IrcChannelWidget import Ui_IrcChannelWidget
--- a/src/eric7/Network/IRC/IrcWidget.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/Network/IRC/IrcWidget.py Sun May 19 17:20:16 2024 +0200 @@ -31,7 +31,8 @@ from eric7.EricGui import EricPixmapCache from eric7.EricWidgets import EricMessageBox from eric7.SystemUtilities import OSUtilities -from eric7.UI.Info import Copyright, Version +from eric7.UI.Info import Copyright +from eric7.__version__ import Version from .IrcNetworkManager import IrcNetworkManager from .Ui_IrcWidget import Ui_IrcWidget
--- a/src/eric7/Plugins/AboutPlugin/AboutDialog.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/Plugins/AboutPlugin/AboutDialog.py Sun May 19 17:20:16 2024 +0200 @@ -13,10 +13,11 @@ from eric7 import Preferences from eric7.EricGui import EricPixmapCache from eric7.UI import Info +from eric7.__version__ import Version from .Ui_AboutDialog import Ui_AboutDialog -titleText = "<b>{0} - {1}</b>".format(Info.Program, Info.Version) +titleText = "<b>{0} - {1}</b>".format(Info.Program, Version) aboutText = QCoreApplication.translate( "AboutDialog",
--- a/src/eric7/Plugins/PluginAbout.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/Plugins/PluginAbout.py Sun May 19 17:20:16 2024 +0200 @@ -10,6 +10,7 @@ from PyQt6.QtCore import QObject from PyQt6.QtGui import QAction +from eric7.__version__ import VersionOnly from eric7.EricGui import EricPixmapCache from eric7.EricGui.EricAction import EricAction from eric7.EricWidgets import EricMessageBox @@ -21,7 +22,7 @@ "author": "Detlev Offenbach <detlev@die-offenbachs.de>", "autoactivate": True, "deactivateable": True, - "version": Info.VersionOnly, + "version": VersionOnly, "className": "AboutPlugin", "packageName": "__core__", "shortDescription": "Show the About dialogs.",
--- a/src/eric7/Plugins/PluginCodeStyleChecker.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/Plugins/PluginCodeStyleChecker.py Sun May 19 17:20:16 2024 +0200 @@ -13,12 +13,12 @@ from PyQt6.QtCore import QCoreApplication, QObject, pyqtSignal +from eric7.__version__ import VersionOnly from eric7 import Preferences from eric7.EricGui.EricAction import EricAction from eric7.EricWidgets.EricApplication import ericApp from eric7.Project.ProjectBrowserModel import ProjectBrowserFileItem from eric7.SystemUtilities import PythonUtilities -from eric7.UI import Info # Start-Of-Header __header__ = { @@ -26,7 +26,7 @@ "author": "Detlev Offenbach <detlev@die-offenbachs.de>", "autoactivate": True, "deactivateable": True, - "version": Info.VersionOnly, + "version": VersionOnly, "className": "CodeStyleCheckerPlugin", "packageName": "__core__", "shortDescription": "Show the Python Code Style Checker dialog.",
--- a/src/eric7/Plugins/PluginEricapi.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/Plugins/PluginEricapi.py Sun May 19 17:20:16 2024 +0200 @@ -16,7 +16,7 @@ from eric7.EricWidgets.EricApplication import ericApp from eric7.Globals import getConfig from eric7.SystemUtilities import FileSystemUtilities, OSUtilities, PythonUtilities -from eric7.UI import Info +from eric7.__version__ import VersionOnly # Start-Of-Header __header__ = { @@ -24,7 +24,7 @@ "author": "Detlev Offenbach <detlev@die-offenbachs.de>", "autoactivate": True, "deactivateable": True, - "version": Info.VersionOnly, + "version": VersionOnly, "className": "EricapiPlugin", "packageName": "__core__", "shortDescription": "Show the Ericapi dialogs.",
--- a/src/eric7/Plugins/PluginEricdoc.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/Plugins/PluginEricdoc.py Sun May 19 17:20:16 2024 +0200 @@ -22,7 +22,7 @@ PythonUtilities, QtUtilities, ) -from eric7.UI import Info +from eric7.__version__ import VersionOnly # Start-Of-Header __header__ = { @@ -30,7 +30,7 @@ "author": "Detlev Offenbach <detlev@die-offenbachs.de>", "autoactivate": True, "deactivateable": True, - "version": Info.VersionOnly, + "version": VersionOnly, "className": "EricdocPlugin", "packageName": "__core__", "shortDescription": "Show the Ericdoc dialogs.",
--- a/src/eric7/Plugins/PluginSyntaxChecker.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/Plugins/PluginSyntaxChecker.py Sun May 19 17:20:16 2024 +0200 @@ -17,7 +17,7 @@ from eric7.EricWidgets.EricApplication import ericApp from eric7.Globals import getConfig from eric7.Project.ProjectBrowserModel import ProjectBrowserFileItem -from eric7.UI import Info +from eric7.__version__ import VersionOnly # Start-Of-Header __header__ = { @@ -25,7 +25,7 @@ "author": "Detlev Offenbach <detlev@die-offenbachs.de>", "autoactivate": True, "deactivateable": True, - "version": Info.VersionOnly, + "version": VersionOnly, "className": "SyntaxCheckerPlugin", "packageName": "__core__", "shortDescription": "Show the Syntax Checker dialog.",
--- a/src/eric7/Plugins/PluginTranslator.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/Plugins/PluginTranslator.py Sun May 19 17:20:16 2024 +0200 @@ -14,7 +14,7 @@ from eric7 import Preferences from eric7.EricWidgets.EricApplication import ericApp from eric7.Plugins.UiExtensionPlugins.Translator.Translator import Translator -from eric7.UI import Info +from eric7.__version__ import VersionOnly # Start-Of-Header __header__ = { @@ -22,7 +22,7 @@ "author": "Detlev Offenbach <detlev@die-offenbachs.de>", "autoactivate": True, "deactivateable": True, - "version": Info.VersionOnly, + "version": VersionOnly, "className": "TranslatorPlugin", "packageName": "__core__", "shortDescription": "Translation utility using various translators.",
--- a/src/eric7/Plugins/PluginVcsGit.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/Plugins/PluginVcsGit.py Sun May 19 17:20:16 2024 +0200 @@ -17,7 +17,7 @@ from eric7.Plugins.VcsPlugins.vcsGit.GitUtilities import getConfigPath from eric7.Preferences.Shortcuts import readShortcuts from eric7.SystemUtilities import FileSystemUtilities, OSUtilities -from eric7.UI import Info +from eric7.__version__ import VersionOnly # Start-Of-Header __header__ = { @@ -25,7 +25,7 @@ "author": "Detlev Offenbach <detlev@die-offenbachs.de>", "autoactivate": False, "deactivateable": True, - "version": Info.VersionOnly, + "version": VersionOnly, "pluginType": "version_control", "pluginTypename": "Git", "className": "VcsGitPlugin",
--- a/src/eric7/Plugins/PluginVcsMercurial.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/Plugins/PluginVcsMercurial.py Sun May 19 17:20:16 2024 +0200 @@ -20,7 +20,7 @@ ) from eric7.Preferences.Shortcuts import readShortcuts from eric7.SystemUtilities import FileSystemUtilities -from eric7.UI import Info +from eric7.__version__ import VersionOnly # Start-Of-Header __header__ = { @@ -28,7 +28,7 @@ "author": "Detlev Offenbach <detlev@die-offenbachs.de>", "autoactivate": False, "deactivateable": True, - "version": Info.VersionOnly, + "version": VersionOnly, "pluginType": "version_control", "pluginTypename": "Mercurial", "className": "VcsMercurialPlugin",
--- a/src/eric7/Plugins/PluginVcsPySvn.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/Plugins/PluginVcsPySvn.py Sun May 19 17:20:16 2024 +0200 @@ -17,7 +17,7 @@ from eric7.EricWidgets.EricApplication import ericApp from eric7.Plugins.VcsPlugins.vcsPySvn.SvnUtilities import getConfigPath, getServersPath from eric7.Preferences.Shortcuts import readShortcuts -from eric7.UI import Info +from eric7.__version__ import VersionOnly # Start-Of-Header __header__ = { @@ -25,7 +25,7 @@ "author": "Detlev Offenbach <detlev@die-offenbachs.de>", "autoactivate": False, "deactivateable": True, - "version": Info.VersionOnly, + "version": VersionOnly, "pluginType": "version_control", "pluginTypename": "PySvn", "className": "VcsPySvnPlugin",
--- a/src/eric7/Plugins/PluginVcsSubversion.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/Plugins/PluginVcsSubversion.py Sun May 19 17:20:16 2024 +0200 @@ -20,7 +20,7 @@ ) from eric7.Preferences.Shortcuts import readShortcuts from eric7.SystemUtilities import FileSystemUtilities, OSUtilities -from eric7.UI import Info +from eric7.__version__ import VersionOnly # Start-Of-Header __header__ = { @@ -28,7 +28,7 @@ "author": "Detlev Offenbach <detlev@die-offenbachs.de>", "autoactivate": False, "deactivateable": True, - "version": Info.VersionOnly, + "version": VersionOnly, "pluginType": "version_control", "pluginTypename": "Subversion", "className": "VcsSubversionPlugin",
--- a/src/eric7/Plugins/PluginVmListspace.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/Plugins/PluginVmListspace.py Sun May 19 17:20:16 2024 +0200 @@ -12,7 +12,7 @@ from PyQt6.QtCore import QT_TRANSLATE_NOOP, QObject from PyQt6.QtGui import QPixmap -from eric7.UI import Info +from eric7.__version__ import VersionOnly # Start-Of-Header __header__ = { @@ -20,7 +20,7 @@ "author": "Detlev Offenbach <detlev@die-offenbachs.de>", "autoactivate": False, "deactivateable": False, - "version": Info.VersionOnly, + "version": VersionOnly, "pluginType": "viewmanager", "pluginTypename": "listspace", "displayString": QT_TRANSLATE_NOOP("VmListspacePlugin", "Listspace"),
--- a/src/eric7/Plugins/PluginVmTabview.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/Plugins/PluginVmTabview.py Sun May 19 17:20:16 2024 +0200 @@ -12,7 +12,7 @@ from PyQt6.QtCore import QT_TRANSLATE_NOOP, QObject from PyQt6.QtGui import QPixmap -from eric7.UI import Info +from eric7.__version__ import VersionOnly # Start-Of-Header __header__ = { @@ -20,7 +20,7 @@ "author": "Detlev Offenbach <detlev@die-offenbachs.de>", "autoactivate": False, "deactivateable": False, - "version": Info.VersionOnly, + "version": VersionOnly, "pluginType": "viewmanager", "pluginTypename": "tabview", "displayString": QT_TRANSLATE_NOOP("VmTabviewPlugin", "Tabbed View"),
--- a/src/eric7/Plugins/PluginWizardDotDesktop.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/Plugins/PluginWizardDotDesktop.py Sun May 19 17:20:16 2024 +0200 @@ -13,7 +13,7 @@ from eric7.EricGui.EricAction import EricAction from eric7.EricWidgets import EricMessageBox from eric7.EricWidgets.EricApplication import ericApp -from eric7.UI import Info +from eric7.__version__ import VersionOnly # Start-of-Header __header__ = { @@ -21,7 +21,7 @@ "author": "Detlev Offenbach <detlev@die-offenbachs.de>", "autoactivate": True, "deactivateable": True, - "version": Info.VersionOnly, + "version": VersionOnly, "className": "DotDesktopWizard", "packageName": "__core__", "shortDescription": "Wizard for the creation of a .desktop file.",
--- a/src/eric7/Plugins/PluginWizardEricMessageBox.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/Plugins/PluginWizardEricMessageBox.py Sun May 19 17:20:16 2024 +0200 @@ -13,7 +13,7 @@ from eric7.EricGui.EricAction import EricAction from eric7.EricWidgets import EricMessageBox from eric7.EricWidgets.EricApplication import ericApp -from eric7.UI import Info +from eric7.__version__ import VersionOnly # Start-Of-Header __header__ = { @@ -21,7 +21,7 @@ "author": "Detlev Offenbach <detlev@die-offenbachs.de>", "autoactivate": True, "deactivateable": True, - "version": Info.VersionOnly, + "version": VersionOnly, "className": "EricMessageBoxWizard", "packageName": "__core__", "shortDescription": "Show the EricMessageBox wizard.",
--- a/src/eric7/Plugins/PluginWizardEricPlugin.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/Plugins/PluginWizardEricPlugin.py Sun May 19 17:20:16 2024 +0200 @@ -15,7 +15,7 @@ from eric7.EricGui.EricAction import EricAction from eric7.EricWidgets import EricMessageBox from eric7.EricWidgets.EricApplication import ericApp -from eric7.UI import Info +from eric7.__version__ import VersionOnly # Start-of-Header __header__ = { @@ -23,7 +23,7 @@ "author": "Detlev Offenbach <detlev@die-offenbachs.de>", "autoactivate": True, "deactivateable": True, - "version": Info.VersionOnly, + "version": VersionOnly, "className": "WizardEricPluginWizard", "packageName": "__core__", "shortDescription": "Wizard for the creation of an eric plug-in file.",
--- a/src/eric7/Plugins/PluginWizardPyRegExp.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/Plugins/PluginWizardPyRegExp.py Sun May 19 17:20:16 2024 +0200 @@ -13,7 +13,7 @@ from eric7.EricGui.EricAction import EricAction from eric7.EricWidgets import EricMessageBox from eric7.EricWidgets.EricApplication import ericApp -from eric7.UI import Info +from eric7.__version__ import VersionOnly # Start-Of-Header __header__ = { @@ -21,7 +21,7 @@ "author": "Detlev Offenbach <detlev@die-offenbachs.de>", "autoactivate": True, "deactivateable": True, - "version": Info.VersionOnly, + "version": VersionOnly, "className": "PyRegExpWizard", "packageName": "__core__", "shortDescription": "Show the Python re wizard.",
--- a/src/eric7/Plugins/PluginWizardQColorDialog.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/Plugins/PluginWizardQColorDialog.py Sun May 19 17:20:16 2024 +0200 @@ -13,7 +13,7 @@ from eric7.EricGui.EricAction import EricAction from eric7.EricWidgets import EricMessageBox from eric7.EricWidgets.EricApplication import ericApp -from eric7.UI import Info +from eric7.__version__ import VersionOnly # Start-Of-Header __header__ = { @@ -21,7 +21,7 @@ "author": "Detlev Offenbach <detlev@die-offenbachs.de>", "autoactivate": True, "deactivateable": True, - "version": Info.VersionOnly, + "version": VersionOnly, "className": "ColorDialogWizard", "packageName": "__core__", "shortDescription": "Show the QColorDialog wizard.",
--- a/src/eric7/Plugins/PluginWizardQFileDialog.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/Plugins/PluginWizardQFileDialog.py Sun May 19 17:20:16 2024 +0200 @@ -15,7 +15,7 @@ from eric7.EricGui.EricAction import EricAction from eric7.EricWidgets import EricMessageBox from eric7.EricWidgets.EricApplication import ericApp -from eric7.UI import Info +from eric7.__version__ import VersionOnly # Start-Of-Header __header__ = { @@ -23,7 +23,7 @@ "author": "Detlev Offenbach <detlev@die-offenbachs.de>", "autoactivate": True, "deactivateable": True, - "version": Info.VersionOnly, + "version": VersionOnly, "className": "FileDialogWizard", "packageName": "__core__", "shortDescription": "Show the QFileDialog wizard.",
--- a/src/eric7/Plugins/PluginWizardQFontDialog.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/Plugins/PluginWizardQFontDialog.py Sun May 19 17:20:16 2024 +0200 @@ -13,7 +13,7 @@ from eric7.EricGui.EricAction import EricAction from eric7.EricWidgets import EricMessageBox from eric7.EricWidgets.EricApplication import ericApp -from eric7.UI import Info +from eric7.__version__ import VersionOnly # Start-Of-Header __header__ = { @@ -21,7 +21,7 @@ "author": "Detlev Offenbach <detlev@die-offenbachs.de>", "autoactivate": True, "deactivateable": True, - "version": Info.VersionOnly, + "version": VersionOnly, "className": "FontDialogWizard", "packageName": "__core__", "shortDescription": "Show the QFontDialog wizard.",
--- a/src/eric7/Plugins/PluginWizardQInputDialog.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/Plugins/PluginWizardQInputDialog.py Sun May 19 17:20:16 2024 +0200 @@ -13,7 +13,7 @@ from eric7.EricGui.EricAction import EricAction from eric7.EricWidgets import EricMessageBox from eric7.EricWidgets.EricApplication import ericApp -from eric7.UI import Info +from eric7.__version__ import VersionOnly # Start-Of-Header __header__ = { @@ -21,7 +21,7 @@ "author": "Detlev Offenbach <detlev@die-offenbachs.de>", "autoactivate": True, "deactivateable": True, - "version": Info.VersionOnly, + "version": VersionOnly, "className": "InputDialogWizard", "packageName": "__core__", "shortDescription": "Show the QInputDialog wizard.",
--- a/src/eric7/Plugins/PluginWizardQMessageBox.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/Plugins/PluginWizardQMessageBox.py Sun May 19 17:20:16 2024 +0200 @@ -13,7 +13,7 @@ from eric7.EricGui.EricAction import EricAction from eric7.EricWidgets import EricMessageBox from eric7.EricWidgets.EricApplication import ericApp -from eric7.UI import Info +from eric7.__version__ import VersionOnly # Start-Of-Header __header__ = { @@ -21,7 +21,7 @@ "author": "Detlev Offenbach <detlev@die-offenbachs.de>", "autoactivate": True, "deactivateable": True, - "version": Info.VersionOnly, + "version": VersionOnly, "className": "MessageBoxWizard", "packageName": "__core__", "shortDescription": "Show the QMessageBox wizard.",
--- a/src/eric7/Plugins/PluginWizardQRegularExpression.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/Plugins/PluginWizardQRegularExpression.py Sun May 19 17:20:16 2024 +0200 @@ -13,7 +13,7 @@ from eric7.EricGui.EricAction import EricAction from eric7.EricWidgets import EricMessageBox from eric7.EricWidgets.EricApplication import ericApp -from eric7.UI import Info +from eric7.__version__ import VersionOnly # Start-Of-Header __header__ = { @@ -21,7 +21,7 @@ "author": "Detlev Offenbach <detlev@die-offenbachs.de>", "autoactivate": True, "deactivateable": True, - "version": Info.VersionOnly, + "version": VersionOnly, "className": "QRegularExpressionWizard", "packageName": "__core__", "shortDescription": "Show the QRegularExpression wizard.",
--- a/src/eric7/Plugins/PluginWizardSetup.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/Plugins/PluginWizardSetup.py Sun May 19 17:20:16 2024 +0200 @@ -14,7 +14,7 @@ from eric7.EricGui.EricAction import EricAction from eric7.EricWidgets import EricMessageBox from eric7.EricWidgets.EricApplication import ericApp -from eric7.UI import Info +from eric7.__version__ import VersionOnly # Start-of-Header __header__ = { @@ -22,7 +22,7 @@ "author": "Detlev Offenbach <detlev@die-offenbachs.de>", "autoactivate": True, "deactivateable": True, - "version": Info.VersionOnly, + "version": VersionOnly, "className": "SetupWizard", "packageName": "__core__", "shortDescription": "Wizard for the creation of a setup.py file.",
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditEditor.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditEditor.py Sun May 19 17:20:16 2024 +0200 @@ -29,7 +29,7 @@ @return created argument parser object @rtype argparse.ArgumentParser """ - from eric7.UI.Info import Version + from eric7.__version__ import Version # 1. create the argument parser parser = argparse.ArgumentParser(
--- a/src/eric7/Tools/TrayStarter.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/Tools/TrayStarter.py Sun May 19 17:20:16 2024 +0200 @@ -23,7 +23,8 @@ from eric7.EricWidgets import EricMessageBox from eric7.EricWidgets.EricApplication import ericApp from eric7.SystemUtilities import DesktopUtilities, FileSystemUtilities, PythonUtilities -from eric7.UI.Info import Program, Version +from eric7.UI.Info import Program +from eric7.__version__ import Version class TrayStarter(QSystemTrayIcon):
--- a/src/eric7/UI/Info.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/UI/Info.py Sun May 19 17:20:16 2024 +0200 @@ -9,8 +9,6 @@ Program = "eric7" -Version = "@@VERSION@@ (rev. @@REVISION@@)" -VersionOnly = "99.0.0" Copyright = "Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de>" CopyrightShort = "(c) 2002 - 2024 Detlev Offenbach" BugAddress = "eric-bugs@eric-ide.python-projects.org"
--- a/src/eric7/UI/UserInterface.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/UI/UserInterface.py Sun May 19 17:20:16 2024 +0200 @@ -98,10 +98,12 @@ from eric7.Testing.TestingWidget import clearSavedHistories from eric7.Utilities.BackgroundService import BackgroundService from eric7.VirtualEnv.VirtualenvManager import VirtualenvManager - -from .Info import BugAddress, FeatureAddress, Program, Version, VersionOnly +from eric7.__version__ import Version, VersionOnly + +from .Info import BugAddress, FeatureAddress, Program from .NotificationWidget import NotificationTypes + try: from eric7.EricNetwork.EricSslErrorHandler import ( EricSslErrorHandler,
--- a/src/eric7/Utilities/__init__.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/Utilities/__init__.py Sun May 19 17:20:16 2024 +0200 @@ -34,9 +34,10 @@ ) from eric7 import Preferences +from eric7.__version__ import Version from eric7.EricWidgets.EricApplication import ericApp from eric7.SystemUtilities import DesktopUtilities, OSUtilities -from eric7.UI.Info import Program, Version +from eric7.UI.Info import Program def __showwarning(
--- a/src/eric7/WebBrowser/WebBrowserArgumentsCreator.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/WebBrowser/WebBrowserArgumentsCreator.py Sun May 19 17:20:16 2024 +0200 @@ -21,7 +21,7 @@ @return created argument parser object @rtype argparse.ArgumentParser """ - from eric7.UI.Info import Version + from eric7.__version__ import Version # 1. create the argument parser parser = argparse.ArgumentParser(
--- a/src/eric7/WebBrowser/WebBrowserView.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/WebBrowser/WebBrowserView.py Sun May 19 17:20:16 2024 +0200 @@ -53,9 +53,10 @@ from eric7.EricWidgets import EricFileDialog, EricMessageBox from eric7.EricWidgets.EricApplication import ericApp from eric7.SystemUtilities import FileSystemUtilities, OSUtilities -from eric7.UI.Info import Homepage, VersionOnly +from eric7.UI.Info import Homepage from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow from eric7.WebBrowser.ZoomManager import ZoomManager +from eric7.__version__ import VersionOnly from . import WebInspector from .Tools import Scripts, WebBrowserTools
--- a/src/eric7/WebBrowser/WebBrowserWindow.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/WebBrowser/WebBrowserWindow.py Sun May 19 17:20:16 2024 +0200 @@ -84,7 +84,7 @@ PythonUtilities, QtUtilities, ) -from eric7.UI.Info import Version +from eric7.__version__ import Version from eric7.UI.NotificationWidget import NotificationTypes from eric7.WebBrowser.Tools import WebIconProvider from eric7.WebBrowser.ZoomManager import ZoomManager
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/__version__.py Sun May 19 17:20:16 2024 +0200 @@ -0,0 +1,11 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module containing some eric-ide version information. +""" + +Version = "@@VERSION@@ (rev. @@REVISION@@)" +VersionOnly = "99.0.0"
--- a/src/eric7/eric7_api.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/eric7_api.py Sun May 19 17:20:16 2024 +0200 @@ -21,7 +21,7 @@ from eric7 import DocumentationTools from eric7.DocumentationTools.APIGenerator import APIGenerator from eric7.SystemUtilities import FileSystemUtilities, OSUtilities -from eric7.UI.Info import Version +from eric7.__version__ import Version from eric7.Utilities import ModuleParser
--- a/src/eric7/eric7_compare.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/eric7_compare.py Sun May 19 17:20:16 2024 +0200 @@ -26,7 +26,7 @@ @return created argument parser object @rtype argparse.ArgumentParser """ - from eric7.UI.Info import Version + from eric7.__version__ import Version # 1. create the argument parser parser = argparse.ArgumentParser(
--- a/src/eric7/eric7_configure.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/eric7_configure.py Sun May 19 17:20:16 2024 +0200 @@ -24,7 +24,7 @@ @return created argument parser object @rtype argparse.ArgumentParser """ - from eric7.UI.Info import Version + from eric7.__version__ import Version # 1. create the argument parser parser = argparse.ArgumentParser(
--- a/src/eric7/eric7_diff.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/eric7_diff.py Sun May 19 17:20:16 2024 +0200 @@ -26,7 +26,7 @@ @return created argument parser object @rtype argparse.ArgumentParser """ - from eric7.UI.Info import Version + from eric7.__version__ import Version # 1. create the argument parser parser = argparse.ArgumentParser(
--- a/src/eric7/eric7_doc.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/eric7_doc.py Sun May 19 17:20:16 2024 +0200 @@ -25,7 +25,7 @@ from eric7.DocumentationTools.ModuleDocumentor import ModuleDocument from eric7.DocumentationTools.QtHelpGenerator import QtHelpGenerator from eric7.SystemUtilities import FileSystemUtilities, OSUtilities -from eric7.UI.Info import Version +from eric7.__version__ import Version from eric7.Utilities import ModuleParser # list of supported filename extensions
--- a/src/eric7/eric7_editor.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/eric7_editor.py Sun May 19 17:20:16 2024 +0200 @@ -26,7 +26,7 @@ @return created argument parser object @rtype argparse.ArgumentParser """ - from eric7.UI.Info import Version + from eric7.__version__ import Version # 1. create the argument parser parser = argparse.ArgumentParser(
--- a/src/eric7/eric7_hexeditor.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/eric7_hexeditor.py Sun May 19 17:20:16 2024 +0200 @@ -26,7 +26,7 @@ @return created argument parser object @rtype argparse.ArgumentParser """ - from eric7.UI.Info import Version + from eric7.__version__ import Version # 1. create the argument parser parser = argparse.ArgumentParser(
--- a/src/eric7/eric7_iconeditor.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/eric7_iconeditor.py Sun May 19 17:20:16 2024 +0200 @@ -26,7 +26,7 @@ @return created argument parser object @rtype argparse.ArgumentParser """ - from eric7.UI.Info import Version + from eric7.__version__ import Version # 1. create the argument parser parser = argparse.ArgumentParser(
--- a/src/eric7/eric7_ide.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/eric7_ide.py Sun May 19 17:20:16 2024 +0200 @@ -67,7 +67,7 @@ @return created argument parser object @rtype argparse.ArgumentParser """ - from eric7.UI.Info import Version + from eric7.__version__ import Version # 1. create the argument parser parser = argparse.ArgumentParser(
--- a/src/eric7/eric7_mpy.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/eric7_mpy.py Sun May 19 17:20:16 2024 +0200 @@ -24,7 +24,7 @@ @return created argument parser object @rtype argparse.ArgumentParser """ - from eric7.UI.Info import Version + from eric7.__version__ import Version # 1. create the argument parser parser = argparse.ArgumentParser(
--- a/src/eric7/eric7_pdf.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/eric7_pdf.py Sun May 19 17:20:16 2024 +0200 @@ -26,7 +26,7 @@ @return created argument parser object @rtype argparse.ArgumentParser """ - from eric7.UI.Info import Version + from eric7.__version__ import Version # 1. create the argument parser parser = argparse.ArgumentParser(
--- a/src/eric7/eric7_pip.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/eric7_pip.py Sun May 19 17:20:16 2024 +0200 @@ -25,7 +25,7 @@ @return created argument parser object @rtype argparse.ArgumentParser """ - from eric7.UI.Info import Version + from eric7.__version__ import Version # 1. create the argument parser parser = argparse.ArgumentParser(
--- a/src/eric7/eric7_plugininstall.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/eric7_plugininstall.py Sun May 19 17:20:16 2024 +0200 @@ -25,7 +25,7 @@ @return created argument parser object @rtype argparse.ArgumentParser """ - from eric7.UI.Info import Version + from eric7.__version__ import Version # 1. create the argument parser parser = argparse.ArgumentParser(
--- a/src/eric7/eric7_pluginrepository.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/eric7_pluginrepository.py Sun May 19 17:20:16 2024 +0200 @@ -25,7 +25,7 @@ @return created argument parser object @rtype argparse.ArgumentParser """ - from eric7.UI.Info import Version + from eric7.__version__ import Version # 1. create the argument parser parser = argparse.ArgumentParser(
--- a/src/eric7/eric7_pluginuninstall.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/eric7_pluginuninstall.py Sun May 19 17:20:16 2024 +0200 @@ -25,7 +25,7 @@ @return created argument parser object @rtype argparse.ArgumentParser """ - from eric7.UI.Info import Version + from eric7.__version__ import Version # 1. create the argument parser parser = argparse.ArgumentParser(
--- a/src/eric7/eric7_qregularexpression.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/eric7_qregularexpression.py Sun May 19 17:20:16 2024 +0200 @@ -26,7 +26,7 @@ @return created argument parser object @rtype argparse.ArgumentParser """ - from eric7.UI.Info import Version + from eric7.__version__ import Version # 1. create the argument parser parser = argparse.ArgumentParser(
--- a/src/eric7/eric7_re.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/eric7_re.py Sun May 19 17:20:16 2024 +0200 @@ -26,7 +26,7 @@ @return created argument parser object @rtype argparse.ArgumentParser """ - from eric7.UI.Info import Version + from eric7.__version__ import Version # 1. create the argument parser parser = argparse.ArgumentParser(
--- a/src/eric7/eric7_shell.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/eric7_shell.py Sun May 19 17:20:16 2024 +0200 @@ -27,7 +27,7 @@ @return created argument parser object @rtype argparse.ArgumentParser """ - from eric7.UI.Info import Version + from eric7.__version__ import Version # 1. create the argument parser parser = argparse.ArgumentParser(
--- a/src/eric7/eric7_snap.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/eric7_snap.py Sun May 19 17:20:16 2024 +0200 @@ -25,7 +25,7 @@ @return created argument parser object @rtype argparse.ArgumentParser """ - from eric7.UI.Info import Version + from eric7.__version__ import Version # 1. create the argument parser parser = argparse.ArgumentParser(
--- a/src/eric7/eric7_sqlbrowser.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/eric7_sqlbrowser.py Sun May 19 17:20:16 2024 +0200 @@ -25,7 +25,7 @@ @return created argument parser object @rtype argparse.ArgumentParser """ - from eric7.UI.Info import Version + from eric7.__version__ import Version # 1. create the argument parser parser = argparse.ArgumentParser(
--- a/src/eric7/eric7_testing.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/eric7_testing.py Sun May 19 17:20:16 2024 +0200 @@ -26,7 +26,7 @@ @return created argument parser object @rtype argparse.ArgumentParser """ - from eric7.UI.Info import Version + from eric7.__version__ import Version # 1. create the argument parser parser = argparse.ArgumentParser(
--- a/src/eric7/eric7_tray.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/eric7_tray.py Sun May 19 17:20:16 2024 +0200 @@ -26,7 +26,7 @@ @return created argument parser object @rtype argparse.ArgumentParser """ - from eric7.UI.Info import Version + from eric7.__version__ import Version # 1. create the argument parser parser = argparse.ArgumentParser(
--- a/src/eric7/eric7_trpreviewer.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/eric7_trpreviewer.py Sun May 19 17:20:16 2024 +0200 @@ -26,7 +26,7 @@ @return created argument parser object @rtype argparse.ArgumentParser """ - from eric7.UI.Info import Version + from eric7.__version__ import Version # 1. create the argument parser parser = argparse.ArgumentParser(
--- a/src/eric7/eric7_uipreviewer.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/eric7_uipreviewer.py Sun May 19 17:20:16 2024 +0200 @@ -26,7 +26,7 @@ @return created argument parser object @rtype argparse.ArgumentParser """ - from eric7.UI.Info import Version + from eric7.__version__ import Version # 1. create the argument parser parser = argparse.ArgumentParser(
--- a/src/eric7/eric7_virtualenv.py Sat May 18 18:15:51 2024 +0200 +++ b/src/eric7/eric7_virtualenv.py Sun May 19 17:20:16 2024 +0200 @@ -25,7 +25,7 @@ @return created argument parser object @rtype argparse.ArgumentParser """ - from eric7.UI.Info import Version + from eric7.__version__ import Version # 1. create the argument parser parser = argparse.ArgumentParser(