Fixed an issue in the refactored virtual environment code. eric7

Fri, 08 Sep 2023 10:16:05 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Fri, 08 Sep 2023 10:16:05 +0200
branch
eric7
changeset 10198
94ab7a21c3ad
parent 10197
065f520d6b8f
child 10199
2cd5ff8e0e0f

Fixed an issue in the refactored virtual environment code.

src/eric7/CondaInterface/CondaPackagesWidget.py file | annotate | diff | comparison | revisions
src/eric7/VirtualEnv/VirtualenvExecDialog.py file | annotate | diff | comparison | revisions
--- a/src/eric7/CondaInterface/CondaPackagesWidget.py	Fri Sep 08 09:55:14 2023 +0200
+++ b/src/eric7/CondaInterface/CondaPackagesWidget.py	Fri Sep 08 10:16:05 2023 +0200
@@ -25,6 +25,7 @@
 from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
 from eric7.EricWidgets import EricFileDialog, EricMessageBox, EricTextInputDialog
 from eric7.EricWidgets.EricApplication import ericApp
+from eric7.VirtualEnv.VirtualenvMeta import VirtualenvMetaData
 
 from .Ui_CondaPackagesWidget import Ui_CondaPackagesWidget
 
@@ -667,9 +668,13 @@
                 ]
                 ok, prefix, interpreter = self.__conda.createCondaEnvironment(args)
                 if ok:
-                    ericApp().getObject("VirtualEnvManager").addVirtualEnv(
-                        virtEnvName, prefix, interpreter, isConda=True
+                    metadata = VirtualenvMetaData(
+                        name=virtEnvName,
+                        path=prefix,
+                        interpreter=interpreter,
+                        is_conda=True,
                     )
+                    ericApp().getObject("VirtualEnvManager").addVirtualEnv(metadata)
 
     @pyqtSlot()
     def __createEnvironment(self):
@@ -689,9 +694,13 @@
             ]
             ok, prefix, interpreter = self.__conda.createCondaEnvironment(args)
             if ok:
-                ericApp().getObject("VirtualEnvManager").addVirtualEnv(
-                    virtEnvName, prefix, interpreter, isConda=True
+                metadata = VirtualenvMetaData(
+                    name=virtEnvName,
+                    path=prefix,
+                    interpreter=interpreter,
+                    is_conda=True,
                 )
+                ericApp().getObject("VirtualEnvManager").addVirtualEnv(metadata)
 
     @pyqtSlot()
     def __deleteEnvironment(self):
--- a/src/eric7/VirtualEnv/VirtualenvExecDialog.py	Fri Sep 08 09:55:14 2023 +0200
+++ b/src/eric7/VirtualEnv/VirtualenvExecDialog.py	Fri Sep 08 10:16:05 2023 +0200
@@ -17,6 +17,7 @@
 from eric7.SystemUtilities import OSUtilities, PythonUtilities
 
 from .Ui_VirtualenvExecDialog import Ui_VirtualenvExecDialog
+from .VirtualenvMeta import VirtualenvMetaData
 
 
 class VirtualenvExecDialog(QDialog, Ui_VirtualenvExecDialog):
@@ -173,7 +174,10 @@
                     QDesktopServices.openUrl(QUrl.fromLocalFile(self.__targetDir))
 
                 if self.__venvManager:
-                    self.__venvManager.addVirtualEnv(self.__venvName, self.__targetDir)
+                    metadata = VirtualenvMetaData(
+                        name=self.__venvName, path=self.__targetDir
+                    )
+                    self.__venvManager.addVirtualEnv(metadata)
 
     def __nextAttempt(self):
         """

eric ide

mercurial