Mercurial Repositories > eric / file comparison
comparison: VirtualEnv/VirtualenvManager.py
VirtualEnv/VirtualenvManager.py
- branch
- conda
- changeset 6677
- 6299d69a218a
- parent 6676
- 536ad4fa35aa
- child 6696
- 706185900558
equal
deleted
inserted
replaced
| 6676:536ad4fa35aa | 6677:6299d69a218a |
|---|---|
| 150 resultDict = dlg.getData() | 150 resultDict = dlg.getData() |
| 151 ## (pyvenv, args, name, openTarget, createLog, createScript, | 151 ## (pyvenv, args, name, openTarget, createLog, createScript, |
| 152 ## targetDir, interpreter) = dlg.getData() | 152 ## targetDir, interpreter) = dlg.getData() |
| 153 | 153 |
| 154 if resultDict["envType"] == "conda": | 154 if resultDict["envType"] == "conda": |
| 155 # TODO: add call to the conda exec dialog | 155 from CondaInterface.CondaExecDialog import CondaExecDialog |
| 156 pass | 156 dia = CondaExecDialog(resultDict, self) |
| 157 else: | 157 else: |
| 158 # now do the call | 158 # now do the call |
| 159 from .VirtualenvExecDialog import VirtualenvExecDialog | 159 from .VirtualenvExecDialog import VirtualenvExecDialog |
| 160 dia = VirtualenvExecDialog(resultDict, self) | 160 dia = VirtualenvExecDialog(resultDict, self) |
| 161 dia.show() | 161 dia.show() |
| 191 self.tr("""A virtual environment named <b>{0}</b> exists""" | 191 self.tr("""A virtual environment named <b>{0}</b> exists""" |
| 192 """ already. Shall it be replaced?""") | 192 """ already. Shall it be replaced?""") |
| 193 .format(venvName), | 193 .format(venvName), |
| 194 icon=E5MessageBox.Warning) | 194 icon=E5MessageBox.Warning) |
| 195 if not ok: | 195 if not ok: |
| 196 return | 196 from .VirtualenvNameDialog import VirtualenvNameDialog |
| 197 dlg = VirtualenvNameDialog( | |
| 198 list(self.__virtualEnvironments.keys()), | |
| 199 venvName) | |
| 200 if dlg.exec_() != QDialog.Accepted: | |
| 201 return | |
| 202 | |
| 203 venvName = dlg.getName() | |
| 197 | 204 |
| 198 if not venvInterpreter: | 205 if not venvInterpreter: |
| 199 from .VirtualenvInterpreterSelectionDialog import \ | 206 from .VirtualenvInterpreterSelectionDialog import \ |
| 200 VirtualenvInterpreterSelectionDialog | 207 VirtualenvInterpreterSelectionDialog |
| 201 dlg = VirtualenvInterpreterSelectionDialog(venvName, venvDirectory) | 208 dlg = VirtualenvInterpreterSelectionDialog(venvName, venvDirectory) |
