diff -r e7814dd19115 -r 7b5f10581c35 eric7/Plugins/WizardPlugins/SetupWizard/SetupWizardDialog.py
--- a/eric7/Plugins/WizardPlugins/SetupWizard/SetupWizardDialog.py Fri Jul 30 17:40:58 2021 +0200
+++ b/eric7/Plugins/WizardPlugins/SetupWizard/SetupWizardDialog.py Fri Jul 30 20:13:09 2021 +0200
@@ -19,7 +19,6 @@
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
@@ -58,10 +57,6 @@
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,
@@ -288,14 +283,9 @@
code += os.linesep
if self.importCheckBox.isChecked():
- variant = self.variantComboBox.itemData(
- self.variantComboBox.currentIndex())
- if variant == "setuptools":
- additionalImport = ", find_packages"
- else:
- additionalImport = ""
- code += "from {0} import setup{1}{2}".format(
- variant, additionalImport, os.linesep)
+ additionalImport = ", find_packages"
+ code += "from setuptools import setup{0}{1}".format(
+ additionalImport, os.linesep)
if code:
code += "{0}{0}".format(os.linesep)
@@ -394,47 +384,32 @@
code += '{0}keywords="{1}",{2}'.format(
istring, self.keywordsEdit.text(), os.linesep)
- if self.variantComboBox.currentIndex() == 0:
- # distutils
- packages = []
- for row in range(self.packagesList.count()):
- packages.append(self.packagesList.item(row).text())
- if packages:
- code += '{0}packages=[{1}'.format(istring, os.linesep)
- code += '{0}"{1}"{2}'.format(
- i1string,
- '",{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)
+ 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 += '{0}{1}exclude=[{0}'.format(os.linesep, i1string)
- code += '{0}"{1}"{2}'.format(
- i2string,
- '",{0}{1}"'.format(os.linesep, i2string)
- .join(excludePatterns),
- os.linesep)
- code += '{0}]{1}{2}'.format(i1string, os.linesep, istring)
- code += '),{0}'.format(os.linesep)
-
- if self.includePackageDataCheckBox.isChecked():
- code += '{0}include_package_data = True,{1}'.format(
- istring, os.linesep)
+ code += ','
+ else:
+ code += '{0}{1}'.format(os.linesep, istring)
+ if excludePatterns:
+ code += '{0}{1}exclude=[{0}'.format(os.linesep, i1string)
+ code += '{0}"{1}"{2}'.format(
+ i2string,
+ '",{0}{1}"'.format(os.linesep, i2string)
+ .join(excludePatterns),
+ os.linesep)
+ code += '{0}]{1}{2}'.format(i1string, os.linesep, istring)
+ 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()):
@@ -496,82 +471,6 @@
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
@@ -601,44 +500,6 @@
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.
@@ -727,15 +588,6 @@
.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):
"""
