PrEditor 2.2.0__tar.gz → 2.4.0__tar.gz

{preditor-2.2.0 → preditor-2.4.0}/.github/workflows/release.yml

@@ -11,12 +11,12 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
       - name: Setup Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.x"
 
@@ -31,7 +31,7 @@ jobs:
 
       # Upload the built pip packages so we can inspect them
       - name: Upload packages.
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: pip-packages
           path: |

{preditor-2.2.0 → preditor-2.4.0}/.github/workflows/static-analysis-and-test.yml

@@ -17,10 +17,10 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.11"
 
@@ -60,10 +60,10 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python }}
 
@@ -77,7 +77,7 @@ jobs:
           tox -e begin,py -- --tb short
 
       - name: Upload coverage
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: coverage-${{ matrix.os }}-${{ matrix.python }}
           path: .coverage/*
@@ -97,10 +97,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.x"
 
@@ -115,7 +115,7 @@ jobs:
           tox -e begin
 
       - name: Download coverage artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           path: .coverage/
           pattern: coverage-*
@@ -136,7 +136,7 @@ jobs:
           # python -m coverage report --fail-under=100
 
       - name: Upload HTML report if check failed.
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: html-report
           path: htmlcov
@@ -160,12 +160,12 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
       - name: Setup Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.x"
 
@@ -179,7 +179,7 @@ jobs:
           python -m build --wheel --sdist
 
       - name: Upload packages.
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: pip-packages
           path: |

{preditor-2.2.0 → preditor-2.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PrEditor
-Version: 2.2.0
+Version: 2.4.0
 Summary: A python REPL and Editor and console based on Qt.
 Author-email: Blur Studio <opensource@blur.com>
 License: LGPL-3.0
@@ -262,6 +262,37 @@ or add menu items. When using this plugin, make sure to use the
 to the LoggingLevelButton's handlers sub-menus. This allows you to install a
 handler instance on a specific logging object.
 
+# Testing
+
+We use [tox](https://tox.wiki/) to run tests across multiple python versions and to run
+linting/formatting checks. This ensures that the code works correctly across all
+supported versions of python.
+
+While you can run `pytest` directly, using `tox` is recommended as it ensures all
+dependencies are correctly installed and runs the full suite of checks.
+
+To run all tests and checks:
+```batch
+tox
+```
+
+You can speed up testing by `-p` to make the tests run in parallel.
+
+To run only a specific environment (e.g., python 3.11):
+```batch
+tox -e py311
+```
+
+To run a specific test file or pass arguments to pytest, use `--`:
+```batch
+tox -e py311 -- tests/test_stream.py
+```
+
+To run only the linting checks:
+```batch
+tox -e black,flake8,deptry
+```
+
 # Qt Designer integration
 
 PrEditor includes some reusable widgets that are useful to integrate into your

{preditor-2.2.0 → preditor-2.4.0}/PrEditor.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PrEditor
-Version: 2.2.0
+Version: 2.4.0
 Summary: A python REPL and Editor and console based on Qt.
 Author-email: Blur Studio <opensource@blur.com>
 License: LGPL-3.0
@@ -262,6 +262,37 @@ or add menu items. When using this plugin, make sure to use the
 to the LoggingLevelButton's handlers sub-menus. This allows you to install a
 handler instance on a specific logging object.
 
+# Testing
+
+We use [tox](https://tox.wiki/) to run tests across multiple python versions and to run
+linting/formatting checks. This ensures that the code works correctly across all
+supported versions of python.
+
+While you can run `pytest` directly, using `tox` is recommended as it ensures all
+dependencies are correctly installed and runs the full suite of checks.
+
+To run all tests and checks:
+```batch
+tox
+```
+
+You can speed up testing by `-p` to make the tests run in parallel.
+
+To run only a specific environment (e.g., python 3.11):
+```batch
+tox -e py311
+```
+
+To run a specific test file or pass arguments to pytest, use `--`:
+```batch
+tox -e py311 -- tests/test_stream.py
+```
+
+To run only the linting checks:
+```batch
+tox -e black,flake8,deptry
+```
+
 # Qt Designer integration
 
 PrEditor includes some reusable widgets that are useful to integrate into your

{preditor-2.2.0 → preditor-2.4.0}/README.md

@@ -216,6 +216,37 @@ or add menu items. When using this plugin, make sure to use the
 to the LoggingLevelButton's handlers sub-menus. This allows you to install a
 handler instance on a specific logging object.
 
+# Testing
+
+We use [tox](https://tox.wiki/) to run tests across multiple python versions and to run
+linting/formatting checks. This ensures that the code works correctly across all
+supported versions of python.
+
+While you can run `pytest` directly, using `tox` is recommended as it ensures all
+dependencies are correctly installed and runs the full suite of checks.
+
+To run all tests and checks:
+```batch
+tox
+```
+
+You can speed up testing by `-p` to make the tests run in parallel.
+
+To run only a specific environment (e.g., python 3.11):
+```batch
+tox -e py311
+```
+
+To run a specific test file or pass arguments to pytest, use `--`:
+```batch
+tox -e py311 -- tests/test_stream.py
+```
+
+To run only the linting checks:
+```batch
+tox -e black,flake8,deptry
+```
+
 # Qt Designer integration
 
 PrEditor includes some reusable widgets that are useful to integrate into your

{preditor-2.2.0 → preditor-2.4.0}/preditor/gui/console_base.py

@@ -8,7 +8,7 @@ from fractions import Fraction
 from typing import Optional
 
 from Qt import QtCompat
-from Qt.QtCore import Property, Qt
+from Qt.QtCore import Property, Qt, QTimer
 from Qt.QtGui import (
     QColor,
     QFontMetrics,
@@ -308,9 +308,9 @@ class ConsoleBase(QTextEdit):
         workbox = self.controller.workbox_for_name(name)
         if not workbox:
             return None
-        if lineNum > workbox.lines():
+        if lineNum > workbox.__num_lines__():
             return None
-        txt = workbox.text(lineNum).strip() + "\n"
+        txt = workbox.__text_part__(lineNum=lineNum).strip() + "\n"
         return txt
 
     def init_actions(self):
@@ -514,8 +514,10 @@ class ConsoleBase(QTextEdit):
         if not self._first_show:
             return False
 
-        # Configure the stream callbacks if enabled
-        self.update_streams()
+        # Configure the stream callbacks if enabled. Delay calling these until
+        # the UI has been fully shown. This is prevents some DCC's like
+        # Houdini 21.0(possibly Qt6) from segfaulting.
+        QTimer.singleShot(0, self.update_streams)
 
         # Redefine highlight variables now that stylesheet may have been updated
         self.codeHighlighter().defineHighlightVariables()

{preditor-2.2.0 → preditor-2.4.0}/preditor/gui/group_tab_widget/group_tab_widget.py

@@ -375,6 +375,9 @@ class GroupTabWidget(OneTabWidget):
                         missing_name = f"{group_name}/{name}"
                         workboxes_missing_id.append(missing_name)
                         continue
+                    else:
+                        # If only the tempfile is set, use it as the workbox_id
+                        workbox_id = Path(tempfile).stem
 
                 orphaned_by_instance = tab.get('orphaned_by_instance', False)
 
@@ -389,7 +392,7 @@ class GroupTabWidget(OneTabWidget):
 
                 # There is a file on disk, add the tab, creating the group
                 # tab if it hasn't already been created.
-                prefs = dict(
+                localprefs = dict(
                     workbox_id=workbox_id,
                     filename=filename,
                     backup_file=backup_file,
@@ -398,7 +401,7 @@ class GroupTabWidget(OneTabWidget):
                     tempfile=tempfile,
                 )
                 tab_widget, editor = self.add_new_tab(
-                    group_name, title=name, prefs=prefs
+                    group_name, title=name, prefs=localprefs
                 )
 
                 editor.__set_last_workbox_name__(editor.__workbox_name__())

{preditor-2.2.0 → preditor-2.4.0}/preditor/gui/loggerwindow.py

@@ -897,7 +897,13 @@ class LoggerWindow(Window):
 
         # Present a QFontDialog for user to choose a font
         title = "Pick a {} font. Current font is: {}".format(kind, curFontFamily)
-        newFont, okClicked = QFontDialog.getFont(origFont, self, title, options=options)
+        fontReturn = QFontDialog.getFont(origFont, self, title, options=options)
+
+        # QFontDialog.getFont returns a different order for Qt5 vs Qt6
+        if isinstance(fontReturn[0], bool):
+            okClicked, newFont = fontReturn
+        else:
+            newFont, okClicked = fontReturn
 
         if okClicked:
             if doGui:
@@ -1327,7 +1333,16 @@ class LoggerWindow(Window):
         """Clears the console before executing all workbox code"""
         if self.uiClearBeforeRunningCHK.isChecked():
             self.clearLog()
-        self.current_workbox().__exec_all__()
+        workbox = self.current_workbox()
+        if workbox is None:
+            # If the user has not picked the workbox editor class but tries to use
+            # the shortcut for them, raise a user friendly warning.
+            raise RuntimeError(
+                "You must choose an Editor Class in the workbox section before "
+                "you can run code from it. (To run console code don't use Shift "
+                "or Ctrl when pressing Return.)"
+            )
+        workbox.__exec_all__()
 
         if self.uiAutoPromptCHK.isChecked():
             console = self.console()

{preditor-2.2.0 → preditor-2.4.0}/preditor/prefs.py

@@ -294,7 +294,7 @@ def get_prefs_updates():
         updates (dict): The dict of defined updates
     """
     updates = {}
-    path = resourcePath(r"pref_updates\pref_updates.json")
+    path = resourcePath("pref_updates/pref_updates.json")
     try:
         updates = utils.Json(path).load()
     except (FileNotFoundError, json.decoder.JSONDecodeError):

{preditor-2.2.0 → preditor-2.4.0}/preditor/resource/settings.ini

@@ -22,4 +22,4 @@ bdev_path_temp = /tmp/
 bdev_path_blur = $HOME/.blur
 bdev_path_prefs_shared = $BDEV_PATH_PREFS
 bdev_path_prefs = $BDEV_PATH_BLUR/userprefs
-bdev_cmd_browse = nemo %(filepath)s
+bdev_cmd_browse = xdg-open %(filepath)s

{preditor-2.2.0 → preditor-2.4.0}/preditor/stream/director.py

@@ -104,6 +104,10 @@ class Director(io.TextIOWrapper):
         raw = _DirectorBuffer(manager, state, old_stream, name)
         buffer = io.BufferedWriter(raw)
 
+        # Disable newline translation in this TextIOWrapper so that it doesn't
+        # double up on Windows (where the old_stream will likely also do translation)
+        kwargs.setdefault("newline", "")
+
         super().__init__(buffer, encoding="utf-8", write_through=True, *args, **kwargs)
 
     def __repr__(self):

{preditor-2.2.0 → preditor-2.4.0}/preditor/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '2.2.0'
-__version_tuple__ = version_tuple = (2, 2, 0)
+__version__ = version = '2.4.0'
+__version_tuple__ = version_tuple = (2, 4, 0)
 
-__commit_id__ = commit_id = 'g78a8e2938'
+__commit_id__ = commit_id = 'g42f5e5010'