Merge branch 'main' into fix-broken-links-2

Author: swainn

.github/workflows/tethys-release.yml

@@ -20,7 +20,7 @@ jobs:
       matrix:
         platform: [ubuntu-latest]
         python-version: ["3.10", "3.11", "3.12"]
-        django-version: ["3.2", "4.2", "5.1"]
+        django-version: ["3.2", "4.2", "5.2"]
     steps:
       # Checkout the source
       - name: Checkout Source

.github/workflows/tethys.yml

@@ -57,7 +57,7 @@ jobs:
       matrix:
         platform: [ubuntu-latest, macos-latest]
         python-version: ["3.10", "3.11", "3.12"]
-        django-version: ["3.2", "4.2", "5.1"]
+        django-version: ["3.2", "4.2", "5.2"]
     steps:
       # Checkout the source
       - name: Checkout Source
@@ -100,7 +100,7 @@ jobs:
       matrix:
         platform: [ubuntu-latest]
         python-version: ["3.10", "3.11", "3.12"]
-        django-version: ["3.2", "4.2", "5.1"]
+        django-version: ["3.2", "4.2", "5.2"]
     steps:
       # Checkout the source
       - name: Checkout Source
@@ -140,7 +140,7 @@ jobs:
       matrix:
         platform: [ubuntu-latest]
         python-version: ["3.10", "3.11", "3.12"]
-        django-version: ["3.2", "4.2", "5.1"]
+        django-version: ["3.2", "4.2", "5.2"]
     services:
       tethys-postgis:
         image: postgis/postgis:14-3.3

README.rst

@@ -14,6 +14,6 @@ Tethys Platform
     :target: http://docs.tethysplatform.org/en/stable/?badge=stable
     :alt: Documentation Status
 
-Tethys Platform provides both a development environment and a hosting environment for water resources web apps.
+Tethys Platform provides both a development environment and a hosting environment for geoscientific web apps.
 
 Documentation can be found here: `<http://docs.tethysplatform.org/>`_

docs/features.rst

@@ -4,13 +4,13 @@ Features
 
 **Last Updated:** May 28, 2015
 
-Tethys is a platform that can be used to develop and host engaging, interactive water resources web applications or web apps. It includes a suite of free and open source software (FOSS) that has been carefully selected to address the unique development needs of water resources web apps. Tethys web apps are developed using a Python software development kit (SDK) which includes programmatic links to each software component. Tethys Platform is powered by the `Django <https://www.djangoproject.com/>`_ Python web framework giving it a solid web foundation with excellent security and performance.
+Tethys is a platform that can be used to develop and host engaging, interactive geoscientific web applications or web apps. It includes a suite of free and open source software (FOSS) that has been carefully selected to address the unique development needs of geoscientific web apps. Tethys web apps are developed using a Python software development kit (SDK) which includes programmatic links to each software component. Tethys Platform is powered by the `Django <https://www.djangoproject.com/>`_ Python web framework giving it a solid web foundation with excellent security and performance.
 
 .. figure:: images/features/example_app_page.png
     :width: 600px
     :align: center
 
-**Tethys platform can be used to create engaging, interactive web apps for water resources.**
+**Tethys platform can be used to create engaging, interactive web apps for the geosciences.**
 
 
 Software Suite
@@ -22,7 +22,7 @@ Tethys Platform provides a suite of free and open source software. Included in t
     :width: 600px
     :align: center
 
-**Tethys Platform include software to meet water resources web app development needs.**
+**Tethys Platform include software to meet geoscientific web app development needs.**
 
 .. note::
 

docs/index.rst

@@ -6,7 +6,7 @@ Tethys Platform |version|
 
 **Last Updated:** September 2024
 
-Tethys is a platform that can be used to develop and host environmental web apps. It includes a suite of free and open source software (FOSS) that has been carefully selected to address the unique development needs of environmental web apps. Tethys web apps are developed using a Python software development kit (SDK) which includes programmatic links to each software component. Tethys Platform is powered by the Django Python web framework giving it a solid web foundation with excellent security and performance. Refer to the :doc:`./features` article for an overview of the features of Tethys Platform.
+Tethys is a platform that can be used to develop and host geoscientific web apps. It includes a suite of free and open source software (FOSS) that has been carefully selected to address the unique development needs of geoscientific web apps. Tethys web apps are developed using a Python software development kit (SDK) which includes programmatic links to each software component. Tethys Platform is powered by the Django Python web framework giving it a solid web foundation with excellent security and performance. Refer to the :doc:`./features` article for an overview of the features of Tethys Platform.
 
 .. important::
 

docs/software_suite.rst

@@ -98,7 +98,7 @@ Distributed Computing
    :width: 300px
    :align: right
 
-To facilitate the large-scale computing that is often required by water resources applications, Tethys Platform leverages the computing management middleware `HTCondor <https://research.cs.wisc.edu/htcondor/>`_ and `Dask Distributed <https://distributed.dask.org/en/stable/>`_.
+To facilitate the large-scale computing that is often required by geoscientific applications, Tethys Platform leverages the computing management middleware `HTCondor <https://research.cs.wisc.edu/htcondor/>`_ and `Dask Distributed <https://distributed.dask.org/en/stable/>`_.
 
 To use the HTCondor or Dask and the computing capabilities in your app use the :doc:`./tethys_sdk/jobs`.
 

tests/unit_tests/test_tethys_apps/test_static_finders.py

@@ -31,11 +31,18 @@ def test_find(self):
         self.assertEqual(self.root / "css" / "main.css", str_ret)
 
     def test_find_all(self):
+        import django
+
         tethys_static_finder = TethysStaticFinder()
         path = Path("test_app") / "css" / "main.css"
-        path_ret = tethys_static_finder.find(path, all=True)
+        use_find_all = django.VERSION >= (5, 2)
+        if use_find_all:
+            path_ret = tethys_static_finder.find(path, find_all=True)
+            str_ret = tethys_static_finder.find(str(path), find_all=True)
+        else:
+            path_ret = tethys_static_finder.find(path, all=True)
+            str_ret = tethys_static_finder.find(str(path), all=True)
         self.assertIn(self.root / "css" / "main.css", path_ret)
-        str_ret = tethys_static_finder.find(str(path), all=True)
         self.assertIn(self.root / "css" / "main.css", str_ret)
 
     def test_find_location_with_no_prefix(self):

tethys_apps/base/paths.py

@@ -3,7 +3,7 @@
 * Name: paths.py
 * Author: Scott Christensen
 * Created On: April 2024
-* Copyright: (c) Tethys Geospatial Foundation 2024
+* Copyright: (c) Tethys Geoscience Foundation 2024
 * License: BSD 2-Clause
 ********************************************************************************
 """

tethys_apps/static_finders.py

@@ -10,6 +10,7 @@
 
 from pathlib import Path
 from collections import OrderedDict as SortedDict
+import django
 from django.contrib.staticfiles import utils
 from django.contrib.staticfiles.finders import BaseFinder
 from django.core.files.storage import FileSystemStorage
@@ -39,15 +40,18 @@ def __init__(self, *args, **kwargs):
 
         super().__init__(*args, **kwargs)
 
-    def find(self, path, all=False):
+    # Django changes the argument `all` to `find_all` since the version 5.2
+    # Remove the argument `all` when Tethys doesn't support Django<5.2 anymore
+    def find(self, path, all=False, find_all=False):
         """
         Looks for files in the Tethys apps static or public directories
         """
+        find_all_files = find_all if django.VERSION >= (5, 2) else all
         matches = []
         for prefix, root in self.locations:
             matched_path = self.find_location(root, path, prefix)
             if matched_path:
-                if not all:
+                if not find_all_files:
                     return matched_path
                 matches.append(matched_path)
         return matches

tethys_compute/static/tethys_compute/css/dask-dashboard.css

@@ -8,4 +8,10 @@
   margin-right: 10%;
   margin-top: 2rem;
   margin-bottom: 2rem;
+  max-height: 58vh;
+  overflow-y: auto;
+}
+
+#dask-dashboard-content > div {
+  height: 800px;
 }