Skip to content
Browse files

Django 1.4 was released, and 1.2 support was dropped. Treebeard now n…

…eeds Django 1.3+
  • Loading branch information...
1 parent 688c2f4 commit 82e98902a1039eb2abf23c6f7ac97d27ff6a17fc @tabo committed Mar 23, 2012
Showing with 53 additions and 86 deletions.
  1. +1 −1 CHANGES
  2. +1 −1 README
  3. +2 −2 docs/index.rst
  4. +1 −1 docs/intro.rst
  5. +1 −1 docs/mp_tree.rst
  6. +1 −1 docs/ns_tree.rst
  7. +46 −79 tox.ini
View
2 CHANGES
@@ -9,7 +9,7 @@ Release 2.0 (XXX XX, 2012)
(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
View
2 README
@@ -3,7 +3,7 @@ django-treebeard
================
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:
View
4 docs/index.rst
@@ -3,7 +3,7 @@ django-treebeard
`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:
@@ -41,7 +41,7 @@ Contents
.. _`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
View
2 docs/intro.rst
@@ -9,7 +9,7 @@ Prerequisites
-------------
``django-treebeard`` needs at least **Python 2.4** to run, and
-**Django 1.2 or better**.
+**Django 1.3 or better**.
Installation
View
2 docs/mp_tree.rst
@@ -5,7 +5,7 @@ Materialized Path trees
.. 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.
View
2 docs/ns_tree.rst
@@ -4,7 +4,7 @@ Nested Sets trees
.. 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
View
125 tox.ini
@@ -6,30 +6,27 @@
[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 =
@@ -47,36 +44,6 @@ deps =
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 =
@@ -107,174 +74,174 @@ deps =
setenv =
DATABASE_ENGINE=postgresql_psycopg2
-[testenv:py25-dj12-sqlite]
+[testenv:py25-dj13-sqlite]
basepython=python2.5
deps =
- Django>=1.2,<1.3
+ Django>=1.3,<1.4
coverage
pytest
setenv =
DATABASE_ENGINE=sqlite3
-[testenv:py25-dj12-mysql]
+[testenv:py25-dj13-mysql]
basepython=python2.5
deps =
- Django>=1.2,<1.3
+ Django>=1.3,<1.4
MySQL-python
coverage
pytest
setenv =
DATABASE_ENGINE=mysql
-[testenv:py25-dj12-postgres]
+[testenv:py25-dj13-postgres]
basepython=python2.5
deps =
- Django>=1.2,<1.3
+ Django>=1.3,<1.4
psycopg2==2.4.1
coverage
pytest
setenv =
DATABASE_ENGINE=postgresql_psycopg2
-[testenv:py25-dj13-sqlite]
+[testenv:py25-dj14-sqlite]
basepython=python2.5
deps =
- Django>=1.3,<1.4
+ Django>=1.4,<1.5
coverage
pytest
setenv =
DATABASE_ENGINE=sqlite3
-[testenv:py25-dj13-mysql]
+[testenv:py25-dj14-mysql]
basepython=python2.5
deps =
- Django>=1.3,<1.4
+ Django>=1.4,<1.5
MySQL-python
coverage
pytest
setenv =
DATABASE_ENGINE=mysql
-[testenv:py25-dj13-postgres]
+[testenv:py25-dj14-postgres]
basepython=python2.5
deps =
- Django>=1.3,<1.4
+ Django>=1.4,<1.5
psycopg2==2.4.1
coverage
pytest
setenv =
DATABASE_ENGINE=postgresql_psycopg2
-[testenv:py26-dj12-sqlite]
+[testenv:py26-dj13-sqlite]
basepython=python2.6
deps =
- Django>=1.2,<1.3
+ Django>=1.3,<1.4
coverage
pytest
setenv =
DATABASE_ENGINE=sqlite3
-[testenv:py26-dj12-mysql]
+[testenv:py26-dj13-mysql]
basepython=python2.6
deps =
- Django>=1.2,<1.3
+ Django>=1.3,<1.4
MySQL-python
coverage
pytest
setenv =
DATABASE_ENGINE=mysql
-[testenv:py26-dj12-postgres]
+[testenv:py26-dj13-postgres]
basepython=python2.6
deps =
- Django>=1.2,<1.3
+ Django>=1.3,<1.4
psycopg2==2.4.1
coverage
pytest
setenv =
DATABASE_ENGINE=postgresql_psycopg2
-[testenv:py26-dj13-sqlite]
+[testenv:py26-dj14-sqlite]
basepython=python2.6
deps =
- Django>=1.3,<1.4
+ Django>=1.4,<1.5
coverage
pytest
setenv =
DATABASE_ENGINE=sqlite3
-[testenv:py26-dj13-mysql]
+[testenv:py26-dj14-mysql]
basepython=python2.6
deps =
- Django>=1.3,<1.4
+ Django>=1.4,<1.5
MySQL-python
coverage
pytest
setenv =
DATABASE_ENGINE=mysql
-[testenv:py26-dj13-postgres]
+[testenv:py26-dj14-postgres]
basepython=python2.6
deps =
- Django>=1.3,<1.4
+ Django>=1.4,<1.5
psycopg2==2.4.1
coverage
pytest
setenv =
DATABASE_ENGINE=postgresql_psycopg2
-[testenv:py27-dj12-sqlite]
+[testenv:py27-dj13-sqlite]
basepython=python2.7
deps =
- Django>=1.2,<1.3
+ Django>=1.3,<1.4
coverage
pytest
setenv =
DATABASE_ENGINE=sqlite3
-[testenv:py27-dj12-mysql]
+[testenv:py27-dj13-mysql]
basepython=python2.7
deps =
- Django>=1.2,<1.3
+ Django>=1.3,<1.4
MySQL-python
coverage
pytest
setenv =
DATABASE_ENGINE=mysql
-[testenv:py27-dj12-postgres]
+[testenv:py27-dj13-postgres]
basepython=python2.7
deps =
- Django>=1.2,<1.3
+ Django>=1.3,<1.4
psycopg2==2.4.1
coverage
pytest
setenv =
DATABASE_ENGINE=postgresql_psycopg2
-[testenv:py27-dj13-sqlite]
+[testenv:py27-dj14-sqlite]
basepython=python2.7
deps =
- Django>=1.3,<1.4
+ Django>=1.4,<1.5
coverage
pytest
setenv =
DATABASE_ENGINE=sqlite3
-[testenv:py27-dj13-mysql]
+[testenv:py27-dj14-mysql]
basepython=python2.7
deps =
- Django>=1.3,<1.4
+ Django>=1.4,<1.5
MySQL-python
coverage
pytest
setenv =
DATABASE_ENGINE=mysql
-[testenv:py27-dj13-postgres]
+[testenv:py27-dj14-postgres]
basepython=python2.7
deps =
- Django>=1.3,<1.4
+ Django>=1.4,<1.5
psycopg2==2.4.1
coverage
pytest

0 comments on commit 82e9890

Please sign in to comment.
Something went wrong with that request. Please try again.