eric: comparison eric7/Plugins/WizardPlugins/SetupWizard/SetupWizardDialog.py

-:e7814dd19115
+:7b5f10581c35
 from PyQt6.QtNetwork import QNetworkRequest, QNetworkReply
 from EricWidgets.EricApplication import ericApp
 from EricWidgets import EricMessageBox, EricFileDialog
 from EricWidgets.EricCompleters import EricDirCompleter
-from EricGui.EricOverrideCursor import EricOverrideCursor
 from .Ui_SetupWizardDialog import Ui_SetupWizardDialog
 import UI.PixmapCache
 import Utilities
 self.__sourceDirCompleter = EricDirCompleter(self.sourceDirectoryEdit)
 self.packageRootDirButton.setIcon(UI.PixmapCache.getIcon("open"))
 self.packageDirButton.setIcon(UI.PixmapCache.getIcon("open"))
 self.sourceDirectoryButton.setIcon(UI.PixmapCache.getIcon("open"))
-self.variantComboBox.addItem(self.tr("distutils"), "distutils.core")
-self.variantComboBox.addItem(self.tr("setuptools"), "setuptools")
-self.variantComboBox.setCurrentIndex(1)
 self.__mandatoryStyleSheet = "QLineEdit {border: 2px solid;}"
 for lineEdit in [self.nameEdit, self.versionEdit,
 self.homePageUrlEdit, self.authorEdit,
 self.authorEmailEdit, self.maintainerEdit,
 code += '__prj__ = "{0}"{1}'.format(
 self.nameEdit.text(), os.linesep)
 code += os.linesep
 if self.importCheckBox.isChecked():
-variant = self.variantComboBox.itemData(
+additionalImport = ", find_packages"
-self.variantComboBox.currentIndex())
+code += "from setuptools import setup{0}{1}".format(
-if variant == "setuptools":
+additionalImport, os.linesep)
-additionalImport = ", find_packages"
-else:
-additionalImport = ""
-code += "from {0} import setup{1}{2}".format(
-variant, additionalImport, os.linesep)
 if code:
 code += "{0}{0}".format(os.linesep)
 if self.descriptionFromFilesCheckBox.isChecked():
 code += 'def get_long_description():{0}'.format(os.linesep)
 if self.keywordsEdit.text():
 code += '{0}keywords="{1}",{2}'.format(
 istring, self.keywordsEdit.text(), os.linesep)
-if self.variantComboBox.currentIndex() == 0:
+code += '{0}packages=find_packages('.format(istring)
-# distutils
+src = Utilities.fromNativeSeparators(
-packages = []
+self.sourceDirectoryEdit.text())
-for row in range(self.packagesList.count()):
+excludePatterns = []
-packages.append(self.packagesList.item(row).text())
+for row in range(self.excludePatternList.count()):
-if packages:
+excludePatterns.append(
-code += '{0}packages=[{1}'.format(istring, os.linesep)
+self.excludePatternList.item(row).text())
-code += '{0}"{1}"{2}'.format(
+if src:
-i1string,
+code += '{0}{1}"{2}"'.format(os.linesep, i1string, src)
-'",{0}{1}"'.format(os.linesep, i1string).join(packages),
-os.linesep)
-code += '{0}],{1}'.format(istring, os.linesep)
-del packages
-elif self.variantComboBox.currentIndex() == 1:
-# setuptools
-code += '{0}packages=find_packages('.format(istring)
-src = Utilities.fromNativeSeparators(
-self.sourceDirectoryEdit.text())
-excludePatterns = []
-for row in range(self.excludePatternList.count()):
-excludePatterns.append(
-self.excludePatternList.item(row).text())
-if src:
-code += '{0}{1}"{2}"'.format(os.linesep, i1string, src)
-if excludePatterns:
-code += ','
-else:
-code += '{0}{1}'.format(os.linesep, istring)
 if excludePatterns:
-code += '{0}{1}exclude=[{0}'.format(os.linesep, i1string)
+code += ','
-code += '{0}"{1}"{2}'.format(
+else:
-i2string,
+code += '{0}{1}'.format(os.linesep, istring)
-'",{0}{1}"'.format(os.linesep, i2string)
+if excludePatterns:
-.join(excludePatterns),
+code += '{0}{1}exclude=[{0}'.format(os.linesep, i1string)
-os.linesep)
+code += '{0}"{1}"{2}'.format(
-code += '{0}]{1}{2}'.format(i1string, os.linesep, istring)
+i2string,
-code += '),{0}'.format(os.linesep)
+'",{0}{1}"'.format(os.linesep, i2string)
+.join(excludePatterns),
-if self.includePackageDataCheckBox.isChecked():
+os.linesep)
-code += '{0}include_package_data = True,{1}'.format(
+code += '{0}]{1}{2}'.format(i1string, os.linesep, istring)
-istring, os.linesep)
+code += '),{0}'.format(os.linesep)
+if self.includePackageDataCheckBox.isChecked():
+code += '{0}include_package_data = True,{1}'.format(
+istring, os.linesep)
 modules = []
 for row in range(self.modulesList.count()):
 modules.append(self.modulesList.item(row).text())
 if modules:
 # prevent overwriting of entries by disabling the button
 self.projectButton.setEnabled(False)
 @pyqtSlot()
-def on_packagesList_itemSelectionChanged(self):
-"""
-Private slot to handle a change of selected items of the
-packages list.
-"""
-self.deletePackageButton.setEnabled(
-len(self.packagesList.selectedItems()) > 0)
-@pyqtSlot()
-def on_deletePackageButton_clicked(self):
-"""
-Private slot to delete the selected package items.
-"""
-for itm in self.packagesList.selectedItems():
-self.packagesList.takeItem(
-self.packagesList.row(itm))
-del itm
-@pyqtSlot()
-def on_addPackageButton_clicked(self):
-"""
-Private slot to add a package to the list.
-"""
-pkg = Utilities.toNativeSeparators(self.packageEdit.text())
-self.__addPackage(pkg)
-@pyqtSlot()
-def on_packageEdit_returnPressed(self):
-"""
-Private slot handling a press of the return button of the
-package edit.
-"""
-self.on_addPackageButton_clicked()
-@pyqtSlot(str)
-def on_packageEdit_textChanged(self, txt):
-"""
-Private slot to handle a change of the package text.
-@param txt text of the line edit (string)
-"""
-self.addPackageButton.setEnabled(bool(txt))
-@pyqtSlot()
-def on_packageDirButton_clicked(self):
-"""
-Private slot to select a package directory via a directory
-selection dialog.
-"""
-startDir = self.packageEdit.text()
-if not startDir:
-startDir = self.packageRootEdit.text() or self.__getStartDir()
-packageDir = EricFileDialog.getExistingDirectory(
-self,
-self.tr("Package Directory"),
-Utilities.fromNativeSeparators(startDir))
-if packageDir:
-self.packageEdit.setText(
-Utilities.toNativeSeparators(packageDir))
-@pyqtSlot()
-def on_autodiscoverPackagesButton_clicked(self):
-"""
-Private slot to discover packages automatically.
-"""
-with EricOverrideCursor():
-self.autodiscoverPackagesButton.setEnabled(False)
-startDir = self.packageRootEdit.text() or self.__getStartDir()
-if startDir:
-self.packagesList.clear()
-for dirpath, _dirnames, filenames in os.walk(startDir):
-if "__init__.py" in filenames:
-self.__addPackage(dirpath)
-self.autodiscoverPackagesButton.setEnabled(True)
-@pyqtSlot()
 def on_packageRootDirButton_clicked(self):
 """
 Private slot to select the packages root directory via a
 directory selection dialog.
 """
 """
 projectOpen = ericApp().getObject("Project").isOpen()
 validPackagesRoot = bool(txt) and os.path.exists(txt)
 self.autodiscoverPackagesButton.setEnabled(
 projectOpen or validPackagesRoot)
-def __addPackage(self, pkgDir):
-"""
-Private method to add a package to the list.
-@param pkgDir name of the package directory (string)
-"""
-if pkgDir:
-if "\\" in pkgDir or "/" in pkgDir:
-# It is a directory. Check for an __init__.py file.
-if os.path.isabs(pkgDir):
-prefix = ""
-else:
-prefix = self.packageRootEdit.text()
-initName = os.path.join(
-prefix,
-Utilities.toNativeSeparators(pkgDir),
-"__init__.py")
-if not os.path.exists(initName):
-res = EricMessageBox.information(
-self,
-self.tr("Add Package"),
-self.tr("""<p>The directory <b>{0}</b> is not"""
-""" a Python package.</p>""")
-.format(pkgDir),
-EricMessageBox.Ignore | EricMessageBox.Ok)
-if res == EricMessageBox.Ok:
-return
-pkg = pkgDir.replace(
-Utilities.toNativeSeparators(self.packageRootEdit.text()), "")
-if pkg.startswith(("\\", "/")):
-pkg = pkg[1:]
-if pkg:
-QListWidgetItem(
-pkg.replace("\\", ".").replace("/", "."),
-self.packagesList)
-self.packageEdit.clear()
 def __getStartDir(self):
 """
 Private method to get the start directory for selection dialogs.
 if module:
 QListWidgetItem(os.path.splitext(module)[0]
 .replace("\\", ".").replace("/", "."),
 self.modulesList)
-@pyqtSlot(int)
-def on_variantComboBox_currentIndexChanged(self, index):
-"""
-Private slot handling a change of the setup variant.
-@param index index of the selected entry (integer)
-"""
-self.packagesStackedWidget.setCurrentIndex(index)
 @pyqtSlot()
 def on_excludePatternList_itemSelectionChanged(self):
 """
 Private slot to handle a change of selected items of the
 exclude pattern list.

Mercurial Repositories > eric / file comparison

comparison: eric7/Plugins/WizardPlugins/SetupWizard/SetupWizardDialog.py

eric7/Plugins/WizardPlugins/SetupWizard/SetupWizardDialog.py