From bd48579bf92f5cf064e29cd8996af9f0f555ee89 Mon Sep 17 00:00:00 2001 From: James Gilmore Date: Thu, 21 Mar 2024 11:52:47 +0000 Subject: [PATCH 1/5] Release v2.6.1 of Django-Jazzmin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds support for Django 4.2 Changes: - Remove errant “sourceMappingURL” referencing a non-existent file (@codyfletcher) (#474) --- jazzmin/__init__.py | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jazzmin/__init__.py b/jazzmin/__init__.py index f2f68bb8..60bb152b 100644 --- a/jazzmin/__init__.py +++ b/jazzmin/__init__.py @@ -1,6 +1,6 @@ import django -version = "2.6.0" +version = "2.6.1" if django.VERSION < (3, 2): default_app_config = "jazzmin.apps.JazzminConfig" diff --git a/pyproject.toml b/pyproject.toml index 29f0d0c2..fe518867 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "django-jazzmin" -version = "2.6.0" +version = "2.6.1" description = "Drop-in theme for django admin, that utilises AdminLTE 3 & Bootstrap 4 to make yo' admin look jazzy" license = "MIT" authors = ["Shipit "] From 519bbe6e44f2321e127a1d997ffcda70a588545f Mon Sep 17 00:00:00 2001 From: James Gilmore Date: Thu, 21 Mar 2024 13:47:33 +0000 Subject: [PATCH 2/5] Pin the ubuntu image the GHA runs on due to missing tarballs Known issue of the `action/setup-python` action [0]. Workaround is to pin the ubuntu image to a known working version [1]. This is consistent with pinning most other packages anyway so don't think this is much of an issue. [0] https://github.com/actions/setup-python/issues/544 [1] https://github.com/actions/setup-python/issues/544#issuecomment-1320295576 --- .github/workflows/build.yml | 2 +- .github/workflows/pre-release.yml | 2 +- .github/workflows/release.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ea1b10de..7ed7158f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,7 +9,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 strategy: max-parallel: 5 matrix: diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index a847dc46..5e86f9f8 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -6,7 +6,7 @@ on: jobs: deploy: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4bf6f3fa..a9325806 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,7 +6,7 @@ on: jobs: deploy: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 From d7e247d0e3163cb41246003fbafeb4439dd81a53 Mon Sep 17 00:00:00 2001 From: James Gilmore Date: Thu, 21 Mar 2024 14:59:29 +0000 Subject: [PATCH 3/5] Fix tests running in tox for Django 4.8 In Django 4.8 there is a change to the tests need as the date widget was added - `admin/widgets/date.html`. --- tests/test_admin_views.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/test_admin_views.py b/tests/test_admin_views.py index 4681bed8..a8ca0258 100644 --- a/tests/test_admin_views.py +++ b/tests/test_admin_views.py @@ -226,6 +226,7 @@ def test_detail(admin_client): { "django/forms/div.html": 1, "django/forms/errors/list/default.html": 2, + "admin/widgets/date.html": 3, "django/forms/errors/list/ul.html": 56, } ) @@ -264,6 +265,7 @@ def test_detail(admin_client): { "django/forms/div.html", "django/forms/errors/list/default.html", + "admin/widgets/date.html", "django/forms/errors/list/ul.html", } ) From 60de2a011644ac67906a3108b8533669253c1d29 Mon Sep 17 00:00:00 2001 From: James Gilmore Date: Thu, 21 Mar 2024 17:03:20 +0000 Subject: [PATCH 4/5] Version bump all GHA actions to remove node.js v16 warning. Warning message from GHA before version bump: ``` Node.js 16 actions are deprecated. Please update the following actions to use Node.js 20: actions/checkout@v3, actions/setup-python@v3, actions/cache@v3. For more information see: https://github.blog/changelog/2023-09-22-github-actions-transitioning-from-node-16-to-node-20/. ``` --- .github/workflows/build.yml | 6 +++--- .github/workflows/pre-release.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7ed7158f..14d970ef 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,12 +18,12 @@ jobs: COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 1 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} cache: pip @@ -35,7 +35,7 @@ jobs: run: tox - name: cache deps - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.tox key: deps-${{ hashFiles('**/pyproject.toml') }} diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 5e86f9f8..5d60cd5d 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -8,10 +8,10 @@ jobs: deploy: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: "3.x" cache: pip diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a9325806..9211a9f9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,10 +8,10 @@ jobs: deploy: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: "3.x" cache: pip From a56b9722522239be1e08f48847491ca506c76266 Mon Sep 17 00:00:00 2001 From: James Gilmore Date: Thu, 21 Mar 2024 17:09:03 +0000 Subject: [PATCH 5/5] Improve pinning of `importlib-metadata` for compatability reasons. Only impacts certain version of Python, where the `flake8` package is trying to get the entrypoints of a package using a deprecated method of importlib-metadata. Basically just an issue with the package dependencies not being defined very well downstream. --- pyproject.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index fe518867..033cc072 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -127,8 +127,9 @@ deps = black beautifulsoup4 dj-database-url - importlib-metadata==4.13.0 factory-boy + python3.6: importlib-metadata<5.0 # Needed for compatibility reasons - https://stackoverflow.com/a/73932581 + python3.7: importlib-metadata<5.0 # Needed for compatibility reasons - https://stackoverflow.com/a/73932581 django2: Django<3 django3: Django<4 django4: Django<5