Skip to content

Commit

Permalink
pushed dev version of 4.x to 4.0.1, #1041
Browse files Browse the repository at this point in the history
  • Loading branch information
sehmaschine committed Dec 18, 2023
1 parent ef0f5a4 commit 2b52d5c
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 18 deletions.
1 change: 1 addition & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ Releases

Current development branches:

* Grappelli 4.0.1 (Development version for Django 5.0, see branch Stable/4.0.x)
* Grappelli 3.0.9 (Development version for Django 4.0, see branch Stable/3.0.x)
* Grappelli 2.15.7 (Development version for Django 3.2, see branch Stable/2.15.x)

Expand Down
5 changes: 5 additions & 0 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
Changelog
=========

4.0.1 (not yet released)
------------------------

* Compatibility with Django 5.x

3.0.9 (not yet released)
------------------------

Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@
# built documents.
#
# The short X.Y version.
version = "3.0.9"
version = "4.0.1"
# The full version, including alpha/beta/rc tags.
release = "3.0.9"
release = "4.0.1"

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
4 changes: 2 additions & 2 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
contain the root `toctree` directive.
.. |grappelli| replace:: Grappelli
.. |filebrowser| replace:: FileBrowser
.. |grappelliversion| replace:: 3.0.9
.. |grappelliversion| replace:: 4.0.1

.. _index:

Expand All @@ -16,7 +16,7 @@ Documentation
This documentation covers version |version| of |grappelli|. |grappelli| is a grid-based alternative/extension to the `Django <http://www.djangoproject.com>`_ administration interface.

.. note::
|grappelli| |version| requires Django 4.0. More on :ref:`versions`.
|grappelli| |version| requires Django 5.0. More on :ref:`versions`.

Installation & Setup
--------------------
Expand Down
4 changes: 2 additions & 2 deletions docs/quickstart.rst
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
.. |grappelli| replace:: Grappelli
.. |filebrowser| replace:: FileBrowser
.. |grappelliversion| replace:: 3.0.9
.. |grappelliversion| replace:: 4.0.1

.. _quickstart:

Quick start guide
=================

For using |grappelli| |grappelliversion|, `Django 4.0 <http://www.djangoproject.com>`_ needs to be installed and an `Admin Site <http://docs.djangoproject.com/en/4.0/ref/contrib/admin/>`_ has to be activated.
For using |grappelli| |grappelliversion|, `Django 5.0 <http://www.djangoproject.com>`_ needs to be installed and an `Admin Site <http://docs.djangoproject.com/en/5.0/ref/contrib/admin/>`_ has to be activated.

Installation
------------
Expand Down
12 changes: 6 additions & 6 deletions docs/releasenotes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@

.. _releasenotes:

Grappelli 3.0.x Release Notes
Grappelli 4.0.x Release Notes
=============================

**Grappelli 3.0.x is compatible with Django 4.0**.
**Grappelli 4.0.x is compatible with Django 5.0**.

Update from Grappelli 2.15.x
----------------------------
Update from Grappelli 3.x
-------------------------

* Update Django to 4.0 and check https://docs.djangoproject.com/en/4.0/releases/4.0/
* Update Grappelli to 3.0.x
* Update Django to 5.x and check the Django release notes
* Update Grappelli to 4.x
2 changes: 1 addition & 1 deletion grappelli/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSION = "3.0.9"
VERSION = "4.0.1"
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "django-grappelli",
"version": "3.0.9",
"version": "4.0.1",
"description": "A jazzy skin for the Django admin interface",
"author": "Patrick Kranzlmueller, Axel Swoboda",
"license": "New BSD",
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ def read(fname):

setup(
name="django-grappelli",
version="3.0.9",
version="4.0.1",
description="A jazzy skin for the Django Admin-Interface.",
long_description=read("README.rst"),
url="http://django-grappelli.readthedocs.org",
Expand Down
6 changes: 3 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[tox]
envlist = py{38}-django40
py38-django40
envlist = py{311}-django50
py311-django50

[testenv]
setenv =
PYTHONDONTWRITEBYTECODE=1
deps =
-rrequirements/requirements-testing.txt
coverage
django40: Django>=4.0,<4.1
django50: Django>=5.0,<4.5
commands = ./runtests.py {posargs}
allowlist_externals = *

0 comments on commit 2b52d5c

Please sign in to comment.