Preparing release 2.3.0-beta1

* Merged NEWS-2.3 and NEWS-2.2: 2.0 (pre-async) still makes sense in case
  someone has horrible problems with the new code but 2.3 will just
  substitute 2.2 so having a separated NEWS file doesn't make sense.

* Moved authors and contributors to AUHTORS file.

* README now has pointers to web site and bug tracker.

* Updated MonoDevelop project.

AUTHORS

@@ -1,8 +1,15 @@
 Main authors:
   Federico Di Gregorio <fog@debian.org>
+  Daniele Varrazzo <daniele.varrazzo@gmail.com>
 
 For the win32 port:
-  Jason Erickson <jerickso@indian.com> (most of his changes are still in 2.0)
+  Jason Erickson <jerickso@indian.com>
 
 Additional Help:
   
+  Peter Fein contributed a logging connection/cursor class that even if it
+  was not used directly heavily influenced the implementation currently in
+  psycopg2.extras.
+
+  Jan Urbański (re)started the work on asynchronous queries and contributed
+  both on that and on other parts of psycopg2.

MANIFEST.in

@@ -12,5 +12,5 @@ recursive-include doc/html *
 prune doc/src/_build
 recursive-include scripts *.py *.sh
 include scripts/maketypes.sh scripts/buildtypes.py
-include AUTHORS README INSTALL LICENSE NEWS-2.0 NEWS-2.2 NEWS-2.3 ChangeLog
+include AUTHORS README INSTALL LICENSE NEWS-2.0 NEWS-2.3 ChangeLog
 include PKG-INFO MANIFEST.in MANIFEST setup.py setup.cfg

NEWS-2.2

@@ -1,53 +0,0 @@
-What's new in psycopg 2.2.2
----------------------------
-
-* Bux fixes:
-  - the call to logging.basicConfig() in pool.py has been dropped: it was
-    messing with some projects using logging (and a library should not
-    initialize the logging system anyway.)
-  - psycopg now correctly handles time zones with seconds in the UTC offset.
-    The old register_tstz_w_secs() function is deprecated and will raise a
-    warning if called.
-  - Exceptions raised by the column iterator are propagated.
-  - Exceptions raised by executemany() interators are propagated.
-
-
-What's new in psycopg 2.2.1
----------------------------
-
-* Bux fixes:
-  - psycopg now builds again on MS Windows.
-
-
-What's new in psycopg 2.2.0
----------------------------
-
-This is the first release of the new 2.2 series, supporting not just one but
-two different ways of executing asynchronous queries, thanks to Jan and Daniele
-(with a little help from me and others, but they did 99% of the work so they
-deserve their names here in the news.)
-
-psycopg now supports both classic select() loops and "green" coroutine
-libraries. It is all in the documentation, so just point your browser to
-doc/html/advanced.html.
-
-* Other new features:
-  - truncate() method for lobjects.
-  - COPY functions are now a little bit faster.
-  - All builtin PostgreSQL to Python typecasters are now available from the
-    psycopg2.extensions module.
-  - Notifications from the backend are now available right after the execute()
-    call (before client code needed to call isbusy() to ensure NOTIFY
-    reception.)
-  - Better timezone support.
-  - Lots of documentation updates.
-
-* Bug fixes:
-  - Fixed some gc/refcounting problems.
-  - Fixed reference leak in NOTIFY reception.
-  - Fixed problem with PostgreSQL not casting string literals to the correct
-    types in some situations: psycopg now add an explicit cast to dates, times
-    and bytea representations.
-  - Fixed TimestampFromTicks() and TimeFromTicks() for seconds >= 59.5.
-  - Fixed spurious exception raised when calling C typecasters from Python
-    ones.

NEWS-2.3

@@ -1,10 +1,9 @@
-What's new in psycopg 2.3
+What's new in psycopg 2.3.0
--------------------------
+---------------------------
 
-Psycopg 2.3 aims to expose some of the new features introduced in PostgreSQL
+psycopg 2.3 aims to expose some new features introduced in PostgreSQL 9.0.
-9.0.
 
-* New features:
+* New features related to features introduced in PostgreSQL 9.0:
 
   - `dict` to `hstore` adapter and `hstore` to `dict` typecaster, using both
     9.0 and pre-9.0 syntax.
@@ -12,11 +11,11 @@ Psycopg 2.3 aims to expose some of the new features introduced in PostgreSQL
   - Support for payload in notifications received from the backed.
   - namedtuple returning cursor.
 
-* Other changes:
+* Other features and changes:
 
   - `mogrify()` now supports unicode queries.
-  - Dropped deprecated Psycopg "own quoting".
   - `errorcodes` knows a couple of new codes introduced in PostgreSQL 9.0.
+  - Dropped deprecated Psycopg "own quoting".
   - Never issue a ROLLBACK on close/GC. This behaviour was introduced as a bug
     in release 2.2, but trying to send a command while being destroyed has been
     considered not safe.
@@ -26,3 +25,61 @@ Psycopg 2.3 aims to expose some of the new features introduced in PostgreSQL
   - Fixed use of `PQfreemem` instead of `free` in binary typecaster.
   - Fixed access to freed memory in `conn_get_isolation_level()`.
 
+
+What's new in psycopg 2.2.2
+---------------------------
+
+* Bux fixes:
+
+  - the call to logging.basicConfig() in pool.py has been dropped: it was
+    messing with some projects using logging (and a library should not
+    initialize the logging system anyway.)
+  - psycopg now correctly handles time zones with seconds in the UTC offset.
+    The old register_tstz_w_secs() function is deprecated and will raise a
+    warning if called.
+  - Exceptions raised by the column iterator are propagated.
+  - Exceptions raised by executemany() interators are propagated.
+
+
+What's new in psycopg 2.2.1
+---------------------------
+
+* Bux fixes:
+
+  - psycopg now builds again on MS Windows.
+
+
+What's new in psycopg 2.2.0
+---------------------------
+
+This is the first release of the new 2.2 series, supporting not just one but
+two different ways of executing asynchronous queries, thanks to Jan and Daniele
+(with a little help from me and others, but they did 99% of the work so they
+deserve their names here in the news.)
+
+psycopg now supports both classic select() loops and "green" coroutine
+libraries. It is all in the documentation, so just point your browser to
+doc/html/advanced.html.
+
+* Other new features:
+
+  - truncate() method for lobjects.
+  - COPY functions are now a little bit faster.
+  - All builtin PostgreSQL to Python typecasters are now available from the
+    psycopg2.extensions module.
+  - Notifications from the backend are now available right after the execute()
+    call (before client code needed to call isbusy() to ensure NOTIFY
+    reception.)
+  - Better timezone support.
+  - Lots of documentation updates.
+
+* Bug fixes:
+
+  - Fixed some gc/refcounting problems.
+  - Fixed reference leak in NOTIFY reception.
+  - Fixed problem with PostgreSQL not casting string literals to the correct
+    types in some situations: psycopg now add an explicit cast to dates, times
+    and bytea representations.
+  - Fixed TimestampFromTicks() and TimeFromTicks() for seconds >= 59.5.
+  - Fixed spurious exception raised when calling C typecasters from Python
+    ones.

README

@@ -18,26 +18,24 @@ and FreeBSD on i386, Solaris, MacOS X and win32 architectures. psycopg2
 does not introduce build-wise incompatible changes so it should be able to
 compile on all architectures just as its predecessor did.
 
-Now go read the INSTALL file. More information about psycopg2 extensions to
-the DBAPI-2.0 is available in the files located in the doc/ direcory.
-Example code can be found in the examples/ directory. If you make any changes
-to the code make sure to run the unit tests localed in tests/.
-
 psycopg2 is free software ("free as in freedom" but I like beer too.)
 It is licensed under the GNU Lesser General Public License, version 3 or
 later plus an exception to allow OpenSSL (libpq) linking; see LICENSE for
 more details.
 
+Documentation
+-------------
+
+Start by reading the INSTALL file. More information about psycopg2 extensions
+to the DBAPI-2.0 is available in the files located in the doc/ direcory.
+Example code can be found in the examples/ directory. If you make any changes
+to the code make sure to run the unit tests localed in tests/.
+
+Online documentation can be found at: http://initd.org/psycopg/
+
+If you stumble upon any bugs, please tell us at: http://psycopg.lighthouseapp.com/
 
 Contributors
 ------------
 
-A short list of contributors to psycopg2 follows (if you feel you belong
+For a list of contributors to the project, see the AUTHORS file.
-to this list and you can't find yourself here just drop me a mail):
-
- * Kudos to piro for all the documentation work.
-
- * Peter Fein contributed a logging connection/cursor class that even if it
-   was not used directly heavily influenced the implementation currently in
-   psycopg2.extras.
-   

ZPsycopgDA/DA.py

@@ -16,7 +16,7 @@
 # their work without bothering about the module dependencies.
 
 
-ALLOWED_PSYCOPG_VERSIONS = ('2.2.0','2.2.1','2.2.2')
+ALLOWED_PSYCOPG_VERSIONS = ('2.3.0-beta1',)
 
 import sys
 import time

psycopg2.cproj

@@ -199,7 +199,11 @@
     <None Include="doc\src\pool.rst" />
     <None Include="sandbox\dec2float.py" />
     <None Include="NEWS-2.0" />
-    <None Include="NEWS-2.2" />
+    <None Include="psycopg\notify.h" />
+    <None Include="psycopg\xid.h" />
+    <None Include="tests\dbapi20_tpc.py" />
+    <None Include="tests\test_cursor.py" />
+    <None Include="NEWS-2.3" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="psycopg\adapter_asis.c" />
@@ -230,6 +234,8 @@
     <Compile Include="psycopg\adapter_pfloat.c" />
     <Compile Include="psycopg\adapter_pdecimal.c" />
     <Compile Include="psycopg\green.c" />
+    <Compile Include="psycopg\notify_type.c" />
+    <Compile Include="psycopg\xid_type.c" />
   </ItemGroup>
   <ProjectExtensions>
     <MonoDevelop>

setup.py

@@ -55,9 +55,10 @@ from distutils.command.build_ext import build_ext
 from distutils.sysconfig import get_python_inc
 from distutils.ccompiler import get_default_compiler
 
-# take a look at http://www.python.org/dev/peps/pep-0386/
+# Take a look at http://www.python.org/dev/peps/pep-0386/
-# for a consistent versioning pattern
+# for a consistent versioning pattern.
-PSYCOPG_VERSION = '2.3a1'
+
+PSYCOPG_VERSION = '2.3.0-beta1'
 
 version_flags   = ['dt', 'dec']