merge 1.0.x branch to trunk, fix doc link

--HG--
branch : trunk

.hgtags

@@ -17,3 +17,4 @@ e2a60653cb490aeed81bbbd83c070b99401c211c 1.0.0b9
 5ea0cdf7854c3d4278d36eda94a2b68483a0e211 1.0.0
 7acde360d94b6a2690ce3d03ff39301da84c0a2b 1.0.0
 6bd221981ac99103002c1cb94fede400d23a96a1 1.0.1
+4816e8b80602a3fd3a0a120333ad85fbe7d8bab4 1.0.2

bin-for-dist/makepluginlist.py

@@ -7,7 +7,7 @@ plugins = [
     ('plugins for Python test functions', 
             'xfail figleaf monkeypatch capture recwarn',),
     ('plugins for other testing styles and languages', 
-            'oejskit unittest nose doctest restdoc'),
+            'oejskit unittest nose django doctest restdoc'),
     ('plugins for generic reporting and failure logging', 
             'pastebin resultlog terminal',),
     ('plugins for generic reporting and failure logging', 
@@ -22,6 +22,7 @@ plugins = [
 
 externals = {
     'oejskit': 'run javascript tests in real life browsers',
+    'django': 'support for testing django applications', 
 
 }
                 

doc/announce/releases.txt

@@ -7,6 +7,8 @@ Contents:
 .. toctree::
    :maxdepth: 1
 
+   announce/release-1.0.2
+   announce/release-1.0.1
    announce/release-1.0.0
    announce/release-0.9.2
    announce/release-0.9.0

doc/changelog.txt

@@ -19,6 +19,14 @@ Changes between 1.0.x and 'trunk'
  
 * simplified internal localpath implementation 
 
+Changes between 1.0.1 and 1.0.2
+=====================================
+
+* fixing packaging issues, triggered by fedora redhat packaging, 
+  also added doc, examples and contrib dirs to the tarball. 
+
+* added a documentation link to the new django plugin. 
+
 Changes between 1.0.0 and 1.0.1
 =====================================
 

doc/code.txt

@@ -97,7 +97,7 @@ Example::
   >>> str(first.statement).strip().startswith('raise ValueError')
   True
 
-source: :source:`py/code/traceback2.py`
+source: :source:`py/code/code.py`
 
 :api:`py.code.Frame`
 --------------------

doc/test/plugin/django.txt

@@ -0,0 +1,7 @@
+pytest_django plugin (EXTERNAL)
+==========================================
+
+pytest_django is a plugin for py.test that provides a set of useful tools for testing Django applications, checkout Ben Firshman's `pytest_django github page`_.
+
+.. _`pytest_django github page`: http://github.com/bfirsh/pytest_django/tree/master
+

doc/test/plugin/index.txt

@@ -22,6 +22,8 @@ unittest_ automatically discover and run traditional "unittest.py" style tests.
 
 nose_ nose-compatibility plugin: allow to run nose test suites natively.
 
+django_ support for testing django applications
+
 doctest_ collect and execute doctests from modules and test files.
 
 restdoc_ perform ReST syntax, local and remote reference tests on .rst/.txt files.

doc/test/plugin/links.txt

@@ -1,37 +1,38 @@
 .. _`helpconfig`: helpconfig.html
 .. _`terminal`: terminal.html
-.. _`pytest_recwarn.py`: http://bitbucket.org/hpk42/py-trunk/raw/1.0.1/py/test/plugin/pytest_recwarn.py
+.. _`pytest_recwarn.py`: http://bitbucket.org/hpk42/py-trunk/raw/1.0.2/py/test/plugin/pytest_recwarn.py
 .. _`unittest`: unittest.html
-.. _`pytest_monkeypatch.py`: http://bitbucket.org/hpk42/py-trunk/raw/1.0.1/py/test/plugin/pytest_monkeypatch.py
+.. _`pytest_monkeypatch.py`: http://bitbucket.org/hpk42/py-trunk/raw/1.0.2/py/test/plugin/pytest_monkeypatch.py
-.. _`pytest_keyword.py`: http://bitbucket.org/hpk42/py-trunk/raw/1.0.1/py/test/plugin/pytest_keyword.py
+.. _`pytest_keyword.py`: http://bitbucket.org/hpk42/py-trunk/raw/1.0.2/py/test/plugin/pytest_keyword.py
 .. _`pastebin`: pastebin.html
 .. _`plugins`: index.html
-.. _`pytest_capture.py`: http://bitbucket.org/hpk42/py-trunk/raw/1.0.1/py/test/plugin/pytest_capture.py
+.. _`pytest_capture.py`: http://bitbucket.org/hpk42/py-trunk/raw/1.0.2/py/test/plugin/pytest_capture.py
-.. _`pytest_doctest.py`: http://bitbucket.org/hpk42/py-trunk/raw/1.0.1/py/test/plugin/pytest_doctest.py
+.. _`pytest_doctest.py`: http://bitbucket.org/hpk42/py-trunk/raw/1.0.2/py/test/plugin/pytest_doctest.py
 .. _`capture`: capture.html
-.. _`pytest_nose.py`: http://bitbucket.org/hpk42/py-trunk/raw/1.0.1/py/test/plugin/pytest_nose.py
+.. _`pytest_nose.py`: http://bitbucket.org/hpk42/py-trunk/raw/1.0.2/py/test/plugin/pytest_nose.py
-.. _`pytest_restdoc.py`: http://bitbucket.org/hpk42/py-trunk/raw/1.0.1/py/test/plugin/pytest_restdoc.py
+.. _`pytest_restdoc.py`: http://bitbucket.org/hpk42/py-trunk/raw/1.0.2/py/test/plugin/pytest_restdoc.py
 .. _`xfail`: xfail.html
-.. _`pytest_pastebin.py`: http://bitbucket.org/hpk42/py-trunk/raw/1.0.1/py/test/plugin/pytest_pastebin.py
+.. _`pytest_pastebin.py`: http://bitbucket.org/hpk42/py-trunk/raw/1.0.2/py/test/plugin/pytest_pastebin.py
-.. _`pytest_figleaf.py`: http://bitbucket.org/hpk42/py-trunk/raw/1.0.1/py/test/plugin/pytest_figleaf.py
+.. _`pytest_figleaf.py`: http://bitbucket.org/hpk42/py-trunk/raw/1.0.2/py/test/plugin/pytest_figleaf.py
-.. _`pytest_hooklog.py`: http://bitbucket.org/hpk42/py-trunk/raw/1.0.1/py/test/plugin/pytest_hooklog.py
+.. _`pytest_hooklog.py`: http://bitbucket.org/hpk42/py-trunk/raw/1.0.2/py/test/plugin/pytest_hooklog.py
 .. _`checkout the py.test development version`: ../../download.html#checkout
-.. _`pytest_helpconfig.py`: http://bitbucket.org/hpk42/py-trunk/raw/1.0.1/py/test/plugin/pytest_helpconfig.py
+.. _`pytest_helpconfig.py`: http://bitbucket.org/hpk42/py-trunk/raw/1.0.2/py/test/plugin/pytest_helpconfig.py
 .. _`oejskit`: oejskit.html
 .. _`doctest`: doctest.html
 .. _`get in contact`: ../../contact.html
-.. _`pytest_xfail.py`: http://bitbucket.org/hpk42/py-trunk/raw/1.0.1/py/test/plugin/pytest_xfail.py
+.. _`pytest_xfail.py`: http://bitbucket.org/hpk42/py-trunk/raw/1.0.2/py/test/plugin/pytest_xfail.py
 .. _`figleaf`: figleaf.html
 .. _`customize`: ../customize.html
 .. _`hooklog`: hooklog.html
-.. _`pytest_terminal.py`: http://bitbucket.org/hpk42/py-trunk/raw/1.0.1/py/test/plugin/pytest_terminal.py
+.. _`pytest_terminal.py`: http://bitbucket.org/hpk42/py-trunk/raw/1.0.2/py/test/plugin/pytest_terminal.py
 .. _`recwarn`: recwarn.html
-.. _`pytest_pdb.py`: http://bitbucket.org/hpk42/py-trunk/raw/1.0.1/py/test/plugin/pytest_pdb.py
+.. _`pytest_pdb.py`: http://bitbucket.org/hpk42/py-trunk/raw/1.0.2/py/test/plugin/pytest_pdb.py
 .. _`monkeypatch`: monkeypatch.html
 .. _`resultlog`: resultlog.html
 .. _`keyword`: keyword.html
 .. _`restdoc`: restdoc.html
-.. _`pytest_unittest.py`: http://bitbucket.org/hpk42/py-trunk/raw/1.0.1/py/test/plugin/pytest_unittest.py
+.. _`django`: django.html
+.. _`pytest_unittest.py`: http://bitbucket.org/hpk42/py-trunk/raw/1.0.2/py/test/plugin/pytest_unittest.py
 .. _`nose`: nose.html
-.. _`pytest_resultlog.py`: http://bitbucket.org/hpk42/py-trunk/raw/1.0.1/py/test/plugin/pytest_resultlog.py
+.. _`pytest_resultlog.py`: http://bitbucket.org/hpk42/py-trunk/raw/1.0.2/py/test/plugin/pytest_resultlog.py
 .. _`pdb`: pdb.html

py/__init__.py

@@ -20,7 +20,9 @@ For questions please check out http://pylib.org/contact.html
 from py.initpkg import initpkg
 trunk = "trunk"
 
-version = trunk or "1.0.2"
+version = trunk or "1.0.x"
+
+del trunk 
 
 initpkg(__name__,
     description = "py.test and pylib: advanced testing tool and networking lib", 

py/test/looponfail/testing/test_remote.py

@@ -17,7 +17,9 @@ class TestRemoteControl:
         assert failures 
         control.setup()
         item.fspath.write("def test_func(): assert 1\n")
-        (item.fspath + "c").remove()
+        pyc = item.fspath.new(ext=".pyc")
+        if pyc.check():
+            pyc.remove()
         failures = control.runsession(failures)
         assert not failures
 
@@ -37,7 +39,9 @@ class TestRemoteControl:
             def test_new():
                 assert 0
         """))
-        (modcol.fspath + "c").remove()
+        pyc = modcol.fspath.new(ext=".pyc")
+        if pyc.check():
+            pyc.remove()
         failures = control.runsession(failures)
         assert not failures
         control.setup()