Add support and testing for Python 3.12

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ '3.8', '3.9', '3.10', '3.11' ]
+        python-version: [ '3.8', '3.9', '3.10', '3.11', '3.12' ]
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/setup

api/tests.py

@@ -602,7 +602,7 @@ def test_post(self):
         results_by_name = {r["name"]: r for r in results}
 
         tag_data = results_by_name["new tag"]
-        self.assertDictContainsSubset(data, tag_data)
+        self.assertEqual(tag_data, tag_data | data)
         self.assertEqual(tag_data["slug"], "new-tag")
         self.assertTrue(tag_data["last_used"])
 
@@ -618,7 +618,7 @@ def test_patch(self):
             modified_data,
         )
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertDictContainsSubset(modified_data, response.data)
+        self.assertEqual(response.data, response.data | modified_data)
 
     def test_delete(self):
         endpoint = f"{self.endpoint}a-name/"
@@ -861,25 +861,27 @@ def setUp(self):
     def test_get(self):
         response = self.client.get(self.endpoint)
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertDictContainsSubset(
-            {
+
+        self.assertEqual(
+            response.data,
+            response.data
+            | {
                 "language": "en-US",
                 "timezone": "UTC",
             },
-            response.data,
         )
-        self.assertDictContainsSubset(
-            {
+        self.assertEqual(
+            response.data["user"],
+            response.data["user"]
+            | {
                 "id": 1,
                 "username": "admin",
                 "first_name": "",
                 "last_name": "",
                 "email": "",
                 "is_staff": True,
             },
-            response.data["user"],
         )
-
         # Test that api_key is in the mix and "some long string"
         self.assertIn("api_key", response.data)
         self.assertTrue(isinstance(response.data["api_key"], str))

babybuddy/__init__.py

@@ -1,4 +1,4 @@
-"""
+r"""
                              .----------------.
                             | .--------------. |
                             | |   ______     | |

package.json

@@ -26,11 +26,11 @@
     "jquery": "^3.7.1",
     "masonry-layout": "^4.2.2",
     "npm-force-resolutions": "^0.0.10",
-    "plotly.js": "^2.26.1",
+    "plotly.js": "^2.27.0",
     "pulltorefreshjs": "^0.1.22",
     "pump": "^3.0.0",
-    "sass": "^1.68.0",
-    "stylelint": "^15.10.3",
+    "sass": "^1.69.4",
+    "stylelint": "^15.11.0",
     "stylelint-config-recommended-scss": "^13.0.0",
     "stylelint-order": "^6.0.3",
     "stylelint-scss": "^5.2.1"

requirements.txt

@@ -1,51 +1,51 @@
 -i https://pypi.python.org/simple
-annotated-types==0.6.0 ; python_version >= '3.8'
-asgiref==3.7.2 ; python_version >= '3.7'
-boto3==1.28.62
-botocore==1.31.62 ; python_version >= '3.7'
-defusedxml==0.7.1 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-diff-match-patch==20230430 ; python_version >= '3.7'
+annotated-types==0.6.0; python_version >= '3.8'
+asgiref==3.7.2; python_version >= '3.7'
+boto3==1.28.68; python_version >= '3.7'
+botocore==1.31.68; python_version >= '3.7'
+defusedxml==0.7.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
+diff-match-patch==20230430; python_version >= '3.7'
 dj-database-url==2.1.0
-django==4.2.6
-django-appconf==1.0.5 ; python_version >= '3.6'
-django-axes==6.1.1
+django==4.2.6; python_version >= '3.8'
+django-appconf==1.0.5; python_version >= '3.6'
+django-axes==6.1.1; python_version >= '3.7'
 django-dbsettings==1.3.0
-django-filter==23.3
+django-filter==23.3; python_version >= '3.7'
 django-imagekit==5.0.0
-django-import-export==3.3.1
-django-qr-code==3.1.1
-django-storages==1.14.1
-django-taggit==4.0.0
-django-widget-tweaks==1.5.0
-djangorestframework==3.14.0
-et-xmlfile==1.1.0 ; python_version >= '3.6'
-faker==19.6.2
-gunicorn==21.2.0
-jmespath==1.0.1 ; python_version >= '3.7'
+django-import-export==3.3.1; python_version >= '3.8'
+django-qr-code==3.1.1; python_version >= '3.7'
+django-storages==1.14.2; python_version >= '3.7'
+django-taggit==4.0.0; python_version >= '3.6'
+django-widget-tweaks==1.5.0; python_version >= '3.8'
+djangorestframework==3.14.0; python_version >= '3.6'
+et-xmlfile==1.1.0; python_version >= '3.6'
+faker==19.11.0; python_version >= '3.8'
+gunicorn==21.2.0; python_version >= '3.5'
+jmespath==1.0.1; python_version >= '3.7'
 markuppy==1.14
 odfpy==1.4.1
 openpyxl==3.1.2
-packaging==23.2 ; python_version >= '3.7'
+packaging==23.2; python_version >= '3.7'
 pilkit==3.0
-pillow==10.0.1
-plotly==5.17.0
-psycopg2-binary==2.9.9
-pydantic==2.4.2 ; python_version >= '3.7'
-pydantic-core==2.10.1 ; python_version >= '3.7'
-python-dateutil==2.8.2 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-python-dotenv==1.0.0
+pillow==10.1.0; python_version >= '3.8'
+plotly==5.17.0; python_version >= '3.6'
+psycopg2-binary==2.9.9; python_version >= '3.7'
+pydantic==2.4.2; python_version >= '3.7'
+pydantic-core==2.10.1; python_version >= '3.7'
+python-dateutil==2.8.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'
+python-dotenv==1.0.0; python_version >= '3.8'
 pytz==2023.3.post1
-pyyaml==6.0.1
-s3transfer==0.7.0 ; python_version >= '3.7'
-segno==1.5.2 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
-setuptools==68.2.2 ; python_version >= '3.8'
-six==1.16.0 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-sqlparse==0.4.4 ; python_version >= '3.5'
-tablib[html,ods,xls,xlsx,yaml]==3.5.0 ; python_version >= '3.8'
-tenacity==8.2.3 ; python_version >= '3.7'
-typing-extensions==4.8.0 ; python_version >= '3.8'
-uritemplate==4.1.1
-urllib3==2.0.6 ; python_version >= '3.10'
-whitenoise==6.5.0
+pyyaml==6.0.1; python_version >= '3.6'
+s3transfer==0.7.0; python_version >= '3.7'
+segno==1.5.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
+setuptools==68.2.2; python_version >= '3.8'
+six==1.16.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'
+sqlparse==0.4.4; python_version >= '3.5'
+tablib[html,ods,xls,xlsx,yaml]==3.5.0; python_version >= '3.8'
+tenacity==8.2.3; python_version >= '3.7'
+typing-extensions==4.8.0; python_version >= '3.8'
+uritemplate==4.1.1; python_version >= '3.6'
+urllib3==2.0.7; python_version >= '3.10'
+whitenoise==6.6.0; python_version >= '3.8'
 xlrd==2.0.1
 xlwt==1.3.0