Mercurial Repositories > eric / file comparison
comparison: VirtualEnv/VirtualenvManager.py
VirtualEnv/VirtualenvManager.py
- branch
- conda
- changeset 6672
- 2af01e538c57
- parent 6645
- ad476851d7e0
- child 6676
- 536ad4fa35aa
equal
deleted
inserted
replaced
| 6671:8baaf3bce895 | 6672:2af01e538c57 |
|---|---|
| 144 from .VirtualenvConfigurationDialog import \ | 144 from .VirtualenvConfigurationDialog import \ |
| 145 VirtualenvConfigurationDialog | 145 VirtualenvConfigurationDialog |
| 146 | 146 |
| 147 dlg = VirtualenvConfigurationDialog() | 147 dlg = VirtualenvConfigurationDialog() |
| 148 if dlg.exec_() == QDialog.Accepted: | 148 if dlg.exec_() == QDialog.Accepted: |
| 149 (pyvenv, args, name, openTarget, createLog, createScript, | 149 resultDict = dlg.getData() |
| 150 targetDir, interpreter) = dlg.getData() | 150 ## (pyvenv, args, name, openTarget, createLog, createScript, |
| 151 ## targetDir, interpreter) = dlg.getData() | |
| 151 | 152 |
| 152 # now do the call | 153 if resultDict["envType"] == "conda": |
| 153 from .VirtualenvExecDialog import VirtualenvExecDialog | 154 # TODO: add call to the conda exec dialog |
| 154 dia = VirtualenvExecDialog(pyvenv, targetDir, name, openTarget, | 155 pass |
| 155 createLog, createScript, interpreter, | 156 else: |
| 156 self) | 157 # now do the call |
| 158 from .VirtualenvExecDialog import VirtualenvExecDialog | |
| 159 dia = VirtualenvExecDialog(resultDict, self) | |
| 160 ## dia = VirtualenvExecDialog(pyvenv, targetDir, name, openTarget, | |
| 161 ## createLog, createScript, interpreter, | |
| 162 ## self) | |
| 157 dia.show() | 163 dia.show() |
| 158 dia.start(args) | 164 dia.start(resultDict["arguments"]) |
| 159 dia.exec_() | 165 dia.exec_() |
| 160 | 166 |
| 161 def addVirtualEnv(self, venvName, venvDirectory, venvInterpreter="", | 167 def addVirtualEnv(self, venvName, venvDirectory, venvInterpreter="", |
| 162 venvVariant=3, isGlobal=False, isConda=False, | 168 venvVariant=3, isGlobal=False, isConda=False, |
| 163 execPath=""): | 169 execPath=""): |
