Merge pull request #175 from hsorby/rm-setup

Remove setup.py

Author: hsorby

src/mapclient/tools/pluginwizard/skeleton.py

@@ -51,7 +51,6 @@
     SERIALIZE_METHOD_STRING,
     SET_IDENTIFIER_DEFAULT_CONTENT_STRING,
     SET_IDENTIFIER_IDENTIFIER_CONTENT_STRING,
-    SETUP_PY_TEMPLATE,
     STEP_PACKAGE_INIT_STRING,
 )
 
@@ -77,22 +76,13 @@ def __init__(self, options, qt_tool_options):
         self._options = options
         self._qt_tool_options = qt_tool_options
 
-    def _writeSetup(self, target_dir):
+    def _write_meta_files(self, target_dir):
         """
-        Write the setup file, for integration with setuptools.
+        Write the requirements file, for integration with pip install -r requirements.txt.
         """
-        target_file = os.path.join(target_dir, 'setup.py')
-        with open(target_file, 'w') as f:
-            f.write(SETUP_PY_TEMPLATE % dict(
-                description='',
-                name=self._options.getFullPackageName(),
-                package_name=self._options.getPackageName(),
-                author=self._options.getAuthorName(),
-                author_email='',
-                url='',
-                plugin_namespace=PLUGIN_NAMESPACE,
-                namespace_packages=[PLUGIN_NAMESPACE],
-            ))
+        target_file = os.path.join(target_dir, 'requirements.txt')
+        with open(target_file, 'w') as fh:
+            fh.write('# List plugin requirements here:\n')
 
         readme_file = os.path.join(target_dir, 'README.rst')
         license_file = os.path.join(target_dir, 'LICENSE')
@@ -230,7 +220,6 @@ def _generateConfigureMethod(self):
         self._configured = dlg.validate()
         self._configuredObserver()
 """
-        else:
             method_string += '        pass\n'
 
         return method_string
@@ -474,7 +463,7 @@ def write(self):
         os.mkdir(namespace_dir)
         os.mkdir(step_package_dir)
 
-        self._writeSetup(package_dir)
+        self._write_meta_files(package_dir)
         self._writeNamespaceInit(namespace_dir)
 
         # Write step package init file

src/mapclient/tools/pluginwizard/skeletonstrings.py

@@ -126,7 +126,7 @@ def __init__(self, parent=None):
         # and know how many occurrences of the current identifier there should
         # be.
         self._previousIdentifier = ''
-        # Set a place holder for a callable that will get set from the step.
+        # Set a placeholder for a callable that will get set from the step.
         # We will use this method to decide whether the identifier is unique.
         self.identifierOccursCount = None
 
@@ -305,66 +305,6 @@ def validate(self):
 """
 
 
-SETUP_PY_TEMPLATE = """\
-import codecs
-import io
-import os
-import re
-
-from setuptools import setup, find_packages
-
-SETUP_DIR = os.path.dirname(os.path.abspath(__file__))
-
-
-def read(*parts):
-    with codecs.open(os.path.join(SETUP_DIR, *parts), 'r') as fp:
-        return fp.read()
-
-
-def find_version(*file_paths):
-    version_file = read(*file_paths)
-    version_match = re.search(r"^__version__ = ['\\"]([^'\\"]*)['\\"]",
-                              version_file, re.M)
-    if version_match:
-        return version_match.group(1)
-    raise RuntimeError("Unable to find version string.")
-
-
-def readfile(filename, split=False):
-    with io.open(filename, encoding="utf-8") as stream:
-        if split:
-            return stream.read().split("\\n")
-        return stream.read()
-
-
-readme = readfile("README.rst", split=True)[3:]  # Skip title
-source_license = readfile("LICENSE")
-requires = ['PySide6']  # Minimal requirements listing. Insert additional dependencies here.
-
-
-setup(
-    name=%(name)r,
-    version=find_version(%(plugin_namespace)r, %(package_name)r, '__init__.py'),
-    description=%(description)r,
-    long_description='\\n'.join(readme) + source_license,
-    long_description_content_type='text/x-rst',
-    classifiers=[
-        "Development Status :: 3 - Alpha",
-        "License :: OSI Approved :: Apache Software License",
-        "Programming Language :: Python",
-    ],
-    author=%(author)r,
-    author_email=%(author_email)r,
-    url=%(url)r,
-    packages=find_packages(exclude=['ez_setup', ]),
-    namespace_packages=%(namespace_packages)r,
-    include_package_data=True,
-    zip_safe=False,
-    install_requires=requires,
-)
-"""
-
-
 NAMESPACE_INIT = """\
 __import__('pkg_resources').declare_namespace(__name__)
 """

src/mapclient/tools/pmr/pmrtool.py

@@ -145,7 +145,8 @@ def __init__(self, pmr_info=None, use_external_git=False):
     def set_info(self, info):
         self._pmr_info = info
 
-    def set_use_external_git(self, use_external_git):
+    @staticmethod
+    def set_use_external_git(use_external_git):
         name = 'authenticated_git' if use_external_git else 'authenticated_dulwich'
         return get_cmd_by_name(name)
 

src/mapclient/view/workflow/workflowcommands.py

@@ -60,23 +60,27 @@ class CommandSelection(QtGui.QUndoCommand):
     don't end up in a recursive loop.
     """
 
-    def __init__(self, scene, selection, previous):
+    def __init__(self, scene, current, previous):
         super(CommandSelection, self).__init__()
-        logger.debug("Selection Command created ...")
         self._scene = scene
-        self._selection = selection
-        self._previousSelection = previous
+        self._current = list(current)
+        self._previous = list(previous)
 
     def redo(self):
-        self._scene.blockSignals(True)
-        for item in list(self._scene.items()):
-            item.setSelected(item in self._selection)
-        self._scene.blockSignals(False)
+        self._apply_selection(self._current)
 
     def undo(self):
+        self._apply_selection(self._previous)
+
+    def _apply_selection(self, items_to_select):
         self._scene.blockSignals(True)
-        for item in list(self._scene.items()):
-            item.setSelected(item in self._previousSelection)
+
+        self._scene.clearSelection()
+        for item in items_to_select:
+            # Check if item still belongs to scene (handle deleted items)
+            if item.scene() == self._scene:
+                item.setSelected(True)
+
         self._scene.blockSignals(False)
 
 

src/mapclient/view/workflow/workflowgraphicsview.py

@@ -129,11 +129,10 @@ def connectNodes(self, src_port, dest_port):
                 self._errorIconTimer.start()
 
     def selectionChanged(self):
-        currentSelection = self.scene().selectedItems()
-        previousSelection = self.scene().previouslySelectedItems()
-        command = CommandSelection(self.scene(), currentSelection, previousSelection)
-        self._undoStack.push(command)
-        self.scene().setPreviouslySelectedItems(currentSelection)
+        current_selection = self.scene().selectedItems()
+        previous_selection = self.scene().previouslySelectedItems()
+        self._undoStack.push(CommandSelection(self.scene(), current_selection, previous_selection))
+        self.scene().setPreviouslySelectedItems(current_selection)
 
     def nodeSelected(self, node, state):
         if state and node not in self._selectedNodes:
@@ -370,9 +369,10 @@ def mouseReleaseEvent(self, event):
             QtWidgets.QGraphicsView.mouseReleaseEvent(self, event)
             if self._selectionStartPos:
                 diff = event.pos() - self._selectionStartPos
-                if diff.x() != 0 and diff.y() != 0:
+                selected_items = self.scene().selectedItems()
+                if diff.x() != 0 and diff.y() != 0 and selected_items:
                     self._undoStack.beginMacro('Move Step(s)')
-                    for item in self.scene().selectedItems():
+                    for item in selected_items:
                         if item.type() == Node.Type:
                             self._undoStack.push(CommandMove(item, item.pos() - diff, item.pos()))
                     self._undoStack.endMacro()