Mercurial Repositories > cx_freeze Packager / changeset

diff -r 4df5e67b084b -r 9e20ee9c7ca2 ChangeLog
--- a/ChangeLog	Wed Sep 21 16:47:33 2022 +0200
+++ b/ChangeLog	Tue Oct 25 09:03:26 2022 +0200
@@ -1,5 +1,8 @@
 ChangeLog
 ---------
+Version 10.1.0
+- adapted the import statements to the new structure
+
 Version 10.0.0:
 - first release of the eric7 variant
 

diff -r 4df5e67b084b -r 9e20ee9c7ca2 CxFreeze/CxfreezeConfigDialog.py
--- a/CxFreeze/CxfreezeConfigDialog.py	Wed Sep 21 16:47:33 2022 +0200
+++ b/CxFreeze/CxfreezeConfigDialog.py	Tue Oct 25 09:03:26 2022 +0200
@@ -15,14 +15,17 @@
 from PyQt6.QtCore import pyqtSlot, QDir, QProcess
 from PyQt6.QtWidgets import QDialog, QListWidgetItem
 
-from EricWidgets.EricPathPicker import EricPathPickerModes
-from EricWidgets.EricDirFileDialog import EricDirFileDialog
+from eric7 import Utilities
+
+try:
+    from eric7.EricGui import EricPixmapCache
+except ImportError:
+    from UI import PixmapCache as EricPixmapCache
+from eric7.EricWidgets.EricDirFileDialog import EricDirFileDialog
+from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
 
 from .Ui_CxfreezeConfigDialog import Ui_CxfreezeConfigDialog
 
-import Utilities
-import UI.PixmapCache
-
 
 class CxfreezeConfigDialog(QDialog, Ui_CxfreezeConfigDialog):
     """
@@ -45,7 +48,7 @@
         QDialog.__init__(self, parent)
         self.setupUi(self)
 
-        self.selectFileOrFolderButton.setIcon(UI.PixmapCache.getIcon("open.png"))
+        self.selectFileOrFolderButton.setIcon(EricPixmapCache.getIcon("open.png"))
 
         self.targetDirPicker.setMode(EricPathPickerModes.DIRECTORY_MODE)
         self.targetDirPicker.setWindowTitle(self.tr("Select target directory"))

diff -r 4df5e67b084b -r 9e20ee9c7ca2 CxFreeze/CxfreezeConfigDialog.ui
--- a/CxFreeze/CxfreezeConfigDialog.ui	Wed Sep 21 16:47:33 2022 +0200
+++ b/CxFreeze/CxfreezeConfigDialog.ui	Tue Oct 25 09:03:26 2022 +0200
@@ -485,7 +485,7 @@
   <customwidget>
    <class>EricPathPicker</class>
    <extends>QWidget</extends>
-   <header>EricWidgets/EricPathPicker.h</header>
+   <header>eric7/EricWidgets/EricPathPicker.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

diff -r 4df5e67b084b -r 9e20ee9c7ca2 CxFreeze/CxfreezeExecDialog.py
--- a/CxFreeze/CxfreezeExecDialog.py	Wed Sep 21 16:47:33 2022 +0200
+++ b/CxFreeze/CxfreezeExecDialog.py	Tue Oct 25 09:03:26 2022 +0200
@@ -15,12 +15,11 @@
 from PyQt6.QtCore import pyqtSlot, QProcess, QTimer, QThread, pyqtSignal
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QAbstractButton
 
-from EricWidgets import EricMessageBox
+from eric7 import Preferences
+from eric7.EricWidgets import EricMessageBox
 
 from .Ui_CxfreezeExecDialog import Ui_CxfreezeExecDialog
 
-import Preferences
-
 
 class CxfreezeExecDialog(QDialog, Ui_CxfreezeExecDialog):
     """

diff -r 4df5e67b084b -r 9e20ee9c7ca2 PluginCxFreeze.epj
--- a/PluginCxFreeze.epj	Wed Sep 21 16:47:33 2022 +0200
+++ b/PluginCxFreeze.epj	Tue Oct 25 09:03:26 2022 +0200
@@ -193,7 +193,7 @@
     ],
     "OTHERTOOLSPARMS": {
       "Black": {
-        "exclude": "/(\\.direnv|\\.eggs|\\.git|\\.hg|\\.mypy_cache|\\.nox|\\.tox|\\.venv|venv|\\.svn|_build|buck-out|build|dist|__pypackages__)/",
+        "exclude": "/(\\.direnv|\\.eggs|\\.git|\\.hg|\\.mypy_cache|\\.nox|\\.tox|\\.venv|venv|\\.svn|\\.ipynb_checkpoints|_build|buck-out|build|dist|__pypackages__)/",
         "extend-exclude": "",
         "force-exclude": "",
         "line-length": 88,
@@ -252,6 +252,7 @@
       "CxFreeze/i18n/cxfreeze_ru.ts"
     ],
     "TRANSLATIONSBINPATH": "",
+    "TRANSLATIONSOURCESTARTPATH": "",
     "UICPARAMS": {
       "Package": "",
       "PackagesRoot": "",

diff -r 4df5e67b084b -r 9e20ee9c7ca2 PluginCxFreeze.py
--- a/PluginCxFreeze.py	Wed Sep 21 16:47:33 2022 +0200
+++ b/PluginCxFreeze.py	Tue Oct 25 09:03:26 2022 +0200
@@ -13,18 +13,17 @@
 from PyQt6.QtCore import QObject, QTranslator, QCoreApplication, QProcess
 from PyQt6.QtWidgets import QDialog
 
-from EricWidgets import EricMessageBox
-from EricGui.EricAction import EricAction
-from EricWidgets.EricApplication import ericApp
-
-import Utilities
+from eric7 import Utilities
+from eric7.EricGui.EricAction import EricAction
+from eric7.EricWidgets import EricMessageBox
+from eric7.EricWidgets.EricApplication import ericApp
 
 # Start-of-Header
 name = "CxFreeze Plugin"
 author = "Detlev Offenbach <detlev@die-offenbachs.de>"
 autoactivate = True
 deactivateable = True
-version = "10.0.0"
+version = "10.1.0"
 className = "CxFreezePlugin"
 packageName = "CxFreeze"
 shortDescription = "Show the CxFreeze dialogs."

diff -r 4df5e67b084b -r 9e20ee9c7ca2 PluginCxFreeze.zip
Binary file PluginCxFreeze.zip has changed