Implements Tethys Reactpy App Scaffold

.github/workflows/tethys.yml

@@ -220,7 +220,7 @@ jobs:
         run: |
           cd ..
           . ~/miniconda/etc/profile.d/conda.sh;
-          conda create -y -c conda-forge -n conda-build conda-build anaconda-client 
+          conda create -y -c conda-forge -n conda-build conda-build anaconda-client
           conda activate conda-build
           conda config --set anaconda_upload no
           mkdir -p ~/conda-bld
@@ -259,7 +259,7 @@ jobs:
         run: |
           cd ..
           . ~/miniconda/etc/profile.d/conda.sh;
-          conda create -y -c conda-forge -n conda-build conda-build anaconda-client 
+          conda create -y -c conda-forge -n conda-build conda-build anaconda-client
           conda activate conda-build
           conda config --set anaconda_upload no
           mkdir -p ~/conda-bld

docs/conf.py

@@ -11,10 +11,10 @@
 #
 # All configuration values have a default; values that are commented out
 # serve to show the default.
-import os
 import sys
 import subprocess
 from dataclasses import asdict
+from os import environ
 from pathlib import Path
 from unittest import mock
 
@@ -106,7 +106,7 @@ def __getattr__(cls, name):
 # patcher.start()
 
 # Fixes django settings module problem
-sys.path.insert(0, os.path.abspath(".."))
+sys.path.insert(0, Path("..").absolute().resolve())
 
 installed_apps = [
     "django.contrib.admin",
@@ -165,7 +165,7 @@ def __getattr__(cls, name):
 copyright = "2023, Tethys Platform"
 
 # on_rtd is whether we are on readthedocs.org, this line of code grabbed from docs.readthedocs.org
-on_rtd = os.environ.get("READTHEDOCS") == "True"
+on_rtd = environ.get("READTHEDOCS") == "True"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -178,7 +178,7 @@ def __getattr__(cls, name):
 print(f'Using simplified version "{version}"')
 
 # Determine branch
-git_directory = Path(__file__).parent.parent
+git_directory = Path(__file__).parents[1]
 ret = subprocess.run(
     ["git", "-C", git_directory, "rev-parse", "--abbrev-ref", "HEAD"],
     capture_output=True,
@@ -256,10 +256,10 @@ def __getattr__(cls, name):
 todo_emit_warnings = True
 
 # Define the canonical URL if you are using a custom domain on Read the Docs
-html_baseurl = os.environ.get("READTHEDOCS_CANONICAL_URL", "")
+html_baseurl = environ.get("READTHEDOCS_CANONICAL_URL", "")
 
 # Tell Jinja2 templates the build is running on Read the Docs
-if os.environ.get("READTHEDOCS", "") == "True":
+if environ.get("READTHEDOCS", "") == "True":
     if "html_context" not in globals():
         html_context = {}
     html_context["READTHEDOCS"] = True

environment.yml

@@ -21,8 +21,7 @@ dependencies:
 
   # core dependencies
   - django>=3.2,<6
-  - channels
-  - daphne
+  - channels["daphne"]
   - setuptools_scm
   - pip
   - requests # required by lots of things
@@ -105,3 +104,7 @@ dependencies:
   - factory_boy
   - flake8
   - flake8-bugbear
+
+  # reactpy dependencies
+  - pip:
+    - reactpy-django

micro_environment.yml

@@ -20,8 +20,7 @@ dependencies:
 
   # core dependencies
   - django>=3.2,<6
-  - channels
-  - daphne
+  - channels["daphne"]
   - setuptools_scm
   - pip
   - requests # required by lots of things

tests/apps/tethysapp-test_app/install-with-post.yml

@@ -11,4 +11,4 @@ requirements:
       - geojson
       - shapely
 post:
-  - ./test.sh
+  - ./test.py

tests/apps/tethysapp-test_app/test.py

@@ -0,0 +1 @@
+print("test")

tests/coverage.cfg

@@ -3,6 +3,7 @@
 [run]
 source = $TETHYS_TEST_DIR/../tethys_apps
          $TETHYS_TEST_DIR/../tethys_cli
+         $TETHYS_TEST_DIR/../tethys_components
          $TETHYS_TEST_DIR/../tethys_compute
          $TETHYS_TEST_DIR/../tethys_config
          $TETHYS_TEST_DIR/../tethys_gizmos

tests/unit_tests/test_tethys_apps/test_admin.py

@@ -1,4 +1,4 @@
-import os
+from pathlib import Path
 import unittest
 from unittest import mock
 from django.db.utils import ProgrammingError
@@ -47,8 +47,8 @@ class TestTethysAppAdmin(unittest.TestCase):
     def setUp(self):
         from tethys_apps.models import TethysApp
 
-        self.src_dir = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
-        self.root_app_path = os.path.join(self.src_dir, "apps", "tethysapp-test_app")
+        self.src_dir = Path(__file__).parents[1]
+        self.root_app_path = self.src_dir / "apps" / "tethysapp-test_app"
         self.app_model = TethysApp(name="admin_test_app", package="admin_test_app")
         self.app_model.save()
         self.proxy_app_model = ProxyApp(

tests/unit_tests/test_tethys_apps/test_base/test_app_base.py

@@ -6,6 +6,7 @@
 from django.db.utils import ProgrammingError
 from django.test import RequestFactory, override_settings
 from django.core.exceptions import ValidationError, ObjectDoesNotExist
+from argparse import Namespace
 
 from tethys_apps.exceptions import (
     TethysAppSettingDoesNotExist,
@@ -1543,3 +1544,36 @@ def test_remove_from_db_2(self, mock_ta, mock_log):
 
         # Check tethys log error
         mock_log.error.assert_called()
+
+    def test_navigation_links_not_auto(self):
+        app = tethys_app_base.TethysAppBase()
+        app.nav_links = ["test", "1", "2", "3"]
+        links = app.navigation_links
+        self.assertListEqual(links, app.nav_links)
+
+    def test_navigation_links_auto_excluded_page(self):
+        app = tethys_app_base.TethysAppBase()
+        app.nav_links = "auto"
+        app.index = "home"
+        app.root_url = "test-app"
+
+        app._registered_url_maps = [
+            Namespace(name="exclude_page", title="Exclude Page", index=-1),
+            Namespace(name="last_page", title="Last Page", index=3),
+            Namespace(name="third_page", title="Third Page", index=2),
+            Namespace(name="second_page", title="Second Page", index=1),
+            Namespace(name="home", title="Home", index=0),
+        ]
+
+        links = app.navigation_links
+
+        self.assertListEqual(
+            links,
+            [
+                {"title": "Home", "href": "/apps/test-app/"},
+                {"title": "Second Page", "href": "/apps/test-app/second-page/"},
+                {"title": "Third Page", "href": "/apps/test-app/third-page/"},
+                {"title": "Last Page", "href": "/apps/test-app/last-page/"},
+            ],
+        )
+        self.assertEqual(links, app.nav_links)

tests/unit_tests/test_tethys_apps/test_base/test_consumer.py

@@ -1,6 +1,6 @@
-import os
 import json
 import asyncio
+from os import environ
 
 from tethys_sdk.testing import TethysTestCase
 from channels.testing import WebsocketCommunicator
@@ -15,7 +15,7 @@ def test_consumer(self):
         asyncio.set_event_loop(event_loop)
 
         async def run_test():
-            os.environ.setdefault("DJANGO_SETTINGS_MODULE", "tethys_portal.settings")
+            environ.setdefault("DJANGO_SETTINGS_MODULE", "tethys_portal.settings")
             settings.CHANNEL_LAYERS = {}
 
             communicator = WebsocketCommunicator(