Merge pull request #1 from jchanvfx/main

Merge latest changes

Author: jdrese

.github/workflows/pypi_publish.yml

@@ -9,7 +9,11 @@ on:
 
 jobs:
   publish:
+    name: Upload Release to PyPI
     runs-on: ubuntu-latest
+    # IMPORTANT: this permission is mandatory for trusted publishing.
+    permissions:
+      id-token: write
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE , so your workflow can access it.
       - name: Checkout
@@ -19,10 +23,6 @@ jobs:
       # Run build to a specified version of python into a specified directory.
       - name: Python Build
         run: python3 -m pip install --upgrade build && python3 -m build
-      # Publish the python package to pypi.org with the api token.
-      - name: Publish Package
+      # Publish the python package to pypi.org.
+      - name: Publish Package to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          repository-url: https://upload.pypi.org/legacy/
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}

.github/workflows/sphinx_doc_build.yml

@@ -13,6 +13,7 @@ env:
 
 jobs:
   docs-build:
+    name: Build Sphinx Documentation
     runs-on: ubuntu-latest
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE , so your workflow can access it.

NodeGraphQt/base/graph.py

@@ -907,7 +907,7 @@ def set_context_menu_from_file(self, file_path, menu='graph'):
         if not file.is_file():
             raise IOError('file doesn\'t exist: "{}"'.format(file))
 
-        with file.open() as f:
+        with file.open(encoding='utf8') as f:
             data = json.load(f)
         context_menu = self.get_context_menu(menu)
         self._deserialize_context_menu(context_menu, data, file)
@@ -1727,8 +1727,12 @@ def _serialize(self, nodes):
         serial_data['graph']['pipe_style'] = self.pipe_style()
 
         # connection constrains.
-        serial_data['graph']['accept_connection_types'] = self.model.accept_connection_types
-        serial_data['graph']['reject_connection_types'] = self.model.reject_connection_types
+        serial_data['graph']['accept_connection_types'] = {
+            k: list(v) for k, v in self.model.accept_connection_types.items()
+        }
+        serial_data['graph']['reject_connection_types'] = {
+            k: list(v) for k, v in self.model.reject_connection_types.items()
+        }
 
         # serialize nodes.
         for n in nodes:
@@ -1798,9 +1802,13 @@ def _deserialize(self, data, relative_pos=False, pos=None):
 
             # connection constrains.
             elif attr_name == 'accept_connection_types':
-                self.model.accept_connection_types = attr_value
+                self.model.accept_connection_types = {
+                    k: set(v) for k, v in attr_value.items()
+                }
             elif attr_name == 'reject_connection_types':
-                self.model.reject_connection_types = attr_value
+                self.model.reject_connection_types = {
+                    k: set(v) for k, v in attr_value.items()
+                }
 
         # build the nodes.
         nodes = {}

NodeGraphQt/base/model.py

@@ -245,7 +245,7 @@ def add_port_accept_connection_type(
     ):
         """
         Convenience function for adding to the "accept_connection_types" dict.
-        If the node graph model is unavailable yet then we store it to a
+        If the node graph model is unavailable, yet then we store it to a
         temp var that gets deleted.
 
         Args:

NodeGraphQt/pkg_info.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
-__version__ = '0.6.37'
+__version__ = '0.6.38'
 __status__ = 'Work in Progress'
 __license__ = 'MIT'
 

NodeGraphQt/qgraphics/node_backdrop.py

@@ -152,7 +152,7 @@ def mousePressEvent(self, event):
 
     def mouseReleaseEvent(self, event):
         super(BackdropNodeItem, self).mouseReleaseEvent(event)
-        self.setFlag(self.ItemIsMovable, True)
+        self.setFlag(QtWidgets.QGraphicsItem.ItemIsMovable, True)
         [n.setSelected(True) for n in self._nodes]
         self._nodes = [self]
 

NodeGraphQt/widgets/viewer.py

@@ -66,10 +66,9 @@ def __init__(self, parent=None, undo_stack=None):
         self.setRenderHint(QtGui.QPainter.Antialiasing, True)
         self.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
         self.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
-        self.setViewportUpdateMode(QtWidgets.QGraphicsView.FullViewportUpdate)
+        self.setViewportUpdateMode(QtWidgets.QGraphicsView.BoundingRectViewportUpdate)
         self.setCacheMode(QtWidgets.QGraphicsView.CacheBackground)
-        self.setOptimizationFlag(
-            QtWidgets.QGraphicsView.DontAdjustForAntialiasing)
+        self.setOptimizationFlag(QtWidgets.QGraphicsView.DontAdjustForAntialiasing)
 
         self.setAcceptDrops(True)
         self.resize(850, 800)

setup.cfg

@@ -6,8 +6,7 @@ license = MIT License
 license_files = LICENSE.md
 long_description = file: README.md
 long_description_content_type = text/markdown
-description = Node graph framework for PySide2/PyQt5 that can be
-              implemented and re-purposed into applications.
+description = Node graph framework written in PySide2 that can be re-implemented.
 classifiers = Operating System :: OS Independent
               License :: OSI Approved :: MIT License
               Programming Language :: Python :: 3.6