Merge pull request wildfish#13 from wildfish/feature/py312

Feature/py312

Author: jamesoutterside

.github/workflows/build.yml

@@ -17,6 +17,7 @@ jobs:
           - "3.9"
           - "3.10"
           - "3.11"
+          - "3.12"
         django-version:
           - "3.2"
           - "4.0"

README.rst

@@ -24,7 +24,7 @@ Features
 * Dashboard view generation with components including stats, tables, charts and more.
 * HTMX driven dashboards and templates for a modern MPA interface.
 
-Supports Django 3.2 to 4.1, on Python 3.9+.
+Supports Django 3.2 to 4.2, on Python 3.9+.
 
 See the `full documentation <https://wildfish-django-dashboards.readthedocs.io>`_ for details
 of how django-dashboards works.

demos/dashboard/demo/kitchensink/views.py

@@ -28,6 +28,8 @@ def get_context_data(self, **kwargs):
         tabs = [DemoDashboard(), DynamicDashboard(request=self.request)]
         context["tabs"] = tabs
         context["initial_tab"] = tabs[0]
+        # you'd need to combine the media for each tab, for ease just use the first dashboards media here
+        context["dashboard"] = tabs[0]
         return context
 
 

demos/dashboard/requirements.in

@@ -4,7 +4,6 @@
 
 
 # Specific for this demo only.
-# TODO until pip installable
 django-dashboards
 envdir
 django_configurations
@@ -18,3 +17,4 @@ model_bakery
 psutil
 psycopg2
 whitenoise
+setuptools

demos/dashboard/requirements.txt

@@ -1,85 +1,89 @@
 #
-# This file is autogenerated by pip-compile with Python 3.11
+# This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
 #    pip-compile
 #
-django-dashboards==0.1.5
-anyio==3.6.2
-    # via httpcore
-asgiref==3.6.0
-    # via django
-async-timeout==4.0.2
-    # via redis
-autopep8==2.0.2
+anyio==4.0.0
+    # via httpx
+asgiref==3.7.2
+    # via
+    #   django
+    #   django-cors-headers
+autopep8==2.0.4
     # via django-silk
-certifi==2022.12.7
+certifi==2023.7.22
     # via
     #   httpcore
     #   httpx
     #   requests
-charset-normalizer==3.1.0
+charset-normalizer==3.3.2
     # via requests
-django==4.1.7
+django==4.2.7
     # via
+    #   django-asset-definitions
     #   django-configurations
     #   django-cors-headers
     #   django-dashboards
     #   django-grip
     #   django-redis
     #   django-silk
     #   model-bakery
-django-configurations==2.4
+django-asset-definitions==1.0.0
+    # via django-dashboards
+django-configurations==2.5
     # via -r requirements.in
-django-cors-headers==3.14.0
+django-cors-headers==4.3.1
     # via
     #   -r requirements.in
     #   django-dashboards
+django-dashboards==0.1.5
+    # via -r requirements.in
 django-eventstream==4.5.1
     # via -r requirements.in
-django-grip==3.2.0
+django-grip==3.4.0
     # via django-eventstream
-django-redis==5.2.0
+django-redis==5.4.0
     # via -r requirements.in
-django-silk==5.0.3
+django-silk==5.0.4
     # via -r requirements.in
 envdir==1.0.1
     # via -r requirements.in
-faker==18.3.1
+faker==20.0.3
     # via -r requirements.in
 gprof2dot==2022.7.29
     # via django-silk
-gripcontrol==4.1.0
+gripcontrol==4.2.0
     # via
     #   django-eventstream
     #   django-grip
 h11==0.14.0
     # via httpcore
-httpcore==0.16.3
+httpcore==1.0.2
     # via httpx
-httpx==0.23.3
+httpx==0.25.1
     # via -r requirements.in
 idna==3.4
     # via
     #   anyio
+    #   httpx
     #   requests
-    #   rfc3986
-markupsafe==2.1.2
+markupsafe==2.1.3
     # via werkzeug
-model-bakery==1.10.3
+model-bakery==1.17.0
     # via -r requirements.in
-numpy==1.24.2
+numpy==1.26.2
     # via
     #   pandas
     #   patsy
     #   plotly-express
     #   scipy
     #   statsmodels
-packaging==23.0
+packaging==23.2
     # via
     #   plotly
     #   statsmodels
-pandas==1.5.3
+pandas==2.1.3
     # via
     #   django-dashboards
     #   plotly-express
@@ -88,23 +92,23 @@ patsy==0.5.3
     # via
     #   plotly-express
     #   statsmodels
-plotly==5.14.0
+plotly==5.18.0
     # via
     #   django-dashboards
     #   plotly-express
 plotly-express==0.4.1
     # via django-dashboards
-psutil==5.9.4
+psutil==5.9.6
     # via -r requirements.in
-psycopg2==2.9.5
+psycopg2==2.9.9
     # via -r requirements.in
-pubcontrol==3.3.0
+pubcontrol==3.5.0
     # via
     #   django-grip
     #   gripcontrol
-pycodestyle==2.10.0
+pycodestyle==2.11.1
     # via autopep8
-pyjwt==2.6.0
+pyjwt==2.8.0
     # via
     #   django-eventstream
     #   gripcontrol
@@ -113,15 +117,13 @@ python-dateutil==2.8.2
     # via
     #   faker
     #   pandas
-pytz==2023.3
+pytz==2023.3.post1
     # via pandas
-redis==4.5.4
+redis==5.0.1
     # via django-redis
-requests==2.28.2
+requests==2.31.0
     # via pubcontrol
-rfc3986[idna2008]==1.5.0
-    # via httpx
-scipy==1.10.1
+scipy==1.11.3
     # via
     #   plotly-express
     #   statsmodels
@@ -135,21 +137,25 @@ six==1.16.0
 sniffio==1.3.0
     # via
     #   anyio
-    #   httpcore
     #   httpx
-sqlparse==0.4.3
+sqlparse==0.4.4
     # via
     #   django
     #   django-silk
-statsmodels==0.13.5
+statsmodels==0.14.0
     # via plotly-express
-tenacity==8.2.2
+tenacity==8.2.3
     # via plotly
-typing-extensions==4.5.0
+typing-extensions==4.8.0
     # via django-dashboards
-urllib3==1.26.15
+tzdata==2023.3
+    # via pandas
+urllib3==2.1.0
     # via requests
-werkzeug==2.2.3
+werkzeug==2.3.8
     # via django-grip
-whitenoise==6.4.0
+whitenoise==6.6.0
     # via -r requirements.in
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools

docs/dashboards/howto/views.rst

@@ -114,6 +114,8 @@ is how you'd make tabbed dashboards, which leverage HTMXs lazy loading and parti
             tabs = [DemoDashboard(), DynamicDashboard(request=self.request)]
             context["tabs"] = tabs
             context["initial_tab"] = tabs[0]
+            # you'd need to combine the media for each tab, for ease just use the first dashboards media here
+            context["dashboard"] = tabs[0]
             return context
 
     # templates/tabbed.html

requirements.in

@@ -19,6 +19,7 @@ ipdb
 pip-tools
 pre-commit
 typing_extensions
+setuptools
 
 # Testing
 django-webtest
@@ -33,7 +34,7 @@ pytest-isort
 pytest-flake8
 pytest-freezegun
 pytest-mypy
-snapshottest
+syrupy
 
 # Documentation
 sphinx