Commit 1f29a72f authored by Gustavo Picon's avatar Gustavo Picon

Limited tests (and hence support) to Python 2.7+/3.4+ and Django 1.6+. Updated...

Limited tests (and hence support) to Python 2.7+/3.4+ and Django 1.6+. Updated tox.ini to the newer syntax
parent c19b1df5
Release ?.? (??? ??, 2015)
--------------------------
* Limited tests (and hence support) to Python 2.7+/3.4+ and Django 1.6+
Release 2.0 (April 2, 2014)
---------------------------
......
......@@ -3,7 +3,7 @@ django-treebeard
================
django-treebeard is a library that implements efficient tree implementations
for the Django Web Framework 1.4+, written by Gustavo Picón and licensed under
for the Django Web Framework 1.6+, written by Gustavo Picón and licensed under
the Apache License 2.0.
django-treebeard is:
......
......@@ -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.4+ <http://www.djangoproject.com/>`_, written by
`Django Web Framework 1.6+ <http://www.djangoproject.com/>`_, written by
`Gustavo Picón <https://tabo.pe>`_ and licensed under the Apache License 2.0.
``django-treebeard`` is:
......
......@@ -5,8 +5,8 @@ Installation
Prerequisites
-------------
``django-treebeard`` needs at least **Python 2.6** to run, and
**Django 1.4 or better**.
``django-treebeard`` needs at least **Python 2.7/3.4** to run, and
**Django 1.6 or better**.
Installing
......
......@@ -4,7 +4,7 @@ Materialized Path trees
.. module:: treebeard.mp_tree
This is an efficient implementation of Materialized Path
trees for Django 1.4+, as described by `Vadim Tropashko`_ in `SQL Design
trees for Django, 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.
......
......@@ -3,7 +3,7 @@ Nested Sets trees
.. module:: treebeard.ns_tree
An implementation of Nested Sets trees for Django 1.4+, as described by
An implementation of Nested Sets trees for Django, 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
......
......@@ -37,42 +37,25 @@ tox
``django-treebeard`` uses `tox`_ to run the test suite in all the supported
environments:
- py26-dj14-sqlite
- py26-dj14-mysql
- py26-dj14-pgsql
- py26-dj15-sqlite
- py26-dj15-mysql
- py26-dj15-pgsql
- py26-dj16-sqlite
- py26-dj16-mysql
- py26-dj16-pgsql
- py27-dj14-sqlite
- py27-dj14-mysql
- py27-dj14-pgsql
- py27-dj15-sqlite
- py27-dj15-mysql
- py27-dj15-pgsql
- py32-dj15-sqlite
- py32-dj15-pgsql
- py33-dj15-sqlite
- py33-dj15-pgsq
- py27-dj16-sqlite
- py27-dj16-mysql
- py27-dj16-pgsql
- py32-dj16-sqlite
- py32-dj16-pgsql
- py33-dj16-sqlite
- py33-dj16-pgsql
This means that the test suite will run 26 times to test every
- py27-dj17-sqlite
- py27-dj17-mysql
- py27-dj17-pgsql
- py34-dj16-sqlite
- py34-dj16-pgsql
- py34-dj17-sqlite
- py34-dj17-pgsql
This means that the test suite will run 10 times to test every
environment supported by ``django-treebeard``. This takes a long time.
If you want to test only one or a few environments, please use the `-e`
option in `tox`_, like:
.. code-block:: console
$ tox -e py33-dj16-pgsql
$ tox -e py34-dj17-pgsql
.. _pytest: http://pytest.org/
......
......@@ -34,10 +34,10 @@ setup_args = dict(
package_dir={'treebeard': 'treebeard'},
package_data={
'treebeard': ['templates/admin/*.html', 'static/treebeard/*']},
description='Efficient tree implementations for Django 1.4+',
description='Efficient tree implementations for Django 1.6+',
long_description=open(root_dir() + '/README.rst').read(),
cmdclass={'test': pytest_test},
install_requires=['Django>=1.4'],
install_requires=['Django>=1.6'],
tests_require=['pytest'],
classifiers=[
'Development Status :: 5 - Production/Stable',
......@@ -46,10 +46,7 @@ setup_args = dict(
'Environment :: Web Environment',
'Framework :: Django',
'Programming Language :: Python',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.2',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Operating System :: OS Independent',
'Topic :: Software Development :: Libraries',
......
......@@ -6,38 +6,17 @@
[tox]
envlist =
py26-dj14-sqlite,
py26-dj14-mysql,
py26-dj14-pgsql,
py26-dj16-sqlite,
py26-dj16-mysql,
py26-dj16-pgsql,
py27-dj14-sqlite,
py27-dj14-mysql,
py27-dj14-pgsql,
py27-dj16-sqlite,
py27-dj16-mysql,
py27-dj16-pgsql,
py27-dj17-sqlite,
py27-dj17-mysql,
py27-dj17-pgsql,
py32-dj16-sqlite,
py32-dj16-pgsql,
py32-dj17-sqlite,
py32-dj17-pgsql,
py33-dj16-sqlite,
py33-dj16-pgsql,
py33-dj17-sqlite,
py33-dj17-pgsql,
py34-dj16-sqlite,
py34-dj16-pgsql,
py34-dj17-sqlite,
py34-dj17-pgsql
[testenv]
commands =
{envpython} treebeard/tests/jenkins/toxhelper.py \
--tb=long --fulltrace -l --junitxml junit-{envname}.xml \
{posargs}
[testenv:docs]
basepython=python
changedir = docs
......@@ -47,244 +26,20 @@ deps =
commands =
sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html
[testenv:py26-dj14-sqlite]
basepython=python2.6
deps =
Django>=1.4,<1.5
coverage
pytest
setenv =
DATABASE_ENGINE=sqlite3
[testenv:py26-dj14-mysql]
basepython=python2.6
deps =
Django>=1.4,<1.5
MySQL-python
coverage
pytest
setenv =
DATABASE_ENGINE=mysql
[testenv:py26-dj14-pgsql]
basepython=python2.6
deps =
Django>=1.4,<1.5
psycopg2>2.4.1
coverage
pytest
setenv =
DATABASE_ENGINE=postgresql_psycopg2
[testenv:py26-dj16-sqlite]
basepython=python2.6
deps =
Django>=1.6,<1.7
coverage
pytest
setenv =
DATABASE_ENGINE=sqlite3
[testenv:py26-dj16-mysql]
basepython=python2.6
deps =
Django>=1.6,<1.7
MySQL-python
coverage
pytest
setenv =
DATABASE_ENGINE=mysql
[testenv:py26-dj16-pgsql]
basepython=python2.6
deps =
Django>=1.6,<1.7
psycopg2>2.4.1
coverage
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-pgsql]
basepython=python2.7
deps =
Django>=1.4,<1.5
psycopg2>2.4.1
coverage
pytest
setenv =
DATABASE_ENGINE=postgresql_psycopg2
[testenv:py27-dj16-sqlite]
basepython=python2.7
deps =
Django>=1.6,<1.7
coverage
pytest
setenv =
DATABASE_ENGINE=sqlite3
[testenv:py27-dj16-mysql]
basepython=python2.7
deps =
Django>=1.6,<1.7
MySQL-python
coverage
pytest
setenv =
DATABASE_ENGINE=mysql
[testenv:py27-dj16-pgsql]
basepython=python2.7
deps =
Django>=1.6,<1.7
psycopg2>2.4.1
coverage
pytest
setenv =
DATABASE_ENGINE=postgresql_psycopg2
[testenv:py27-dj17-sqlite]
basepython=python2.7
deps =
Django>=1.7,<1.8
coverage
pytest
setenv =
DATABASE_ENGINE=sqlite3
[testenv:py27-dj17-mysql]
basepython=python2.7
deps =
Django>=1.7,<1.8
MySQL-python
coverage
pytest
setenv =
DATABASE_ENGINE=mysql
[testenv:py27-dj17-pgsql]
basepython=python2.7
deps =
Django>=1.7,<1.8
psycopg2>2.4.1
coverage
pytest
setenv =
DATABASE_ENGINE=postgresql_psycopg2
[testenv:py32-dj16-sqlite]
basepython=python3.2
deps =
Django>=1.6,<1.7
coverage
pytest
setenv =
DATABASE_ENGINE=sqlite3
[testenv:py32-dj16-pgsql]
basepython=python3.2
deps =
Django>=1.6,<1.7
psycopg2
coverage
pytest
setenv =
DATABASE_ENGINE=postgresql_psycopg2
[testenv:py32-dj17-sqlite]
basepython=python3.2
deps =
Django>=1.7,<1.8
coverage
pytest
setenv =
DATABASE_ENGINE=sqlite3
[testenv:py32-dj17-pgsql]
basepython=python3.2
deps =
Django>=1.7,<1.8
psycopg2
coverage
pytest
setenv =
DATABASE_ENGINE=postgresql_psycopg2
[testenv:py33-dj16-sqlite]
basepython=python3.3
deps =
Django>=1.6,<1.7
coverage
pytest
setenv =
DATABASE_ENGINE=sqlite3
[testenv:py33-dj16-pgsql]
basepython=python3.3
deps =
Django>=1.6,<1.7
psycopg2
coverage
pytest
setenv =
DATABASE_ENGINE=postgresql_psycopg2
[testenv:py33-dj17-sqlite]
basepython=python3.3
deps =
Django>=1.7,<1.8
coverage
pytest
setenv =
DATABASE_ENGINE=sqlite3
[testenv:py33-dj17-pgsql]
basepython=python3.3
deps =
Django>=1.7,<1.8
psycopg2
coverage
pytest
setenv =
DATABASE_ENGINE=postgresql_psycopg2
[testenv:py34-dj17-sqlite]
basepython=python3.4
deps =
Django>=1.7,<1.8
coverage
pytest
setenv =
DATABASE_ENGINE=sqlite3
[testenv:py34-dj17-pgsql]
basepython=python3.4
[testenv]
deps =
Django>=1.7,<1.8
psycopg2
coverage
pytest
dj16: Django>=1.6,<1.7
dj17: Django>=1.7,<1.8
mysql: MySQL-python
pgsql: psycopg2>2.4.1
setenv =
DATABASE_ENGINE=postgresql_psycopg2
mysql: DATABASE_ENGINE=mysql
pgsql: DATABASE_ENGINE=postgresql_psycopg2
sqlite: DATABASE_ENGINE=sqlite3
DUMMY_VAR_TO_MAKE_TOX_HAPPY=tox
commands =
{envpython} treebeard/tests/jenkins/toxhelper.py \
--tb=long --fulltrace -l --junitxml junit-{envname}.xml \
{posargs}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment