Skip to content

Commit 23eae2a

Browse files
committed
Drop Django 1.4 and 1.5 official support
1 parent 1e1059c commit 23eae2a

File tree

5 files changed

+9
-43
lines changed

5 files changed

+9
-43
lines changed

.travis.yml

-23
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,6 @@ env:
1313
- SAUCE_USERNAME=digi604
1414
- secure: NWiSBCHFB6LbTMget2qLIdqZlx0zeu3j+Y7Lsqb8kuYXyT2IUBGFVedcGWuGv/9Mzypb80EQWtVTokA3/3QIbesqr29uG95pMPHiYWLdnTO6UHcLMcNXiSzhBGdRDZ40iHSVv2dDHs4GNwGOH5+UCA0z3j7SWmChuFbNXh+Vsqw=
1515
matrix:
16-
- DJANGO=1.4 DATABASE_URL='sqlite://localhost/:memory:' SELENIUM=0
17-
- DJANGO=1.4 DATABASE_URL='mysql://[email protected]/djangocms_test' SELENIUM=0
18-
- DJANGO=1.4 DATABASE_URL='postgres://[email protected]/djangocms_test' SELENIUM=1
19-
- DJANGO=1.5 DATABASE_URL='sqlite://localhost/:memory:' SELENIUM=0
20-
- DJANGO=1.5 DATABASE_URL='mysql://[email protected]/djangocms_test' SELENIUM=0
21-
- DJANGO=1.5 DATABASE_URL='postgres://[email protected]/djangocms_test' SELENIUM=0
22-
- DJANGO=1.5 DATABASE_URL='postgres://[email protected]/djangocms_test' SELENIUM=1 AUTH_USER_MODEL='emailuserapp.EmailUser'
2316
- DJANGO=1.6 DATABASE_URL='sqlite://localhost/:memory:' SELENIUM=0
2417
- DJANGO=1.6 DATABASE_URL='mysql://[email protected]/djangocms_test' SELENIUM=0
2518
- DJANGO=1.6 DATABASE_URL='postgres://[email protected]/djangocms_test' SELENIUM=0
@@ -72,31 +65,15 @@ matrix:
7265
- python: 2.6
7366
env: DJANGO=1.7 DATABASE_URL='postgres://[email protected]/djangocms_test' SELENIUM=1 AUTH_USER_MODEL='emailuserapp.EmailUser'
7467

75-
- python: 3.3
76-
env: DJANGO=1.4 DATABASE_URL='sqlite://localhost/:memory:' SELENIUM=0
77-
- python: 3.3
78-
env: DJANGO=1.4 DATABASE_URL='mysql://[email protected]/djangocms_test' SELENIUM=0
79-
- python: 3.3
80-
env: DJANGO=1.5 DATABASE_URL='mysql://[email protected]/djangocms_test' SELENIUM=0
8168
- python: 3.3
8269
env: DJANGO=1.6 DATABASE_URL='mysql://[email protected]/djangocms_test' SELENIUM=0
8370
- python: 3.3
8471
env: DJANGO=1.7 DATABASE_URL='mysql://[email protected]/djangocms_test' SELENIUM=0
85-
- python: 3.3
86-
env: DJANGO=1.4 DATABASE_URL='postgres://[email protected]/djangocms_test' SELENIUM=1
8772

88-
- python: 3.4
89-
env: DJANGO=1.4 DATABASE_URL='sqlite://localhost/:memory:' SELENIUM=0
90-
- python: 3.4
91-
env: DJANGO=1.4 DATABASE_URL='mysql://[email protected]/djangocms_test' SELENIUM=0
92-
- python: 3.4
93-
env: DJANGO=1.5 DATABASE_URL='mysql://[email protected]/djangocms_test' SELENIUM=0
9473
- python: 3.4
9574
env: DJANGO=1.6 DATABASE_URL='mysql://[email protected]/djangocms_test' SELENIUM=0
9675
- python: 3.4
9776
env: DJANGO=1.7 DATABASE_URL='mysql://[email protected]/djangocms_test' SELENIUM=0
98-
- python: 3.4
99-
env: DJANGO=1.4 DATABASE_URL='postgres://[email protected]/djangocms_test' SELENIUM=1
10077

10178
allow_failures:
10279
- python: 2.7

docs/extending_cms/placeholders.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ or has to have edit permission on that specific object of that model.
228228
Model permissions are usually added through default django auth application
229229
and its admin interface. On the other hand, object permission can be handled by
230230
writing custom Auth Backend as described in
231-
`django docs <https://docs.djangoproject.com/en/1.5/topics/auth/customizing/#handling-object-permissions>`_
231+
`django docs <https://docs.djangoproject.com/en/1.7/topics/auth/customizing/#handling-object-permissions>`_
232232
For example, if there is a ``UserProfile`` model that contains placeholder field
233233
then custom backend can have following ``has_perm`` method that grants all rights
234234
to current user only on his ``UserProfile`` object::

docs/getting_started/integrate.rst

+8-9
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ Requirements
1313
************
1414

1515
* `Python`_ 2.6, 2.7, 3.3 or 3.4.
16-
* `Django`_ 1.4.x, 1.5.x, 1.6.x or 1.7.x
16+
* `Django`_ 1.6.x or 1.7.x
1717
* `South`_ 1.0
1818
* `django-classy-tags`_ 0.5 or higher
19-
* `django-mptt`_ 0.6 (strict due to API compatibility issues)
19+
* `django-treebeard`_ 2.0 (strict due to API compatibility issues)
2020
* `django-sekizai`_ 0.7 or higher
2121
* `html5lib`_ 0.99 or higher
2222
* `djangocms-admin-style`_
@@ -38,7 +38,7 @@ Requirements
3838
.. _Django: https://www.djangoproject.com
3939
.. _South: http://south.aeracode.org/
4040
.. _django-classy-tags: https://github.com/ojii/django-classy-tags
41-
.. _django-mptt: https://github.com/django-mptt/django-mptt
41+
.. _django-treebeard: http://code.tabo.pe/django-treebeard/src
4242
.. _django-sekizai: https://github.com/ojii/django-sekizai
4343
.. _html5lib: https://github.com/html5lib/html5lib-python
4444
.. _django-i18nurls: https://github.com/brocaar/django-i18nurls
@@ -83,11 +83,10 @@ File and image handling
8383
Revision management
8484
-------------------
8585

86-
* `django-reversion`_ 1.6.6 (with Django 1.4.X), 1.7.X and 1.8 (exact) (with Django 1.5.X)
87-
or 1.8.X (with Django 1.6.X and Django 1.7.X) to support versions of your content (If using
88-
a different Django version it is a good idea to check the page
89-
`Compatible-Django-Versions`_ in the django-reversion wiki in order
90-
to make sure that the package versions are compatible.)
86+
* `django-reversion`_ 1.8.X (with Django 1.6.X and Django 1.7.X) to support
87+
versions of your content (If using a different Django version it is a good
88+
idea to check the page `Compatible-Django-Versions`_ in the django-reversion
89+
wiki in order to make sure that the package versions are compatible.)
9190

9291
.. note::
9392

@@ -826,5 +825,5 @@ with the different plugins provided out of the box and to build great websites!
826825
Furthermore you can continue your introduction into django CMS on https://github.com/divio/django-cms-tutorial.
827826

828827
.. _TinyMCE: http://tinymce.moxiecode.com/
829-
.. _official documentation: http://docs.djangoproject.com/en/1.5/topics/templates/
828+
.. _official documentation: http://docs.djangoproject.com/en/1.7/topics/templates/
830829
.. _mailinglist: https://groups.google.com/forum/#!forum/django-cms

test_requirements/django-1.4.txt

-5
This file was deleted.

test_requirements/django-1.5.txt

-5
This file was deleted.

0 commit comments

Comments
 (0)