Refactor repo to match ReactPy Router (#216)

Author: Archmonger

Diff for: .github/workflows/publish-develop-docs.yml

@@ -1,4 +1,5 @@
 name: Publish Develop Docs
+
 on:
     push:
         branches:
@@ -17,5 +18,6 @@ jobs:
             - name: Publish Develop Docs
               run: |
                   git config user.name github-actions
-                  git config user.email [email protected] 
+                  git config user.email [email protected]
+                  cd docs
                   mike deploy --push develop

Diff for: .github/workflows/publish-py.yml

@@ -13,7 +13,7 @@ jobs:
         steps:
             - uses: actions/checkout@v3
             - name: Set up Python
-              uses: actions/setup-python@v1
+              uses: actions/setup-python@v4
               with:
                   python-version: "3.x"
             - name: Install dependencies

Diff for: .github/workflows/publish-release-docs.yml

@@ -18,5 +18,6 @@ jobs:
             - name: Publish ${{ github.event.release.name }} Docs
               run: |
                   git config user.name github-actions
-                  git config user.email [email protected] 
+                  git config user.email [email protected]
+                  cd docs
                   mike deploy --push --update-aliases ${{ github.event.release.name }} latest

Diff for: .github/workflows/test-docs.yml

@@ -26,11 +26,11 @@ jobs:
                   linkcheckMarkdown docs/ -v -r
                   linkcheckMarkdown README.md -v -r
                   linkcheckMarkdown CHANGELOG.md -v -r
+                  cd docs
                   mkdocs build --strict
             - name: Check docs examples
               run: |
                   pip install -r requirements/check-types.txt
                   pip install -r requirements/check-style.txt
                   mypy --show-error-codes docs/examples/python/
-                  black docs/examples/python/ --check
                   ruff check docs/examples/python/

Diff for: .github/workflows/test-src.yml

@@ -25,5 +25,4 @@ jobs:
             - name: Install Python Dependencies
               run: pip install -r requirements/test-run.txt
             - name: Run Tests
-              run: |
-                  nox -s test
+              run: nox -t test

Diff for: CHANGELOG.md

@@ -444,7 +444,7 @@ Using the following categories, list your changes in this order:
 
 -   Support for IDOM within the Django
 
-[unreleased]: https://github.com/reactive-python/reactpy-django/compare/3.6.0...HEAD
+[Unreleased]: https://github.com/reactive-python/reactpy-django/compare/3.6.0...HEAD
 [3.6.0]: https://github.com/reactive-python/reactpy-django/compare/3.5.1...3.6.0
 [3.5.1]: https://github.com/reactive-python/reactpy-django/compare/3.5.0...3.5.1
 [3.5.0]: https://github.com/reactive-python/reactpy-django/compare/3.4.0...3.5.0

Diff for: README.md

@@ -7,7 +7,7 @@
     <a href="https://pypi.python.org/pypi/reactpy-django">
         <img src="https://img.shields.io/pypi/v/reactpy-django.svg?label=PyPI">
     </a>
-    <a href="https://github.com/reactive-python/reactpy/blob/main/LICENSE">
+    <a href="https://github.com/reactive-python/reactpy-django/blob/main/LICENSE.md">
         <img src="https://img.shields.io/badge/License-MIT-purple.svg">
     </a>
     <a href="https://reactive-python.github.io/reactpy-django/">

Diff for: mkdocs.yml renamed to docs/mkdocs.yml

@@ -25,7 +25,7 @@ nav:
 
 theme:
     name: material
-    custom_dir: docs/overrides
+    custom_dir: overrides
     palette:
         - media: "(prefers-color-scheme: dark)"
           scheme: slate
@@ -114,12 +114,11 @@ extra_css:
     - assets/css/home.css
 
 watch:
-    - docs
-    - mkdocs.yml
-    - README.md
-    - CHANGELOG.md
-    - LICENSE.md
-    - .mailmap
+    - ../docs
+    - ../README.md
+    - ../CHANGELOG.md
+    - ../LICENSE.md
+    - ../.mailmap
 
 site_name: ReactPy-Django
 site_author: Archmonger
@@ -133,6 +132,6 @@ This project has no affiliation to ReactJS or Meta Platforms, Inc.
 </div>'
 repo_url: https://github.com/reactive-python/reactpy-django
 site_url: https://reactive-python.github.io/reactpy-django
-repo_name: reactive-python/reactpy-django
+repo_name: ReactPy Django (GitHub)
 edit_uri: edit/main/docs/src
-docs_dir: docs/src
+docs_dir: src

Diff for: docs/src/about/code.md

@@ -52,13 +52,13 @@ pip install -r requirements.txt --upgrade --verbose
 By running the command below you can run the full test suite:
 
 ```bash linenums="0"
-nox -s test
+nox -t test
 ```
 
 Or, if you want to run the tests in the background:
 
 ```bash linenums="0"
-nox -s test -- --headless
+nox -t test -- --headless
 ```
 
 ## Running Django tests

Diff for: docs/src/about/docs.md

@@ -34,6 +34,7 @@ pip install -r requirements.txt --upgrade
 Finally, to verify that everything is working properly, you can manually run the docs preview web server.
 
 ```bash linenums="0"
+cd docs
 mkdocs serve
 ```
 

Diff for: noxfile.py

@@ -1,41 +1,19 @@
 from __future__ import annotations
 
-import re
 from glob import glob
 from pathlib import Path
 
-import nox
-from nox.sessions import Session
+from nox import Session, session
 
-HERE = Path(__file__).parent
-POSARGS_PATTERN = re.compile(r"^(\w+)\[(.+)\]$")
+ROOT_DIR = Path(__file__).parent
 
 
-@nox.session(reuse_venv=True)
-def manage(session: Session) -> None:
-    """Run a manage.py command for tests/test_app"""
-    session.install("-r", "requirements/test-env.txt")
-    session.install("reactpy[stable]")
-    session.install("-e", ".")
-    session.chdir("tests")
-    session.run("python", "manage.py", *session.posargs)
-
-
-@nox.session
-def test(session: Session) -> None:
-    """Run the complete test suite"""
-    session.install("--upgrade", "pip", "setuptools", "wheel")
-    session.notify("test_suite", posargs=session.posargs)
-    session.notify("test_types")
-    session.notify("test_style")
-
-
-@nox.session
-def test_suite(session: Session) -> None:
+@session(tags=["test"])
+def test_python(session: Session) -> None:
     """Run the Python-based test suite"""
     install_requirements_file(session, "test-env")
     session.install(".[all]")
-    session.chdir(HERE / "tests")
+    session.chdir(ROOT_DIR / "tests")
     session.env["REACTPY_DEBUG_MODE"] = "1"
 
     posargs = session.posargs[:]
@@ -53,9 +31,7 @@ def test_suite(session: Session) -> None:
     settings_files = glob(settings_glob)
     assert settings_files, f"No Django settings files found at '{settings_glob}'!"
     for settings_file in settings_files:
-        settings_module = (
-            settings_file.strip(".py").replace("/", ".").replace("\\", ".")
-        )
+        settings_module = settings_file.strip(".py").replace("/", ".").replace("\\", ".")
         session.run(
             "python",
             "manage.py",
@@ -68,28 +44,30 @@ def test_suite(session: Session) -> None:
         )
 
 
-@nox.session
+@session(tags=["test"])
 def test_types(session: Session) -> None:
     install_requirements_file(session, "check-types")
     install_requirements_file(session, "pkg-deps")
     session.run("mypy", "--show-error-codes", "src/reactpy_django", "tests/test_app")
 
 
-@nox.session
+@session(tags=["test"])
 def test_style(session: Session) -> None:
     """Check that style guidelines are being followed"""
     install_requirements_file(session, "check-style")
-    session.run(
-        "black",
-        ".",
-        "--check",
-        "--extend-exclude",
-        "/migrations/",
-    )
     session.run("ruff", "check", ".")
 
 
+@session(tags=["test"])
+def test_javascript(session: Session) -> None:
+    install_requirements_file(session, "test-env")
+    session.chdir(ROOT_DIR / "src" / "js")
+    session.run("python", "-m", "nodejs.npm", "install", external=True)
+    session.run("python", "-m", "nodejs.npm", "run", "check")
+
+
 def install_requirements_file(session: Session, name: str) -> None:
-    file_path = HERE / "requirements" / f"{name}.txt"
+    session.install("--upgrade", "pip", "setuptools", "wheel")
+    file_path = ROOT_DIR / "requirements" / f"{name}.txt"
     assert file_path.exists(), f"requirements file {file_path} does not exist"
     session.install("-r", str(file_path))

Diff for: requirements/check-style.txt

@@ -1,2 +1 @@
-black
 ruff

Diff for: setup.py

@@ -25,7 +25,7 @@
 package = {
     "name": name,
     "python_requires": ">=3.9",
-    "packages": find_namespace_packages(str(src_dir)),
+    "packages": find_namespace_packages(src_dir),
     "package_dir": {"": "src"},
     "description": "It's React, but in Python. Now with Django integration.",
     "author": "Mark Bakhit",