Permalink
Browse files

Merge remote branch 'batiste/master'

* 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 2883f4013bfb7155748870ba55cbbcd96cbb371b
Showing with 1,306 additions and 68 deletions.
  1. +2 −0 .gitignore
  2. +2 −0 MANIFEST.in
  3. +1 −1 mptt/__init__.py
  4. +1 −1 mptt/forms.py
  5. +3 −0 mptt/tests/__init__.py
  6. +1,245 −0 mptt/tests/doctests.txt
  7. +1 −1 mptt/tests/models.py
  8. +18 −0 mptt/tests/test_runner.py
  9. +19 −1 mptt/tests/testcases.py
  10. +0 −11 mptt/tests/tests.py
  11. +14 −53 setup.py
View
@@ -0,0 +1,2 @@
+*.pyc
+*.egg-info
View
@@ -4,3 +4,5 @@ include LICENSE
include MANIFEST.in
include README
recursive-include docs *.txt
+recursive-include mptt *.json
+recursive-include mptt/tests *.txt
View
@@ -1,4 +1,4 @@
-VERSION = (0, 3, 'pre')
+VERSION = (0, 3, 0)
__all__ = ('register',)
View
@@ -126,4 +126,4 @@ def save(self):
return self.node
except InvalidMove, e:
self.errors[NON_FIELD_ERRORS] = ErrorList(e)
- raise
+ raise
View
@@ -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
Oops, something went wrong.

0 comments on commit 2883f40

Please sign in to comment.