PrEditor 2.1.0__tar.gz → 2.2.0__tar.gz

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

@@ -35,6 +35,8 @@ jobs:
       - name: Format with black
         run: tox -e black
 
+      - name: Check imports with deptry
+        run: tox -e deptry
 
   test:
     # We want to run on external PRs, but not on our own internal PRs as they'll
@@ -47,7 +49,7 @@ jobs:
     strategy:
       matrix:
         os: ['ubuntu-latest', 'windows-latest']
-        python: ['3.8', '3.9', '3.10', '3.11']
+        python: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
         # Works around the depreciation of python 3.7 for ubuntu
         # https://github.com/actions/setup-python/issues/544
         include:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PrEditor
-Version: 2.1.0
+Version: 2.2.0
 Summary: A python REPL and Editor and console based on Qt.
 Author-email: Blur Studio <opensource@blur.com>
 License: LGPL-3.0
@@ -19,8 +19,6 @@ Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: charset-normalizer
-Requires-Dist: configparser>=4.0.2
-Requires-Dist: future>=0.18.2
 Requires-Dist: importlib-metadata>=4.8.3
 Requires-Dist: Qt.py>=1.4.4
 Requires-Dist: signalslot>=0.1.2

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PrEditor
-Version: 2.1.0
+Version: 2.2.0
 Summary: A python REPL and Editor and console based on Qt.
 Author-email: Blur Studio <opensource@blur.com>
 License: LGPL-3.0
@@ -19,8 +19,6 @@ Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: charset-normalizer
-Requires-Dist: configparser>=4.0.2
-Requires-Dist: future>=0.18.2
 Requires-Dist: importlib-metadata>=4.8.3
 Requires-Dist: Qt.py>=1.4.4
 Requires-Dist: signalslot>=0.1.2

{preditor-2.1.0 → preditor-2.2.0}/PrEditor.egg-info/SOURCES.txt

@@ -102,7 +102,6 @@ preditor/gui/ui/find_files.ui
 preditor/gui/ui/loggerwindow.ui
 preditor/gui/ui/set_text_editor_path_dialog.ui
 preditor/gui/ui/suggest_path_quotes_dialog.ui
-preditor/resource/environment_variables.html
 preditor/resource/error_mail.html
 preditor/resource/error_mail_inline.html
 preditor/resource/settings.ini

{preditor-2.1.0 → preditor-2.2.0}/PrEditor.egg-info/requires.txt

@@ -1,6 +1,4 @@
 charset-normalizer
-configparser>=4.0.2
-future>=0.18.2
 importlib-metadata>=4.8.3
 Qt.py>=1.4.4
 signalslot>=0.1.2

{preditor-2.1.0 → preditor-2.2.0}/preditor/about_module.py

@@ -5,12 +5,10 @@ import os
 import sys
 import textwrap
 
-from future.utils import with_metaclass
-
 import preditor
 
 
-class AboutModule(with_metaclass(abc.ABCMeta, object)):
+class AboutModule(object, metaclass=abc.ABCMeta):
     """Base class for the `preditor.plug.about_module` entry point. Create a
     subclass of this method and expose the class object to the entry point.
 

{preditor-2.1.0 → preditor-2.2.0}/preditor/cli.py

@@ -1,8 +1,8 @@
 from __future__ import absolute_import
 
 import logging
+import shutil
 import sys
-from distutils.spawn import find_executable
 
 import click
 from click.core import ParameterSource
@@ -129,7 +129,7 @@ def shortcut(path, public, name, target, args, description):
 
     # Resolve the full path to the preditor exe.
     if target in ("preditor", "preditorw"):
-        target = find_executable(target)
+        target = shutil.which(target)
 
     parameter_source = click.get_current_context().get_parameter_source('name')
     if parameter_source == ParameterSource.DEFAULT:

{preditor-2.1.0 → preditor-2.2.0}/preditor/enum.py

@@ -2,12 +2,8 @@ from __future__ import absolute_import
 
 import abc
 import re
-from builtins import str as text
 from numbers import Number
 
-from future.utils import iteritems, with_metaclass
-from past.builtins import long
-
 # =============================================================================
 # CLASSES
 # =============================================================================
@@ -79,7 +75,7 @@ class _MetaEnumGroup(type):
 # =============================================================================
 
 
-class Enum(with_metaclass(abc.ABCMeta, object)):
+class Enum(object, metaclass=abc.ABCMeta):
     """A basic enumerator class.
 
     Enumerators are named values that act as identifiers.  Typically, a
@@ -204,9 +200,9 @@ class Enum(with_metaclass(abc.ABCMeta, object)):
             return False
         if isinstance(value, Enum):
             return self.number == value.number
-        if isinstance(value, (int, long)):
+        if isinstance(value, int):
             return self.number == value
-        if isinstance(value, str) or isinstance(value, text):
+        if isinstance(value, str):
             if self._compareStr(value):
                 return True
         return False
@@ -296,7 +292,7 @@ class Enum(with_metaclass(abc.ABCMeta, object)):
 # =============================================================================
 
 
-class EnumGroup(with_metaclass(_MetaEnumGroup, object)):
+class EnumGroup(object, metaclass=_MetaEnumGroup):
     """A container class for collecting, organizing, and accessing Enums.
 
     An EnumGroup class is a container for Enum objects.  It provides
@@ -428,7 +424,7 @@ class EnumGroup(with_metaclass(_MetaEnumGroup, object)):
             raise ValueError('Enums given as ordered arguments must have a label.')
         for e in args:
             setattr(cls, cls._labelToVarName(e.label), e)
-        for n, e in iteritems(kwargs):
+        for n, e in kwargs.items():
             setattr(cls, n, e)
         # reset All and Nothing -- this is necessary so that All is regenerated
         # and so that Nothing is not included when finding the member Enums.
@@ -585,7 +581,7 @@ class EnumGroup(with_metaclass(_MetaEnumGroup, object)):
         orderedEnums = sorted(
             [
                 (k, v)
-                for k, v in iteritems(cls.__dict__)
+                for k, v in cls.__dict__.items()
                 if isinstance(v, Enum) and k not in ('All', 'Nothing')
             ],
             key=lambda i: i[1]._creationOrder,

{preditor-2.1.0 → preditor-2.2.0}/preditor/gui/console.py

@@ -5,7 +5,6 @@ import string
 import sys
 import time
 import traceback
-from builtins import str as text
 from functools import partial
 from typing import Optional
 
@@ -344,7 +343,7 @@ class ConsolePrEdit(ConsoleBase):
                 r'\"\<\>\?\`\-\=\[\]\\\;\'\,\.\/ \t\n]'
             )
         )
-        newText = text(txt)
+        newText = str(txt)
         for each in exp.findall(newText):
             newText = newText.replace(each, '?')
 

{preditor-2.1.0 → preditor-2.2.0}/preditor/gui/drag_tab_bar.py

@@ -4,7 +4,6 @@ from enum import IntEnum
 from functools import partial
 from pathlib import Path
 
-import six
 from Qt.QtCore import QByteArray, QMimeData, QPoint, QRect, Qt
 from Qt.QtGui import QColor, QCursor, QDrag, QPixmap, QRegion
 from Qt.QtWidgets import (
@@ -513,7 +512,7 @@ class DragTabBar(QTabBar):
         filename = workbox.__filename__()
         if filename and Path(filename).is_file():
             workbox.__set_file_monitoring_enabled__(False)
-        directory = six.text_type(Path(filename).parent) if filename else ""
+        directory = str(Path(filename).parent) if filename else ""
         success = workbox.__save_as__(directory=directory)
         if not success:
             return

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

@@ -9,7 +9,6 @@ import re
 import shutil
 import sys
 import warnings
-from builtins import bytes
 from datetime import datetime, timedelta
 from enum import IntEnum
 from functools import partial
@@ -25,11 +24,9 @@ from Qt.QtWidgets import (
     QInputDialog,
     QMenu,
     QMessageBox,
-    QTextBrowser,
     QTextEdit,
     QToolButton,
     QToolTip,
-    QVBoxLayout,
 )
 
 from .. import (
@@ -44,7 +41,7 @@ from .. import (
     resourcePath,
 )
 from ..delayable_engine import DelayableEngine
-from ..gui import Dialog, Window, handleMenuHovered, loadUi, tab_widget_for_tab
+from ..gui import Window, handleMenuHovered, loadUi, tab_widget_for_tab
 from ..gui.fuzzy_search.fuzzy_search import FuzzySearch
 from ..gui.group_tab_widget.grouped_tab_models import GroupTabListItemModel
 from ..logging_config import LoggingConfig
@@ -302,7 +299,6 @@ class LoggerWindow(Window):
         )
         self.uiClearBeforeRunningCHK.toggled.connect(self.setClearBeforeRunning)
         self.uiEditorVerticalCHK.toggled.connect(self.adjustWorkboxOrientation)
-        self.uiEnvironmentVarsACT.triggered.connect(self.showEnvironmentVars)
         self.uiAboutPreditorACT.triggered.connect(self.show_about)
 
         # Prefs on disk
@@ -2165,17 +2161,6 @@ class LoggerWindow(Window):
         msg = about_preditor(instance=self)
         QMessageBox.information(self, 'About PrEditor', '<pre>{}</pre>'.format(msg))
 
-    def showEnvironmentVars(self):
-        dlg = Dialog(self)
-        lyt = QVBoxLayout(dlg)
-        lbl = QTextBrowser(dlg)
-        lyt.addWidget(lbl)
-        dlg.setWindowTitle('Blurdev Environment Variable Help')
-        with open(resourcePath('environment_variables.html')) as f:
-            lbl.setText(f.read().replace('\n', ''))
-        dlg.setMinimumSize(600, 400)
-        dlg.show()
-
     def showEvent(self, event):
         super(LoggerWindow, self).showEvent(event)
         self.updateIndentationsUseTabs()

{preditor-2.1.0 → preditor-2.2.0}/preditor/gui/ui/loggerwindow.ui

@@ -955,7 +955,6 @@ Must be at least 1</string>
      </property>
     </widget>
     <addaction name="uiPreferencesMENU"/>
-    <addaction name="uiEnvironmentVarsACT"/>
     <addaction name="separator"/>
     <addaction name="uiAboutPreditorACT"/>
    </widget>

{preditor-2.1.0 → preditor-2.2.0}/preditor/osystem.py

@@ -11,7 +11,6 @@ from __future__ import absolute_import, print_function
 import os
 import subprocess
 import sys
-from builtins import str as text
 
 import preditor
 
@@ -39,10 +38,10 @@ def getPointerSize():
 def pythonPath(pyw=False, architecture=None):
     if settings.OS_TYPE != 'Windows':
         return 'python'
-    from distutils.sysconfig import get_python_inc
+    import sysconfig
 
     # Unable to pull the path from the registry just use the current python path
-    basepath = os.path.split(get_python_inc())[0]
+    basepath = os.path.split(sysconfig.get_path('include'))[0]
     # build the path to the python executable. If requested use pythonw instead of
     # python
     return os.path.join(basepath, 'python{w}.exe'.format(w=pyw and 'w' or ''))
@@ -215,6 +214,8 @@ def subprocessEnvironment(env=None):
 
     removePaths = set([normalize(x) for x in preditor.core._removeFromPATHEnv])
 
+    # TODO: Replace blurpath code with a plugin for reverting process specific
+    # env var changes when launching a subprocess.
     # blurpath records any paths it adds to the PATH variable and other env variable
     # modifications it makes, revert these changes.
     try:
@@ -239,7 +240,7 @@ def subprocessEnvironment(env=None):
         ]
         path = os.path.pathsep.join(paths)
         # subprocess does not accept unicode in python 2
-        if sys.version_info[0] == 2 and isinstance(path, text):
+        if sys.version_info[0] == 2 and isinstance(path, str):
             path = path.encode('utf8')
         env['PATH'] = path
 

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

@@ -12,8 +12,6 @@ import shutil
 import sys
 from pathlib import Path
 
-import six
-
 from . import resourcePath, utils
 
 # cache of all the preferences
@@ -191,7 +189,7 @@ def create_stamped_path(core_name, filepath, sub_dir='workboxes', time_str=None)
 
     path.parent.mkdir(exist_ok=True)
 
-    path = six.text_type(path)
+    path = str(path)
     return path
 
 
@@ -284,7 +282,7 @@ def get_backup_version_info(core_name, workbox_id, versionType, backup_file=None
                 idx += 1
                 idx = min(idx, count - 1)
 
-    filepath = six.text_type(files[idx])
+    filepath = str(files[idx])
     display_idx = idx + 1
     return filepath, display_idx, count
 
@@ -322,7 +320,7 @@ def update_pref_args(core_name, pref_dict, old_name, update_data):
         orig_pref = pref_dict.pop(old_name)
     pref = orig_pref[:] if isinstance(orig_pref, list) else orig_pref
 
-    if isinstance(pref, six.text_type):
+    if isinstance(pref, str):
         replacements = update_data.get("replace", [])
         for replacement in replacements:
             pref = pref.replace(*replacement)
@@ -332,11 +330,11 @@ def update_pref_args(core_name, pref_dict, old_name, update_data):
         newfilepath = create_stamped_path(core_name, pref)
         orig_filepath = workbox_dir / orig_pref
         if orig_filepath.is_file():
-            orig_filepath = six.text_type(orig_filepath)
+            orig_filepath = str(orig_filepath)
 
             if not Path(newfilepath).is_file():
                 shutil.copy(orig_filepath, newfilepath)
-            newfilepath = six.text_type(Path(newfilepath).relative_to(workbox_dir))
+            newfilepath = str(Path(newfilepath).relative_to(workbox_dir))
 
             pref_dict.update({"backup_file": newfilepath})
 

{preditor-2.1.0 → preditor-2.2.0}/preditor/scintilla/lang/language.py

@@ -2,11 +2,7 @@ from __future__ import absolute_import, print_function
 
 import re
 import sys
-
-try:
-    from configparser import ConfigParser
-except ImportError:
-    from ConfigParser import ConfigParser
+from configparser import ConfigParser
 
 from .. import Qsci
 

{preditor-2.1.0 → preditor-2.2.0}/preditor/scintilla/lexers/maxscriptlexer.py

@@ -1,9 +1,6 @@
 from __future__ import absolute_import
 
 import re
-from builtins import str as text
-
-from future.utils import iteritems
 
 from .. import Qsci, QsciScintilla
 
@@ -35,7 +32,7 @@ class MaxscriptLexer(Qsci.QsciLexerCustom):
             7: 'SmartHighlight',
         }
 
-        for key, value in iteritems(self._styles):
+        for key, value in self._styles.items():
             setattr(self, value, key)
 
     def description(self, style):
@@ -214,7 +211,7 @@ class MaxscriptLexer(Qsci.QsciLexerCustom):
 
         # cache objects used by processChunk that do not need updated every time it is
         # called
-        self.hlkwords = set(text(self.keywords(self.SmartHighlight)).lower().split())
+        self.hlkwords = set(str(self.keywords(self.SmartHighlight)).lower().split())
         self.chunkRegex = re.compile('([^A-Za-z0-9]*)([A-Za-z0-9]*)')
         kwrds = set(MS_KEYWORDS.split())
 

{preditor-2.1.0 → preditor-2.2.0}/preditor/settings.py

@@ -1,14 +1,10 @@
 #!/usr/bin/env python
 from __future__ import absolute_import, print_function
 
+import configparser
 import os
 import sys
 
-try:
-    import configparser
-except Exception:
-    import ConfigParser as configparser  # noqa: N813
-
 # define the default environment variables
 OS_TYPE = ''
 if os.name == 'posix':

{preditor-2.1.0 → preditor-2.2.0}/preditor/utils/text_search.py

@@ -4,10 +4,8 @@ import abc
 import re
 from collections import deque
 
-from future.utils import with_metaclass
 
-
-class TextSearch(with_metaclass(abc.ABCMeta, object)):
+class TextSearch(object, metaclass=abc.ABCMeta):
     """Base class used to search and markup text for matches to a search term.
 
     Parameters:

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

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '2.1.0'
-__version_tuple__ = version_tuple = (2, 1, 0)
+__version__ = version = '2.2.0'
+__version_tuple__ = version_tuple = (2, 2, 0)
 
-__commit_id__ = commit_id = 'g5a664e468'
+__commit_id__ = commit_id = 'g78a8e2938'

{preditor-2.1.0 → preditor-2.2.0}/pyproject.toml

@@ -110,3 +110,36 @@ skip-string-normalization = true
 
 [tool.isort]
 profile = "black"
+
+[tool.deptry]
+# Don't analyze dev requirements used by tox
+pep621_dev_dependency_groups = ["dev"]
+
+[tool.deptry.package_module_name_map]
+PyQt6-QScintilla = "pyqt6_qscintilla"
+QScintilla = "qscintilla"
+
+[tool.deptry.per_rule_ignores]
+DEP001 = [
+    "aspell",
+    # Ignore the maya dcc example plugin import for this check
+    "maya",
+    # The user must choose from the various Qt bindings used by Qt.py
+    "PyQt4",
+    "PyQt5",
+    "PyQt6",
+    "PySide2",
+    "PySide6",
+    "QtSiteConfig",
+    # TODO: Replace blurpath code with a plugin for reverting process specific
+    # env var changes when launching a subprocess.
+    "blurpath",
+]
+DEP003 = [
+    "__main__",
+    "QtSiteConfig",
+]
+DEP002 = [
+    "PyQt6-QScintilla",
+    "QScintilla",
+]

{preditor-2.1.0 → preditor-2.2.0}/requirements.txt

@@ -1,6 +1,4 @@
 charset-normalizer
-configparser>=4.0.2
-future>=0.18.2
 importlib-metadata>=4.8.3
 Qt.py>=1.4.4
 signalslot>=0.1.2

{preditor-2.1.0 → preditor-2.2.0}/tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = begin,py{37,38,39,310,311},end,black,flake8
+envlist = begin,py{37,38,39,310,311,312,313},end,black,flake8,deptry
 skip_missing_interpreters = True
 
 [testenv]
@@ -24,14 +24,14 @@ deps =
 commands =
     coverage erase
 
-[testenv:py{37,38,39,310,311}]
+[testenv:py{37,38,39,310,311,312,313}]
 depends = begin
 
 [testenv:end]
 basepython = python3
 depends =
     begin
-    py{37,38,39,310,311}
+    py{37,38,39,310,311,312,313}
 parallel_show_output = True
 deps =
     coverage
@@ -55,3 +55,13 @@ deps =
     pep8-naming==0.13.3
 commands =
     python -m flake8 .
+
+[testenv:deptry]
+# Only the 0.24.0 version of deptry seems to work when running in tox so py3.11+
+basepython = python3.11
+deps =
+    deptry>=0.24.0
+    # Install the optional dependencies users may use (excluding qt plugin versions)
+    .[cli,dev,shortcut]
+commands =
+    python -m deptry .

preditor-2.1.0/preditor/resource/environment_variables.html

@@ -1,26 +0,0 @@
-<html>
-<head/>
-<body>
-	<h1>blurdev</h1>
-	<hr>
-	<h2>blurdev Site variables:</h2>
-	<p><span style=" font-style:italic;">These variables should be defined at a user or system level to configure blurdev.</span></p>
-	<p><span style=" font-weight:bold;">BDEV_DESIGNERPLUG_*:</span> Used to add a collection of designer plugins to QDesigner. Should be set to "XMLPATH,MODULE_DIR". XMLPATH is the full path to a xml file listing plugins to load. MODULE_DIR is a path that needs added to sys.path so the modules in XMLPATH are importable. You can use environment variables in these strings, they will be expanded. This is used by QDesigner, nothing else.</p>
-	<p><span style=" font-weight:bold;">BDEV_OFFLINE:</span> If set to 1, this indicates that blurdev is not running on the "Blur" network. This causes the [* Offline] section of blurdev/resource/settings.ini to override the [Default] and [*] sections. When blurdev is imported it adds all env vars defined in settings.ini for the current operating system  and Default if they are not already defined in os.environ.</p>
-	<p><span style=" font-weight:bold;">BDEV_PATH_PREFS:</span> This environment variable points to where per-computer user prefs are stored.</p>
-	<p><span style=" font-weight:bold;">BDEV_PATH_PREFS_SHARED:</span> This environment variable points to where shared user prefs are stored. This is often on the network and includes the os's logged in username in the path. If BDEV_OFFLINE is set to 1 this may point to the BDEV_PATH_PREFS location.</p>
-	<p></p>
-	<h2>blurdev Temp variables:</h2>
-	<p><span style=" font-style:italic;">These variables should not be defined all the time.</span></p>
-	<p><span style=" font-weight:bold;">BDEV_DISABLE_AUTORUN:</span> Set to "true" to disable the autorun.bat script used at blur. If this is not set when Maya shuts down, maya takes minutes to close. Maya uses several subprocess calls when closing and for some reason the doskey calls in the script take much longer than normal.</p>
-	<p><span style=" font-weight:bold;">BDEV_STYLESHEET:</span> Used to override the stylesheet when initalizing blurdev.</p>
-	<p><span style=" font-weight:bold;">BDEV_TOOL_ENVIRONMENT:</span> Forces blurdev to initialize with this treegrunt environment name. When saving prefs, this environment name change will not be saved. This is mostly used to ensure that launching a subprocess or farm job happens on the same treegrunt environment.</p>
-	<p></p>
-	<h1>trax</h1>
-	<hr>
-	<p><span style=" font-weight:bold;">TRAX_SPOOL_DIRECTORY_OVERRIDE:</span> If defined, all messages will be stored the directory of this variable. Each message filename will have a "[mapping.mount()]_" prefix added giving you a hint to which server it would have ended up on. Defining this variable effectively disables all spool messages, and gives you a way to see what each spool message would look like. If your code depends on trax.api.spool.waitForCompletion, it will never complete.</p>
-	<h1>Notes</h1>
-	<hr>
-	<p>Any variable names containing a * are wildcards. This allows you to add as many instances of that environment variable type as needed.</p>
-</body>
-</html>