Merge remote-tracking branch 'upstream/main' into use-db-for-clean-tracking

Author: Archmonger

.github/workflows/test-docs.yml

@@ -33,5 +33,4 @@ jobs:
                   pip install -r requirements/check-style.txt
                   mypy --show-error-codes docs/python/
                   black docs/python/ --check
-                  isort docs/python/ --check-only
-                  flake8 docs/python/
+                  ruff check docs/python/

.github/workflows/test-src.yml

@@ -1,35 +1,34 @@
 name: Test
 
 on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
-  schedule:
-    - cron: "0 0 * * *"
+    push:
+        branches:
+            - main
+    pull_request:
+        branches:
+            - main
+    schedule:
+        - cron: "0 0 * * *"
 
 jobs:
-  source:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.8", "3.9", "3.10"]
-    steps:
-      - uses: actions/checkout@v3
-      - uses: nanasess/setup-chromedriver@master
-      - uses: actions/setup-node@v3
-        with:
-          node-version: "14"
-      - name: Use Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Install Python Dependencies
-        run: pip install -r requirements/test-run.txt
-      - name: Run Tests
-        run: |
-          npm install -g npm@latest
-          npm --version
-          nox -s test
+    source:
+        runs-on: ubuntu-latest
+        strategy:
+            matrix:
+                python-version: ["3.9", "3.10", "3.11"]
+        steps:
+            - uses: actions/checkout@v3
+            - uses: actions/setup-node@v3
+              with:
+                  node-version: "14.x"
+            - name: Use Python ${{ matrix.python-version }}
+              uses: actions/setup-python@v4
+              with:
+                  python-version: ${{ matrix.python-version }}
+            - name: Install Python Dependencies
+              run: pip install -r requirements/test-run.txt
+            - name: Run Tests
+              run: |
+                  npm install -g npm@latest
+                  npm --version
+                  nox -s test

CHANGELOG.md

@@ -34,8 +34,16 @@ Using the following categories, list your changes in this order:
 
 ## [Unreleased]
 
+### Added
+
+-   Added system checks for a variety of common ReactPy misconfigurations.
+-   `REACTPY_BACKHAUL_THREAD` setting to enable/disable threading behavior.
+
 ### Changed
 
+-   If using `settings.py:REACTPY_DATABASE`, `reactpy_django.database.Router` must now be registered in `settings.py:DATABASE_ROUTERS`.
+-   By default, ReactPy will now use a backhaul thread to increase performance.
+-   Minimum Python version required is now `3.9`
 -   A thread-safe cache is no longer required.
 
 ## [3.2.1] - 2023-06-29

docs/python/configure-urls.py

@@ -2,6 +2,6 @@
 
 
 urlpatterns = [
-    path("reactpy/", include("reactpy_django.http.urls")),
     ...,
+    path("reactpy/", include("reactpy_django.http.urls")),
 ]

docs/python/settings.py

@@ -1,22 +1,32 @@
+# Cache used to store ReactPy web modules.
 # ReactPy benefits from a fast, well indexed cache.
+# We recommend redis or python-diskcache.
 REACTPY_CACHE = "default"
 
+# Database ReactPy uses to store session data.
 # ReactPy requires a multiprocessing-safe and thread-safe database.
+# DATABASE_ROUTERS is mandatory if REACTPY_DATABASE is configured.
 REACTPY_DATABASE = "default"
+DATABASE_ROUTERS = ["reactpy_django.database.Router", ...]
 
 # Maximum seconds between reconnection attempts before giving up.
 # Use `0` to prevent component reconnection.
 REACTPY_RECONNECT_MAX = 259200
 
-# The URL for ReactPy to serve the component rendering websocket
+# The URL for ReactPy to serve the component rendering websocket.
 REACTPY_WEBSOCKET_URL = "reactpy/"
 
-# Dotted path to the default `reactpy_django.hooks.use_query` postprocessor function, or `None`
+# Dotted path to the default `reactpy_django.hooks.use_query` postprocessor function,
+# or `None`.
 REACTPY_DEFAULT_QUERY_POSTPROCESSOR = "reactpy_django.utils.django_query_postprocessor"
 
-# Dotted path to the Django authentication backend to use for ReactPy components
+# Dotted path to the Django authentication backend to use for ReactPy components.
 # This is only needed if:
 #   1. You are using `AuthMiddlewareStack` and...
 #   2. You are using Django's `AUTHENTICATION_BACKENDS` setting and...
 #   3. Your Django user model does not define a `backend` attribute
-REACTPY_AUTH_BACKEND = None
+REACTPY_AUTH_BACKEND = "django.contrib.auth.backends.ModelBackend"
+
+# Whether to enable rendering ReactPy via a dedicated backhaul thread
+# This allows the webserver to process traffic while during ReactPy rendering
+REACTPY_BACKHAUL_THREAD = True

docs/src/contribute/code.md

@@ -12,7 +12,7 @@
 
 If you plan to make code changes to this repository, you will need to install the following dependencies first:
 
--   [Python 3.8+](https://www.python.org/downloads/)
+-   [Python 3.9+](https://www.python.org/downloads/)
 -   [Git](https://git-scm.com/downloads)
 -   [NPM](https://docs.npmjs.com/try-the-latest-stable-version-of-npm) for installing and managing Javascript
 

docs/src/contribute/docs.md

@@ -8,7 +8,7 @@
 
 If you plan to make changes to this documentation, you will need to install the following dependencies first:
 
--   [Python 3.8+](https://www.python.org/downloads/)
+-   [Python 3.9+](https://www.python.org/downloads/)
 -   [Git](https://git-scm.com/downloads)
 
 Once done, you should clone this repository:

docs/src/contribute/running-tests.md

@@ -10,7 +10,7 @@ This repository uses [Nox](https://nox.thea.codes/en/stable/) to run tests. For
 
 If you plan to run tests, you will need to install the following dependencies first:
 
--   [Python 3.8+](https://www.python.org/downloads/)
+-   [Python 3.9+](https://www.python.org/downloads/)
 -   [Git](https://git-scm.com/downloads)
 
 Once done, you should clone this repository:

docs/src/dictionary.txt

@@ -35,3 +35,6 @@ backends
 backend
 frontend
 frontends
+misconfiguration
+misconfigurations
+backhaul

docs/src/get-started/installation.md

@@ -76,7 +76,7 @@ Register ReactPy's Websocket using `REACTPY_WEBSOCKET_PATH`.
 
     1. Access the `User` that is currently logged in
     2. Login or logout the current `User`
-    3. Access Django's `Sesssion` object
+    3. Access Django's `Session` object
 
     In these situations will need to ensure you are using `AuthMiddlewareStack` and/or `SessionMiddlewareStack`.
 

noxfile.py

@@ -6,7 +6,6 @@
 import nox
 from nox.sessions import Session
 
-
 HERE = Path(__file__).parent
 POSARGS_PATTERN = re.compile(r"^(\w+)\[(.+)\]$")
 
@@ -21,14 +20,6 @@ def manage(session: Session) -> None:
     session.run("python", "manage.py", *session.posargs)
 
 
-@nox.session(reuse_venv=True)
-def format(session: Session) -> None:
-    """Run automatic code formatters"""
-    install_requirements_file(session, "check-style")
-    session.run("black", ".")
-    session.run("isort", ".")
-
-
 @nox.session
 def test(session: Session) -> None:
     """Run the complete test suite"""
@@ -70,15 +61,14 @@ def test_types(session: Session) -> None:
 def test_style(session: Session) -> None:
     """Check that style guidelines are being followed"""
     install_requirements_file(session, "check-style")
-    session.run("flake8", "src/reactpy_django", "tests")
     session.run(
         "black",
         ".",
         "--check",
         "--extend-exclude",
         "/migrations/",
     )
-    session.run("isort", ".", "--check-only")
+    session.run("ruff", "check", ".")
 
 
 def install_requirements_file(session: Session, name: str) -> None:

pyproject.toml

@@ -2,16 +2,6 @@
 requires = ["setuptools>=42", "wheel"]
 build-backend = "setuptools.build_meta"
 
-[tool.isort]
-multi_line_output = 3
-force_grid_wrap = 0
-use_parentheses = "True"
-ensure_newline_before_comments = "True"
-include_trailing_comma = "True"
-line_length = 88
-lines_after_imports = 2
-extend_skip_glob = ["*/migrations/*", '.nox/*', '.venv/*', 'build/*']
-
 [tool.mypy]
 exclude = [
     'migrations/.*',
@@ -22,3 +12,11 @@ warn_redundant_casts = true
 warn_unused_ignores = true
 check_untyped_defs = true
 incremental = false
+
+[tool.ruff.isort]
+known-first-party = ["src", "tests"]
+
+[tool.ruff]
+ignore = ["E501"]
+extend-exclude = ["*/migrations/*", ".venv/*", ".eggs/*", ".nox/*", "build/*"]
+line-length = 120

requirements/check-style.txt

@@ -1,3 +1,2 @@
 black
-flake8
-isort
+ruff

requirements/test-env.txt

@@ -2,3 +2,4 @@ playwright
 twisted
 channels[daphne]>=4.0.0
 tblib
+whitenoise

setup.cfg

@@ -1,11 +1,2 @@
 [bdist_wheel]
 universal=1
-
-[flake8]
-ignore = E203, E266, E501, W503, F811, N802
-max-line-length = 88
-max-complexity = 18
-select = B,C,E,F,W,T4,B9,N,ROH
-exclude =
-    .eggs/*
-    .nox/*

setup.py

@@ -13,7 +13,6 @@
 from setuptools.command.develop import develop
 from setuptools.command.sdist import sdist
 
-
 if sys.platform == "win32":
     from subprocess import list2cmdline
 else:
@@ -22,7 +21,7 @@ def list2cmdline(cmd_list):
         return " ".join(map(pipes.quote, cmd_list))
 
 
-log = getLogger()
+log = getLogger()  # noqa: F811
 log.addHandler(StreamHandler(sys.stdout))
 
 
@@ -47,7 +46,7 @@ def list2cmdline(cmd_list):
 
 package = {
     "name": name,
-    "python_requires": ">=3.8",
+    "python_requires": ">=3.9",
     "packages": find_packages(str(src_dir)),
     "package_dir": {"": "src"},
     "description": "Control the web with Python",
@@ -66,9 +65,9 @@ def list2cmdline(cmd_list):
         "Intended Audience :: Developers",
         "Intended Audience :: Science/Research",
         "Topic :: Multimedia :: Graphics",
-        "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
         "Environment :: Web Environment",
     ],
 }

src/reactpy_django/__init__.py

@@ -1,4 +1,4 @@
-from reactpy_django import components, decorators, hooks, types, utils
+from reactpy_django import checks, components, decorators, hooks, types, utils
 from reactpy_django.websocket.paths import REACTPY_WEBSOCKET_PATH
 
 
@@ -10,4 +10,5 @@
     "decorators",
     "types",
     "utils",
+    "checks",
 ]