Commits

Gustavo Picon committed 204a8fb

Django 1.4 was released, and 1.2 support was dropped. Treebeard now needs Django 1.3+

  • Participants
  • Parent commits cb5a598

Comments (0)

Files changed (7)

   (http://www.feinheit.ch/media/labs/feincms/admin.html). Thanks ORCAS!
 * Updated setup.py to use distribute/setuptools instead of distutils
 * Now using pytest for testing
-* Updated docs: the library supports python 2.4+ and Django 1.2+
+* Updated docs: the library supports python 2.4+ and Django 1.3+
 * Small optimization to ns_tree.is_root (thanks jaap3)
 * Moved treebeard.tests to it's own directory (instead of tests.py)
 * Added the runtests.py test runner
 ================
 
 django-treebeard is a library that implements efficient tree implementations
-for the Django Web Framework 1.2+, written by Gustavo Picón and licensed under
+for the Django Web Framework 1.3+, written by Gustavo Picón and licensed under
 the Apache License 2.0.
 
 django-treebeard is:

File docs/index.rst

 
 `django-treebeard <https://tabo.pe/projects/django-treebeard/>`_
 is a library that implements efficient tree implementations for the
-`Django Web Framework 1.2+ <http://www.djangoproject.com/>`_, written by
+`Django Web Framework 1.3+ <http://www.djangoproject.com/>`_, written by
 `Gustavo Picón <https://tabo.pe>`_ and licensed under the Apache License 2.0.
 
 ``django-treebeard`` is:
 
 
 .. _`Django Model Inheritance with abstract classes`:
-   http://docs.djangoproject.com/en/1.2/topics/db/models/#id6
+   https://docs.djangoproject.com/en/1.4/topics/db/models/#abstract-base-classes
 
 
 Indices and tables

File docs/intro.rst

 -------------
 
 ``django-treebeard`` needs at least **Python 2.4** to run, and
-**Django 1.2 or better**.
+**Django 1.3 or better**.
 
 
 Installation

File docs/mp_tree.rst

 .. moduleauthor:: Gustavo Picon <tabo@tabo.pe>
 
 This is an efficient implementation of Materialized Path
-trees for Django 1.2+, as described by `Vadim Tropashko`_ in `SQL Design
+trees for Django 1.3+, as described by `Vadim Tropashko`_ in `SQL Design
 Patterns`_. Materialized Path is probably the fastest way of working with
 trees in SQL without the need of extra work in the database, like Oracle's
 ``CONNECT BY`` or sprocs and triggers for nested intervals.

File docs/ns_tree.rst

 .. module:: treebeard.ns_tree
 .. moduleauthor:: Gustavo Picon <tabo@tabo.pe>
 
-An implementation of Nested Sets trees for Django 1.2+, as described by
+An implementation of Nested Sets trees for Django 1.3+, as described by
 `Joe Celko`_ in `Trees and Hierarchies in SQL for Smarties`_.
 
 Nested sets have very efficient reads at the cost of high maintenance on
 
 [tox]
 envlist =
-    py24-dj12-sqlite,
-    py24-dj12-mysql,
-    py24-dj12-postgres,
     py24-dj13-sqlite,
     py24-dj13-mysql,
     py24-dj13-postgres,
-    py25-dj12-sqlite,
-    py25-dj12-mysql,
-    py25-dj12-postgres,
     py25-dj13-sqlite,
     py25-dj13-mysql,
     py25-dj13-postgres,
-    py26-dj12-sqlite,
-    py26-dj12-mysql,
-    py26-dj12-postgres,
+    py25-dj14-sqlite,
+    py25-dj14-mysql,
+    py25-dj14-postgres,
     py26-dj13-sqlite,
     py26-dj13-mysql,
     py26-dj13-postgres,
-    py27-dj12-sqlite,
-    py27-dj12-mysql,
-    py27-dj12-postgres,
+    py26-dj14-sqlite,
+    py26-dj14-mysql,
+    py26-dj14-postgres,
     py27-dj13-sqlite,
     py27-dj13-mysql,
-    py27-dj13-postgres
+    py27-dj13-postgres,
+    py27-dj14-sqlite,
+    py27-dj14-mysql,
+    py27-dj14-postgres
 
 [testenv]
 commands =
 commands =
     sphinx-build -W -b html -d {envtmpdir}/doctrees .  {envtmpdir}/html
 
-[testenv:py24-dj12-sqlite]
-basepython=python2.4
-deps =
-    Django>=1.2,<1.3
-    pysqlite
-    coverage
-    pytest
-setenv =
-    DATABASE_ENGINE=sqlite3
-
-[testenv:py24-dj12-mysql]
-basepython=python2.4
-deps =
-    Django>=1.2,<1.3
-    MySQL-python
-    coverage
-    pytest
-setenv =
-    DATABASE_ENGINE=mysql
-
-[testenv:py24-dj12-postgres]
-basepython=python2.4
-deps =
-    Django>=1.2,<1.3
-    psycopg2==2.4.1
-    coverage
-    pytest
-setenv =
-    DATABASE_ENGINE=postgresql_psycopg2
-
 [testenv:py24-dj13-sqlite]
 basepython=python2.4
 deps =
 setenv =
     DATABASE_ENGINE=postgresql_psycopg2
 
-[testenv:py25-dj12-sqlite]
-basepython=python2.5
-deps =
-    Django>=1.2,<1.3
-    coverage
-    pytest
-setenv =
-    DATABASE_ENGINE=sqlite3
-
-[testenv:py25-dj12-mysql]
-basepython=python2.5
-deps =
-    Django>=1.2,<1.3
-    MySQL-python
-    coverage
-    pytest
-setenv =
-    DATABASE_ENGINE=mysql
-
-[testenv:py25-dj12-postgres]
-basepython=python2.5
-deps =
-    Django>=1.2,<1.3
-    psycopg2==2.4.1
-    coverage
-    pytest
-setenv =
-    DATABASE_ENGINE=postgresql_psycopg2
-
 [testenv:py25-dj13-sqlite]
 basepython=python2.5
 deps =
 setenv =
     DATABASE_ENGINE=postgresql_psycopg2
 
-[testenv:py26-dj12-sqlite]
-basepython=python2.6
+[testenv:py25-dj14-sqlite]
+basepython=python2.5
 deps =
-    Django>=1.2,<1.3
+    Django>=1.4,<1.5
     coverage
     pytest
 setenv =
     DATABASE_ENGINE=sqlite3
 
-[testenv:py26-dj12-mysql]
-basepython=python2.6
+[testenv:py25-dj14-mysql]
+basepython=python2.5
 deps =
-    Django>=1.2,<1.3
+    Django>=1.4,<1.5
     MySQL-python
     coverage
     pytest
 setenv =
     DATABASE_ENGINE=mysql
 
-[testenv:py26-dj12-postgres]
-basepython=python2.6
+[testenv:py25-dj14-postgres]
+basepython=python2.5
 deps =
-    Django>=1.2,<1.3
+    Django>=1.4,<1.5
     psycopg2==2.4.1
     coverage
     pytest
 setenv =
     DATABASE_ENGINE=postgresql_psycopg2
 
-[testenv:py27-dj12-sqlite]
-basepython=python2.7
+[testenv:py26-dj14-sqlite]
+basepython=python2.6
 deps =
-    Django>=1.2,<1.3
+    Django>=1.4,<1.5
     coverage
     pytest
 setenv =
     DATABASE_ENGINE=sqlite3
 
-[testenv:py27-dj12-mysql]
-basepython=python2.7
+[testenv:py26-dj14-mysql]
+basepython=python2.6
 deps =
-    Django>=1.2,<1.3
+    Django>=1.4,<1.5
     MySQL-python
     coverage
     pytest
 setenv =
     DATABASE_ENGINE=mysql
 
-[testenv:py27-dj12-postgres]
-basepython=python2.7
+[testenv:py26-dj14-postgres]
+basepython=python2.6
 deps =
-    Django>=1.2,<1.3
+    Django>=1.4,<1.5
     psycopg2==2.4.1
     coverage
     pytest
     pytest
 setenv =
     DATABASE_ENGINE=postgresql_psycopg2
+
+[testenv:py27-dj14-sqlite]
+basepython=python2.7
+deps =
+    Django>=1.4,<1.5
+    coverage
+    pytest
+setenv =
+    DATABASE_ENGINE=sqlite3
+
+[testenv:py27-dj14-mysql]
+basepython=python2.7
+deps =
+    Django>=1.4,<1.5
+    MySQL-python
+    coverage
+    pytest
+setenv =
+    DATABASE_ENGINE=mysql
+
+[testenv:py27-dj14-postgres]
+basepython=python2.7
+deps =
+    Django>=1.4,<1.5
+    psycopg2==2.4.1
+    coverage
+    pytest
+setenv =
+    DATABASE_ENGINE=postgresql_psycopg2