8654:7244c30032d8 | 8655:e8dd241cbfef |
---|---|
296 @rtype bool | 296 @rtype bool |
297 """ | 297 """ |
298 pyqtPackages = [ | 298 pyqtPackages = [ |
299 p for p in packages if p.lower() in [ | 299 p for p in packages if p.lower() in [ |
300 "pyqt6", "pyqt6-sip", "pyqt6-webengine", "pyqt6-charts", | 300 "pyqt6", "pyqt6-sip", "pyqt6-webengine", "pyqt6-charts", |
301 "pyqt6-qscintilla", | 301 "pyqt6-qscintilla", "pyqt6-qt6", "pyqt6-webengine-qt6", |
302 "pyqt6-charts-qt6" | |
302 ] | 303 ] |
303 ] | 304 ] |
304 | 305 |
305 abort = ( | 306 abort = ( |
306 not EricMessageBox.yesNo( | 307 not EricMessageBox.yesNo( |
329 directory | 330 directory |
330 @type bool | 331 @type bool |
331 @return flag indicating a successful execution | 332 @return flag indicating a successful execution |
332 @rtype bool | 333 @rtype bool |
333 """ | 334 """ |
334 if self.__checkUpgradePyQt(packages): | 335 if not venvName: |
335 return False | 336 return False |
336 | 337 |
337 if not venvName: | 338 if ( |
339 self.getVirtualenvInterpreter(venvName) == sys.executable and | |
340 self.__checkUpgradePyQt(packages) | |
341 ): | |
338 return False | 342 return False |
339 | 343 |
340 interpreter = self.getVirtualenvInterpreter(venvName) | 344 interpreter = self.getVirtualenvInterpreter(venvName) |
341 if not interpreter: | 345 if not interpreter: |
342 return False | 346 return False |