Drop support for Python 2, replace setup.cfg with pyproject.toml

Author: MHendricks

.github/workflows/static-analysis-and-test.yml

@@ -27,17 +27,14 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          python -m pip install tox
+          python -m pip install tox coverage[toml]
 
       - name: Lint with flake8
         run: tox -e flake8
 
       - name: Format with black
         run: tox -e black
 
-      - name: Py 2 and 3 compatibility
-        run: tox -e modernize
-
 
   test:
     # We want to run on external PRs, but not on our own internal PRs as they'll
@@ -49,9 +46,9 @@ jobs:
 
     strategy:
       matrix:
-        os: ['ubuntu-latest']
+        os: ['ubuntu-latest', 'windows-latest']
         python: ['3.8', '3.9', '3.10', '3.11']
-        # Works around the depreciation of python 3.6, 3.7 for ubuntu
+        # Works around the depreciation of python 3.7 for ubuntu
         # https://github.com/actions/setup-python/issues/544
         include:
           - os: 'ubuntu-22.04'
@@ -85,7 +82,6 @@ jobs:
           include-hidden-files: true
           retention-days: 1
 
-
   coverage:
     # We want to run on external PRs, but not on our own internal PRs as they'll
     # be run by the push to the branch. Without this if check, checks are

.pre-commit-config.yaml

@@ -1,4 +1,8 @@
 ---
+ci:
+  autoupdate_schedule: quarterly
+  skip: [black, flake8]
+
 repos:
 
 -   repo: https://github.com/psf/black
@@ -12,14 +16,9 @@ repos:
     -   id: flake8
         additional_dependencies:
             - flake8-bugbear==22.12.6
+            - Flake8-pyproject
             - pep8-naming==0.13.3
 
--   repo: https://github.com/asottile/setup-cfg-fmt
-    rev: v2.2.0
-    hooks:
-    -   id: setup-cfg-fmt
-        args: [--min-py3-version=3.6]
-
 -   repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.4.0
     hooks:

CONTRIBUTING.md

@@ -56,7 +56,7 @@ A set of GitHub Action workflows are in place to perform the following style and
 
 **Styling**
 
-Styling or linting is performed via [flake8] along with the plugins [flake8-bugbear] & [pep8-naming]. A minor amount of configuration has been added to _[setup.cfg]_ in order to provide better compatibility with our formatter black (see next section).
+Styling or linting is performed via [flake8] along with the plugins [flake8-bugbear], [Flake8-pyproject] & [pep8-naming]. A minor amount of configuration has been added to _[pyproject.toml]_ in order to provide better compatibility with our formatter black (see next section).
 
 **Formatting**
 
@@ -69,8 +69,9 @@ Releases are made manually by project managers and will automatically be uploade
 
 [flake8]: https://github.com/PyCQA/flake8
 [flake8-bugbear]: https://github.com/PyCQA/flake8-bugbear
+[Flake8-pyproject]: https://github.com/john-hen/Flake8-pyproject
 [pep8-naming]: https://github.com/PyCQA/pep8-naming
-[setup.cfg]: https://github.com/blurstudio/preditor/blob/master/setup.cfg
+[pyproject.toml]: https://github.com/blurstudio/hab/blob/master/pyproject.toml
 [black]: https://github.com/psf/black
 [Issues]: https://github.com/blurstudio/preditor/issues
 [create a new issue]: https://github.com/blurstudio/preditor/issues/new

README.md

@@ -128,8 +128,7 @@ The more mature QScintilla workbox requires a few extra dependencies that must
 be passed manually. It hasn't been added to `extras_require` because we plan to
 split it into its own pip module due to it requiring PyQt5 which is a little hard
 to get working inside of DCC's that ship with PySide2 by default. Here is the
-python 3 pip install command(For python 2 you will need to compile QScintilla
-yourself.)
+python 3 pip install command.
 
 - `pip install preditor PyQt5, QScintilla>=2.11.4 aspell-python-py3`
 

pyproject.toml

@@ -1,15 +1,128 @@
 [build-system]
 requires = [
     "setuptools >= 44.1.1",
-    "setuptools_scm[toml] >= 4, <6",
+    "setuptools_scm[toml] >= 4",
     "wheel >= 0.36",
 ]
 build-backend = "setuptools.build_meta"
 
+[project]
+name = "PrEditor"
+description = "A python REPL and Editor and console based on Qt."
+authors = [{name = "Blur Studio", email = "[email protected]"}]
+license = {text = "LGPL-3.0"}
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: Implementation :: CPython",
+    "Programming Language :: Python :: Implementation :: PyPy",
+]
+requires-python = ">=3.7"
+dependencies = [
+    "Qt.py",
+    "configparser>=4.0.2",
+    "future>=0.18.2",
+    "signalslot>=0.1.2",
+    "importlib-metadata>=4.8.3",
+]
+dynamic = ["version"]
+
+[project.readme]
+file = "README.md"
+content-type = "text/markdown"
+
+[project.urls]
+Homepage = "https://github.com/blurstudio/PrEditor"
+Source = "https://github.com/blurstudio/PrEditor"
+Tracker = "https://github.com/blurstudio/PrEditor/issues"
+
+[project.optional-dependencies]
+cli =[
+    "click>=7.1.2",
+    "click-default-group",
+]
+dev =[
+    "black",
+    "build",
+    "covdefaults",
+    "coverage",
+    "flake8",
+    "flake8-bugbear",
+    "Flake8-pyproject",
+    "pep8-naming",
+    "pytest",
+    "tox",
+]
+shortcut =[
+    "casement>=0.1.0;platform_system=='Windows'",
+]
+
+[project.scripts]
+preditor = "preditor.cli:cli"
+
+[project.gui-scripts]
+preditorw = "preditor.cli:cli"
+
+[project.entry-points."preditor.plug.about_module"]
+PrEditor = "preditor.about_module:AboutPreditor"
+Qt = "preditor.about_module:AboutQt"
+Python = "preditor.about_module:AboutPython"
+Exe = "preditor.about_module:AboutExe"
+
+[project.entry-points."preditor.plug.editors"]
+TextEdit = "preditor.gui.workbox_text_edit:WorkboxTextEdit"
+QScintilla = "preditor.gui.workboxwidget:WorkboxWidget"
+
+[project.entry-points."preditor.plug.logging_handlers"]
+PrEditor = "preditor.gui.logger_window_handler:LoggerWindowHandler"
+
+
+[tool.setuptools]
+include-package-data = true
+platforms = ["any"]
+license-files = ["LICENSE"]
+
+[tool.setuptools.packages.find]
+exclude = ["tests"]
+namespaces = false
+
 [tool.setuptools_scm]
 write_to = "preditor/version.py"
 version_scheme = "release-branch-semver"
 
+[tool.flake8]
+select = ["B", "C", "E", "F", "N", "W", "B9"]
+extend-ignore = [
+    "E203",
+    "E501",
+    "E722",
+    "N802",
+    "N803",
+    "N806",
+    "N815",
+    "N816",
+    "W503",
+]
+max-line-length = "80"
+exclude = [
+    "*.egg-info",
+    "*.pyc",
+    ".cache",
+    ".eggs",
+    ".git",
+    ".tox",
+    "__pycache__",
+    "build",
+    "dist",
+    "docs",
+    "shared-venv",
+]
+
+
 [tool.black]
 skip-string-normalization = true
 

requirements.txt

@@ -1,5 +1,6 @@
+build
 configparser>=4.0.2
 future>=0.18.2
-importlib-metadata>=4.8.3;python_version>="3.6"
+importlib-metadata>=4.8.3
 Qt.py
 signalslot>=0.1.2