Bump version to 3.3. Mostly this is because there is some confusion about

the latest version and I wanted to make sure that there was a clean release.

I also change the build files as I discussed in my letter of Nov 6, 2001.  At
the time I was asked to hold off until after the release.

diff --git a/src/interfaces/python/Announce b/src/interfaces/python/Announce
index 5221b5fa87b5a767343ad15b5ff1daba1fc6f8b1..45270cf10428ea55ac1a52b2432e8a67f1dcf4a5 100644 (file)
--- a/src/interfaces/python/Announce
+++ b/src/interfaces/python/Announce
@@ -1,8 +1,8 @@
 
-Announce: Release of PyGreSQL version 3.2
+Announce: Release of PyGreSQL version 3.3
 =========================================
 
-PyGreSQL v3.2 has been released.
+PyGreSQL v3.3 has been released.
 It is available at: ftp://ftp.druid.net/pub/distrib/PyGreSQL.tgz.  If
 you are running NetBSD, look in the packages directory under databases.
 There is also a package in the FreeBSD ports collection.              
@@ -44,6 +44,10 @@ the code to use full ANSI style prototypes and changed the order of
 arguments to connect.  Later versions are fixes and enhancements to that.
 The latest version of PyGreSQL works with Python 1.5.2 and PostgreSQL 7.0.x
 
+Important changes from PyGreSQL 3.2 to PyGreSQL 3.3
+  - Added NUMERICOID to list of returned types.  This fixes a bug when
+    returning aggregates in the latest version of PostgreSQL.
+
 Important changes from PyGreSQL 3.1 to PyGreSQL 3.2
   Note that there are very few changes to PostgreSQL between 3.1 and
   3.2.  The main reason for the release is the move into the PostgreSQL

diff --git a/src/interfaces/python/ChangeLog b/src/interfaces/python/ChangeLog
index b61f7ca42c293ddeda57a726492d2c7a8158e9ad..5685a3cb6447b462654ffa813353bad0dd1e4c1d 100644 (file)
--- a/src/interfaces/python/ChangeLog
+++ b/src/interfaces/python/ChangeLog
@@ -5,11 +5,16 @@ This software is copyright (c) 1995, Pascal Andre (andre@via.ecp.fr)
 Further copyright 1997, 1998 and 1999 by D'Arcy J.M. Cain (darcy@druid.net)
 See file README for copyright information.
 
+Version 3.3
+  A few cleanups.  Mostly there was some confusion about the latest version
+  and so I am bumping the number to keep it straight.
+  - Added NUMERICOID to list of returned types.  This fixes a bug when
+    returning aggregates.
+
 Version 3.2
   - Add WIN32 support (gerhard@bigfoot.de)
   - Fix some DB-API quoting problems (niall.smart@ebeon.com)
   - Moved development into PostgreSQL development tree.
-  - Added NUMERICOID to list of returned types.
 
 Version 3.1
   - Fix some quoting functions.  In particular handle NULLs better.

diff --git a/src/interfaces/python/GNUmakefile b/src/interfaces/python/GNUmakefile
index 2be8fe1d186ed82c93b25c56e75e86b9a14f47b0..7d11988df40cb931b5c9e83c9f049eb6f163913e 100644 (file)
--- a/src/interfaces/python/GNUmakefile
+++ b/src/interfaces/python/GNUmakefile
@@ -1,4 +1,4 @@
-# $Header: /cvsroot/pgsql/src/interfaces/python/Attic/GNUmakefile,v 1.11 2001/08/24 14:07:50 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/python/Attic/GNUmakefile,v 1.12 2001/12/03 12:39:44 darcy Exp $
 
 subdir = src/interfaces/python
 top_builddir = ../../..
@@ -19,10 +19,23 @@ include $(top_srcdir)/src/Makefile.shlib
 
 override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) $(python_includespec)
 
-all: all-lib
+PY_SCRIPTS = pg.py pgdb.py
+ifeq ($(with_python_compile), yes)
+PY_COMPILED_SCRIPTS = $(PY_SCRIPTS:%.py=%.pyc) $(PY_SCRIPTS:%.py=%.pyo)
+else
+PY_COMPILED_SCRIPTS =
+endif
+
+all: all-lib $(PY_COMPILED_SCRIPTS)
 
 all-lib: libpq-all
 
+%.pyc: %.py
+       $(PYTHON) -c "import py_compile; py_compile.compile(\"$<\")"
+
+%.pyo: %.py
+       $(PYTHON) -O -c "import py_compile; py_compile.compile(\"$<\")"
+
 .PHONY: libpq-all
 libpq-all:
        $(MAKE) -C $(libpq_builddir) all
@@ -38,11 +51,10 @@ install: all installdirs
          echo "$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(python_moduleexecdir)/_pgmodule$(DLSUFFIX)"; \
          $(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(python_moduleexecdir)/_pgmodule$(DLSUFFIX); \
        \
-         echo "$(INSTALL_DATA) $(srcdir)/pg.py $(DESTDIR)$(python_moduledir)/pg.py"; \
-         $(INSTALL_DATA) $(srcdir)/pg.py $(DESTDIR)$(python_moduledir)/pg.py; \
-       \
-         echo "$(INSTALL_DATA) $(srcdir)/pgdb.py $(DESTDIR)$(python_moduledir)/pgdb.py"; \
-         $(INSTALL_DATA) $(srcdir)/pgdb.py $(DESTDIR)$(python_moduledir)/pgdb.py; \
+         for i in $(PY_SCRIPTS) $(PY_COMPILED_SCRIPTS); do \
+               echo $(INSTALL_DATA) $$i $(python_moduledir); \
+               $(INSTALL_DATA) $$i $(python_moduledir); \
+         done \
        else \
          $(install-warning-msg); \
        fi

diff --git a/src/interfaces/python/README b/src/interfaces/python/README
index 7d9c73ae3d79f29652f9846adbdbcd54b060e4b3..17fbcd1111ecb7f99a6f93032fbfb1fe81240195 100644 (file)
--- a/src/interfaces/python/README
+++ b/src/interfaces/python/README
@@ -1,11 +1,11 @@
 
-PyGreSQL - v3.2: PostgreSQL module for Python
+PyGreSQL - v3.3: PostgreSQL module for Python
 ==============================================
 
 0. Copyright notice
 ===================
 
-  PyGreSQL, version 3.2
+  PyGreSQL, version 3.3
   A Python interface for PostgreSQL database.
   Written by D'Arcy J.M. Cain, darcy@druid.net<BR>
   Based heavily on code written by Pascal Andre, andre@chimay.via.ecp.fr.

diff --git a/src/interfaces/python/pgmodule.c b/src/interfaces/python/pgmodule.c
index 93e4d508d8a74e6af5a689debd9b9480d13cf824..51f63d2d9ebfcd26b875de2b636ef3a210dc4c7b 100644 (file)
--- a/src/interfaces/python/pgmodule.c
+++ b/src/interfaces/python/pgmodule.c
@@ -36,7 +36,7 @@
 #include <string.h>
 
 static PyObject *PGError;
-static const char *PyPgVersion = "3.2";
+static const char *PyPgVersion = "3.3";
 
 /* taken from fileobject.c */
 #define BUF(v) PyString_AS_STRING((PyStringObject *)(v))