From 250d58729d22c3a81a2fff80010a0e1f1dfcbdfe Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Wed, 24 Jun 2009 17:47:29 +0200
Subject: [PATCH] another attempt at a full tarball

--HG--
branch : 1.0.x
---
 MANIFEST                       | 12 ++++++------
 doc/announce/release-1.0.0.txt | 36 ++++++++++++++++++++++++----------
 doc/download.txt               |  2 +-
 setup.py                       |  2 +-
 4 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/MANIFEST b/MANIFEST
index 2919e5156..6e2ec07dd 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,22 +1,20 @@
-MANIFEST
-py/__init__.py
-setup.py
+doc/announce/release-1.0.0.txt
+doc/download.txt
 .hgignore
 .hgtags
 CHANGELOG
 LICENSE
+MANIFEST
 README.txt
 _findpy.py
 doc/announce/release-0.9.0.txt
 doc/announce/release-0.9.2.txt
-doc/announce/release-1.0.0.txt
 doc/announce/releases.txt
 doc/bin.txt
 doc/code.txt
 doc/confrest.py
 doc/conftest.py
 doc/contact.txt
-doc/download.txt
 doc/execnet.txt
 doc/img/pylib.png
 doc/index.txt
@@ -61,6 +59,7 @@ example/pytest/test_failures.py
 example/pytest/test_setup_flow_example.py
 ez_setup.py
 py/LICENSE
+py/__init__.py
 py/_com.py
 py/bin/_findpy.py
 py/bin/_genscripts.py
@@ -383,4 +382,5 @@ py/xmlobj/testing/__init__.py
 py/xmlobj/testing/test_html.py
 py/xmlobj/testing/test_xml.py
 py/xmlobj/visit.py
-py/xmlobj/xml.py
\ No newline at end of file
+py/xmlobj/xml.py
+setup.py
\ No newline at end of file
diff --git a/doc/announce/release-1.0.0.txt b/doc/announce/release-1.0.0.txt
index a63b8b312..372eaf9aa 100644
--- a/doc/announce/release-1.0.0.txt
+++ b/doc/announce/release-1.0.0.txt
@@ -1,22 +1,38 @@
-py lib 1.0.0: distributed testing and dynamic code deployment 
-===============================================================
+py.test / py lib 1.0.0: distributed testing and dynamic code deployment 
+============================================================================
 
-XXX draft
+Welcome to the 1.0 release bringing new flexibility and 
+power to testing with Python!  Main news: 
 
-Welcome to the 1.0.0 py lib release - a python library aiming
-to support agile and test-driven development.  
+* new py.test plugin architecture, some examples: 
 
-It works with Linux, OSX and Win32, on Python 2.3, 2.4, 2.5 and 2.6.
+  pytest_xfail.py: mark tests as "expected to fail" 
+  pytest_pocoo.py: automatically send tracebacks to pocoo paste service 
+  pytest_monkeypatch.py: safely patch parts of your environment in a test function
+  pytest_figleaf.py: generate html coverage reports 
+  pytest_resultlog.py: generate buildbot-friendly output 
 
-Main API/Tool Features: 
+  and much more! 
+
+* funcargs - the new flexible mechanism for managing all your test setup/fixture needs! 
+
+* flexibly distribute tests to multiple computers from the command line
+
+See the py.test documentation for more info: 
+
+    http://pytest.org
+
+The py lib contains the py.test tool and offers its well-tested code 
+independently from the testing tool, mainly:
 
-* py.test: cross-project testing tool with many advanced features
 * py.execnet: ad-hoc code distribution to SSH, Socket and local sub processes
 * py.code: support for dynamically running and debugging python code 
 * py.path: path abstractions over local and subversion files 
 
-Download/Install:   http://codespeak.net/py/1.0.0/download.html
-Documentation/API:  http://codespeak.net/py/1.0.0/index.html
+The whole package works well with Linux, OSX and Win32, on 
+Python 2.3, 2.4, 2.5 and 2.6.  (Expect Python3 compatibility soon!) 
+
+Download/Install:   http://codespeak.net/py/dist/download.html 
 
 best, 
 holger
diff --git a/doc/download.txt b/doc/download.txt
index 170b2e1b5..39c02b91f 100644
--- a/doc/download.txt
+++ b/doc/download.txt
@@ -2,7 +2,7 @@
 Downloading
 ==============
 
-.. _`PyPI project page`: http://pypi.python.org/pypi?%3Aaction=pkg_edit&name=py
+.. _`PyPI project page`: http://pypi.python.org/pypi/py/
 
 Latest Release, see `PyPI project page`_
 
diff --git a/setup.py b/setup.py
index 1408149ac..3068703cb 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ autogenerated by gensetup.py
 setup file for 'py' package based on:
         
 branch: 1.0.x
-revision: 1177:a0d05417421b8cc68c8ba1a96a7fd3087116e472
+revision: 1179:b1781bbfef8f3382f149e4b271b4795ed98469da
          
 """
 import os, sys