diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ea1b10de..14d970ef 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: @@ -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 a847dc46..5d60cd5d 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -6,12 +6,12 @@ on: jobs: deploy: - runs-on: ubuntu-latest + 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 4bf6f3fa..9211a9f9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,12 +6,12 @@ on: jobs: deploy: - runs-on: ubuntu-latest + 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/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..033cc072 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 "] @@ -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 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", } )