Skip to content

Commit

Permalink
Merge pull request #118 from matorral-project/upgrade-to-django-5.0
Browse files Browse the repository at this point in the history
Upgrade to Django 5.0
  • Loading branch information
matagus authored Mar 1, 2024
2 parents 20a5d3f + ea6e9b8 commit 719095d
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 6 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
fail-fast: true
matrix:
python-version: ["3.9", "3.10", "3.11", "3.12"]
django-version: ["4.0", "4.1", "4.2"]
django-version: ["4.0", "4.1", "4.2", "5.0"]
os: [ubuntu-latest]
exclude:
- django-version: "4.0"
Expand All @@ -26,6 +26,8 @@ jobs:
python-version: "3.12"
- django-version: "4.1"
python-version: "3.12"
- django-version: "5.0"
python-version: "3.9"
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# matorral

![Python Compatibility](https://img.shields.io/badge/python-3.9%20%7C%203.10%20%7C%203.11%20%7C%203.12-blue.svg) ![Django Compatibility](https://img.shields.io/badge/django-4.0%20%7C%204.1%20%7C%204.2%20%7C%205.0-green.svg)

## Overview

A very simple project managent tool built with Django & Bulma.io.
Expand Down
2 changes: 1 addition & 1 deletion config/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version = "0.1.0"
version = "0.2.0"
9 changes: 6 additions & 3 deletions matorral/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,12 @@ <h1 class="title has-text-white-bis">
Workspaces
</a>
{% endif %}
<a href="{% url 'logout' %}" class="navbar-item">
Logout
</a>
<form method="post" action="{% url 'logout' %}" class="navbar-item">
{% csrf_token %}
<button class="button" type="submit" onclick="event.preventDefault(); this.form.submit();">
Logout
</button>
</form>
</div>
</div>
</div>
Expand Down
7 changes: 6 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ classifiers = [
"Framework :: Django :: 4.0",
"Framework :: Django :: 4.1",
"Framework :: Django :: 4.2",
"Framework :: Django :: 5.0",
"Intended Audience :: Developers",
"Intended Audience :: End Users/Desktop",
"License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
Expand All @@ -32,7 +33,7 @@ classifiers = [
"Programming Language :: Python :: Implementation :: PyPy",
]
dependencies = [
"Django>=4.0,<5.0",
"Django>=4.0,<6.0",
"celery",
"django-admin-list-filter-dropdown",
"django-debug-toolbar",
Expand Down Expand Up @@ -120,6 +121,10 @@ python = ["3.9", "3.10", "3.11"]
django = ["4.2"]
python = ["3.9", "3.10", "3.11", "3.12"]

[[tool.hatch.envs.test.matrix]]
django = ["5.0"]
python = ["3.10", "3.11", "3.12"]

[tool.hatch.envs.test.scripts]
test = "python manage.py test --settings=config.settings.testing"
test-cov = "coverage run -m django test --settings=config.settings.testing"
Expand Down

0 comments on commit 719095d

Please sign in to comment.