Skip to content

Commit

Permalink
Merge remote branch 'batiste/master'
Browse files Browse the repository at this point in the history
* batiste/master:
  Include the doctests in the package
  Update the description
  Update setup file
  Make the test fail when the doctest fail
  New stable version
  Simplify setup file
  Get all tests to run properly
  Get latest code from google code.
  Make the doctest run with 'setup.py test'
  Make the doctest run with 'setup.py test'
  Add a test runner, that actually seems to work
  Try to get doctests to run.
  Get test running with 'python setup.py test' command
  Revert "fixed a backward incompatible change with order_insertion_by"
  fixed a backward incompatible change with order_insertion_by

Conflicts:
	mptt/tests/doctests.txt
	mptt/tests/testcases.py
  • Loading branch information
matthiask committed Apr 12, 2010
2 parents eef3678 + dd718a3 commit 2883f40
Show file tree
Hide file tree
Showing 11 changed files with 1,306 additions and 68 deletions.
2 changes: 2 additions & 0 deletions .gitignore
@@ -0,0 +1,2 @@
*.pyc
*.egg-info
2 changes: 2 additions & 0 deletions MANIFEST.in
Expand Up @@ -4,3 +4,5 @@ include LICENSE
include MANIFEST.in
include README
recursive-include docs *.txt
recursive-include mptt *.json
recursive-include mptt/tests *.txt
2 changes: 1 addition & 1 deletion mptt/__init__.py
@@ -1,4 +1,4 @@
VERSION = (0, 3, 'pre')
VERSION = (0, 3, 0)

__all__ = ('register',)

Expand Down
2 changes: 1 addition & 1 deletion mptt/forms.py
Expand Up @@ -126,4 +126,4 @@ def save(self):
return self.node
except InvalidMove, e:
self.errors[NON_FIELD_ERRORS] = ErrorList(e)
raise
raise
3 changes: 3 additions & 0 deletions mptt/tests/__init__.py
@@ -0,0 +1,3 @@
# import make the tests execute with python setup.py test
from mptt.tests.testcases import DocTestTestCase
from mptt.tests.testcases import ReparentingTestCase, DeletionTestCase

0 comments on commit 2883f40

Please sign in to comment.