changed version of branch 2.11.x

sehmaschine · Dec 18, 2017 · 1e44bf4 · 1e44bf4
1 parent c97a1f9
commit 1e44bf4
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 34 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,9 +6,8 @@ install:
 script:
   - tox
 env:
-  - TOXENV=py27
   - TOXENV=py34
   - TOXENV=py35
 branches:
   only:
-    - stable/2.10.x
+    - stable/2.11.x
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -8,20 +8,7 @@
 Changelog
 =========
 
-2.10.2 (not yet released)
+2.11.1 (not yet released)
 -------------------------
 
-* Added: styles for tabular inline help texts.
-* Added: parameter `target` to dashboard link list.
-* Added: system check for `autocomplete_search_fields`.
-* Added: changelink handler with inline rows.
-* Fixed: lookups with `to_field`.
-* Improved: label with related and autocomplete lookup.
-* Improved: testing environment (updated packages).
-* Improved: formset sort templatetag.
-* Improved: use model queryset when constructing search query.
-
-2.10.1 (May 25th 2017)
-----------------------
-
-* First release of Grappelli which is compatible with Django 1.11.
+* First release of Grappelli which is compatible with Django 2.0.
diff --git a/docs/conf.py b/docs/conf.py
@@ -51,9 +51,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.10.2'
+version = '2.11.1'
 # The full version, including alpha/beta/rc tags.
-release = '2.10.2'
+release = '2.11.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/index.rst b/docs/index.rst
@@ -4,7 +4,7 @@
    contain the root `toctree` directive.
 .. |grappelli| replace:: Grappelli
 .. |filebrowser| replace:: FileBrowser
-.. |grappelliversion| replace:: 2.10.2
+.. |grappelliversion| replace:: 2.11.1
 
 .. _index:
 

diff --git a/docs/quickstart.rst b/docs/quickstart.rst
@@ -1,6 +1,6 @@
 .. |grappelli| replace:: Grappelli
 .. |filebrowser| replace:: FileBrowser
-.. |grappelliversion| replace:: 2.10.2
+.. |grappelliversion| replace:: 2.11.1
 
 .. _quickstart:
 
@@ -35,8 +35,8 @@ Add URL-patterns. The grappelli URLs are needed for related–lookups and autoco
 .. code-block:: python
 
     urlpatterns = [
-        url(r'^grappelli/', include('grappelli.urls')), # grappelli URLS
-        url(r'^admin/', include(admin.site.urls)), # admin site
+        path('grappelli/', include('grappelli.urls')), # grappelli URLS
+        path('admin/', admin.site.urls), # admin site
     ]
 
 Add the request context processor (needed for the Dashboard and the Switch User feature):

diff --git a/docs/releasenotes.rst b/docs/releasenotes.rst
@@ -5,13 +5,13 @@
 
 .. _releasenotes:
 
-Grappelli 2.10.x Release Notes
+Grappelli 2.11.x Release Notes
 =============================
 
-**Grappelli 2.10.x is compatible with Django 1.11**.
+**Grappelli 2.11.x is compatible with Django 2.0**.
 
-Update from Grappelli 2.9.x
----------------------------
+Update from Grappelli 2.10.x
+----------------------------
 
-* Update Django to 1.11 and check https://docs.djangoproject.com/en/dev/releases/1.11/
-* Update Grappelli to 2.10.x
+* Update Django to 2.0 and check https://docs.djangoproject.com/en/dev/releases/2.0/
+* Update Grappelli to 2.11.x
diff --git a/grappelli/__init__.py b/grappelli/__init__.py
@@ -1,2 +1,2 @@
-VERSION = '2.10.2'
+VERSION = '2.11.1'
 default_app_config = 'grappelli.apps.GrappelliConfig'
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Grappelli",
-  "version": "2.10.2",
+  "version": "2.11.1",
   "description": "A jazzy skin for the Django admin interface",
   "author": "Patrick Kranzlmueller, Axel Swoboda",
   "license": "New BSD",

diff --git a/requirements/requirements-testing.txt b/requirements/requirements-testing.txt
@@ -1,4 +1,4 @@
-Django>=1.11,<2.0
+Django>=2.0,<2.1
 py==1.5.2
 pytest-django==3.1.2
 pytest==3.3.1
diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@ def read(fname):
 
 setup(
     name='django-grappelli',
-    version='2.10.2',
+    version='2.11.1',
     description='A jazzy skin for the Django Admin-Interface.',
     long_description=read('README.rst'),
     url='http://django-grappelli.readthedocs.org',

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,34,35}
+envlist = py{34,35}
 
 [testenv]
 setenv =