Commits

Gustavo Picon committed 0c3bb21 Merge

merging from 1.6.x branch

Comments (0)

Files changed (6)

 630024c53f5fac1f5aae412fcfc8c207e5a9d3da 1.5
 3fe083f135c7e36c08e76448368355af30125e50 1.51
 0ea8c876d30783ef3a0e8b6f9565371c0f13e8a5 1.52
+d73b1298ef049d6ddc5fbfc665f51a3c7b376494 1.6
+d73b1298ef049d6ddc5fbfc665f51a3c7b376494 1.6
+b510c7559b915a59f647276affd460e24c85ae9c 1.6
+0b95d619fc8a264ac93ed6de6b1e34886e7d5d07 1.60
 
-Release 1.6
------------
+Release 1.60 (Apr 18, 2010)
+---------------------------
 
 * Added get_annotated_list, contributed by Alexey Kinyov
 * Complete revamp of the documentation. It's now divided in sections for easier
 django-treebeard
 ================
 
-django-treebeard is a library that implements efficient tree
-implementations for the Django Web Framework 1.0+. It includes 3 different
-tree implementations: Adjacency List, Materialized Path and Nested Sets.
-Each one has it's own strength and weaknesses but share the same
-API, so it's easy to switch between implementations.
+django-treebeard is a library that implements efficient tree implementations
+for the Django Web Framework 1.0+, written by Gustavo Picón and licensed under
+the Apache License 2.0.
 
-django-treebeard uses Django Model Inheritance with abstract classes
-to let you define your own models. To use django-treebeard:
+django-treebeard is:
 
-    1. Run `easy_install django-treebeard` to install the
-       latest treebeard version from PyPi
-       1.1. If you don't like easy_install, download a release from the
-       treebeard download page or get a development version
-       from the treebeard mercurial repository and run
-       `python setup.py install`
-    2. Add 'treebeard' to the `INSTALLED_APPS` section in your
-       django settings file.
-    3. Create a new model that inherits from one of django-treebeard's
-       abstract tree models: mp_tree.MP_Node (materialized path),
-       ns_tree.NS_Node (nested sets) or al_tree.AL_Node
-       (adjacency list).
-    4. Run `python manage.py syncdb`
-    5. (Optional) If you are going to use the `admin.TreeAdmin`
-       class for the django admin, you should install treebeard as a
-       directory instead of an egg:
-       `easy_install --always-unzip django-treebeard`.
-       If you install treebeard as an egg, you'll need to enable
-       `django.template.loaders.eggs.load_template_source` in the
-       `TEMPLATE_LOADERS` setting in your django settings file.
-       Either way, you need to add the path (filesystem or python
-       namespace) to treebeard's templates in `TEMPLATE_DIRS`.
-       Also you need to enable `django-core-context-processors-request`_
-       in the ``TEMPLATE_CONTEXT_PROCESSORS`` setting in your django
-       settings file.
+- **Flexible**: Includes 3 different tree implementations with the same API:
+
+  1. Adjacency List
+  2. Materialized Path
+  3. Nested Sets
+
+- **Fast**: Optimized non-naive tree operations (see Benchmarks).
+- **Easy**: Uses Django Model Inheritance with abstract classes to define your own
+  models.
+- **Clean**: Testable and well tested code base. Code/branch test coverage is above
+  96%.
 
 You can find the documentation in
 
-    http://docs.tabo.pe/django-treebeard/tip/
+    https://tabo.pe/projects/django-treebeard/docs/tip/
 # built documents.
 #
 # The short X.Y version.
-version = '1.6'
+version = '1.60'
 # The full version, including alpha/beta/rc tags.
-release = '1.6'
+release = '1.60'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 import os
 from distutils.core import setup
 
-version = '1.6'
+version = '1.60'
 
 classifiers = [
     "Development Status :: 5 - Production/Stable",

treebeard/__init__.py

-__version__ = '1.6'
+__version__ = '1.60'