diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8f85fd2..407f4c6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,36 +5,31 @@ on: [push, pull_request] jobs: build: name: ${{ matrix.variant }} py=${{ matrix.python-version }} dj=${{ matrix.django-version }} drf=${{ matrix.drf-version }} pandas=${{ matrix.pandas-version }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 env: TEST_VARIANT: ${{ matrix.variant }} strategy: matrix: - python-version: ["3.10", "3.9", "3.8"] - django-version: [4.0.6] - drf-version: [3.13.1] - pandas-version: [1.4.3] + python-version: ["3.11", "3.10", "3.9", "3.8"] + django-version: [4.1.7] + drf-version: [3.14.0] + pandas-version: [1.5.3] variant: [''] include: - - python-version: "3.10" - django-version: 4.0.6 - drf-version: 3.13.1 - pandas-version: 1.4.3 + - python-version: "3.11" + django-version: 4.1.7 + drf-version: 3.14.0 + pandas-version: 1.5.3 variant: matplotlib - - python-version: "3.10" - django-version: 4.0.6 - drf-version: 3.13.1 - pandas-version: 1.4.3 + - python-version: "3.11" + django-version: 4.1.7 + drf-version: 3.14.0 + pandas-version: 1.5.3 variant: django-pandas - - python-version: "3.10" - django-version: 3.2.14 - drf-version: 3.13.1 - pandas-version: 1.4.3 - variant: '' - - python-version: "3.7" + - python-version: "3.11" django-version: 3.2.14 drf-version: 3.13.1 - pandas-version: 1.3.5 + pandas-version: 1.5.3 variant: '' steps: - uses: actions/checkout@v2 @@ -66,13 +61,13 @@ jobs: run: python -m unittest discover -s tests -t . -v npm: name: "@wq/${{ matrix.package }}" - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 env: PACKAGE: ${{ matrix.package }} strategy: matrix: - python-version: ["3.10"] - node-version: [16] + python-version: ["3.11"] + node-version: [18] package: - pandas - chart diff --git a/LICENSE b/LICENSE index 1a78ac6..e026fb7 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2014-2019, S. Andrew Sheppard, https://wq.io/ +Copyright (c) 2014-2023, S. Andrew Sheppard, https://wq.io/ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/setup.py b/setup.py index f1b9818..6c2b5ac 100644 --- a/setup.py +++ b/setup.py @@ -73,9 +73,11 @@ def readme(): "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", "Framework :: Django", "Framework :: Django :: 3.2", "Framework :: Django :: 4.0", + "Framework :: Django :: 4.1", "Topic :: Scientific/Engineering :: Information Analysis", "Topic :: Scientific/Engineering :: Visualization", ], diff --git a/tests/files/multitimeseries.html b/tests/files/multitimeseries.html index 5c9eab0..38a2a30 100644 --- a/tests/files/multitimeseries.html +++ b/tests/files/multitimeseries.html @@ -3,23 +3,24 @@ Multi Time Series - + + - + - + + data-admin-utc-offset="0">
diff --git a/tests/files/timeseries.html b/tests/files/timeseries.html index dbf6c00..7f85364 100644 --- a/tests/files/timeseries.html +++ b/tests/files/timeseries.html @@ -3,23 +3,24 @@ Time Series Custom - + + - + - + + data-admin-utc-offset="0">
diff --git a/tests/settings.py b/tests/settings.py index 72ceef0..115df4b 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -32,6 +32,7 @@ }, ] +TIME_ZONE = "UTC" DEBUG = True diff --git a/tests/test_views.py b/tests/test_views.py index 972cc2c..fa39167 100644 --- a/tests/test_views.py +++ b/tests/test_views.py @@ -9,6 +9,8 @@ class PandasTestCase(APITestCase): + maxDiff = None + def setUp(self): data = ( ("2014-01-01", 0.5), @@ -60,7 +62,7 @@ def test_view_json(self): self.assertIn("id", data[0]) self.assertEqual(data[0]["id"], 1) self.assertEqual(data[0]["value"], 0.5) - self.assertEqual(data[0]["date"], "2014-01-01T00:00:00.000Z") + self.assertEqual(data[0]["date"], "2014-01-01T00:00:00.000") def test_view_json_kwargs(self): response = self.client.get("/timeseries.json?date_format=epoch")