Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v2.6.1 personal TEST #1

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
strategy:
max-parallel: 5
matrix:
Expand All @@ -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
Expand All @@ -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') }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion jazzmin/__init__.py
Original file line number Diff line number Diff line change
@@ -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"
5 changes: 3 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -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 <packages@shipit.ltd>"]
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions tests/test_admin_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
)
Expand Down Expand Up @@ -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",
}
)
Expand Down