Skip to content

Commit

Permalink
Update year, version number and supported Pg versions
Browse files Browse the repository at this point in the history
  • Loading branch information
Cito committed Jan 22, 2018
1 parent 2dab4a7 commit 2086435
Show file tree
Hide file tree
Showing 13 changed files with 32 additions and 29 deletions.
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Copyright (c) 1995, Pascal Andre
Further modifications copyright (c) 1997-2008 by D'Arcy J.M. Cain
(darcy@PyGreSQL.org)

Further modifications copyright (c) 2009-2017 by the PyGreSQL team.
Further modifications copyright (c) 2009-2018 by the PyGreSQL team.

PyGreSQL is released under the PostgreSQL License, a liberal Open Source
license, similar to the BSD or MIT licenses:
Expand Down
9 changes: 5 additions & 4 deletions docs/about.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ PostgreSQL features from a Python script.

| This software is copyright © 1995, Pascal Andre.
| Further modifications are copyright © 1997-2008 by D'Arcy J.M. Cain.
| Further modifications are copyright © 2009-2017 by the PyGreSQL team.
| Further modifications are copyright © 2009-2018 by the PyGreSQL team.
| For licensing details, see the full :doc:`copyright`.

**PostgreSQL** is a highly scalable, SQL compliant, open source
Expand Down Expand Up @@ -36,6 +36,7 @@ on the PyGres95 code written by Pascal Andre (andre@chimay.via.ecp.fr).
D'Arcy (darcy@druid.net) renamed it to PyGreSQL starting with
version 2.0 and serves as the "BDFL" of PyGreSQL.

The current version PyGreSQL 5.0.4 needs PostgreSQL 9.0 or newer and Python 2.6,
2.7 or 3.3 to 3.5. If you need to support older PostgreSQL versions or older
Python 2.x versions, you can resort to PyGreSQL 4.x that still supports them.
The current version PyGreSQL 5.0.5 needs PostgreSQL 9.0 to 9.6 or 10, and
Python 2.6, 2.7 or 3.3 to 3.6. If you need to support older PostgreSQL versions
or older Python 2.x versions, you can resort to the PyGreSQL 4.x versions that
still support them.
12 changes: 6 additions & 6 deletions docs/announce.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ PyGreSQL Announcements
======================

---------------------------------
Release of PyGreSQL version 5.0.4
Release of PyGreSQL version 5.0.5
---------------------------------

Release 5.0.4 of PyGreSQL.
Release 5.0.5 of PyGreSQL.

It is available at: http://pygresql.org/files/PyGreSQL-5.0.4.tar.gz.
It is available at: http://pygresql.org/files/PyGreSQL-5.0.5.tar.gz.

If you are running NetBSD, look in the packages directory under databases.
There is also a package in the FreeBSD ports collection.
Expand All @@ -24,9 +24,9 @@ This version has been built and unit tested on:
- FreeBSD
- openSUSE
- Ubuntu
- Windows 7 with both MinGW and Visual Studio
- PostgreSQL 9.0 to 9.6 32 and 64bit
- Python 2.6, 2.7, 3.3, 3.4, 3.5, 3.6 32 and 64bit
- Windows 7 and 10 with both MinGW and Visual Studio
- PostgreSQL 9.0 to 9.6 and 10 (32 and 64bit)
- Python 2.6, 2.7 and 3.3 to 3.6 (32 and 64bit)

| D'Arcy J.M. Cain
| darcy@PyGreSQL.org
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
# General information about the project.
project = 'PyGreSQL'
author = 'The PyGreSQL team'
copyright = '2017, ' + author
copyright = '2018, ' + author

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
Expand All @@ -70,7 +70,7 @@
# The short X.Y version.
version = '5.0'
# The full version, including alpha/beta/rc tags.
release = '5.0.4'
release = '5.0.5'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
1 change: 1 addition & 0 deletions docs/contents/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ ChangeLog

Version 5.0.5 (to be released)
------------------------------
- This version officially supports the new PostgreSQL 10.
- The memory for the string with the number of rows affected by a classic pg
module query() was already freed (bug report and fix by Peifeng Qiu).

Expand Down
2 changes: 1 addition & 1 deletion docs/contents/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ are on Windows, make sure that the directory with libpq.dll is in your
``PATH`` environment variable.

The current version of PyGreSQL has been tested with Python versions
2.6, 2.7, 3.3 to 3.6 and PostGreSQL version 9.0 to 9.6.
2.6, 2.7 and 3.3 to 3.6, and PostGreSQL versions 9.0 to 9.6 and 10.

PyGreSQL will be installed as three modules, a dynamic module called
_pg.pyd, and two pure Python wrapper modules called pg.py and pgdb.py.
Expand Down
4 changes: 2 additions & 2 deletions docs/contents/pg/adaptation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -363,8 +363,8 @@ With PostgreSQL we can easily calculate that these two circles overlap::
True

However, calculating the intersection points between the two circles using the
``#`` operator does not work (at least not as of PostgreSQL version 9.6).
So let' resort to SymPy to find out. To ease importing circles from
``#`` operator does not work (at least not as of PostgreSQL version 10).
So let's resort to SymPy to find out. To ease importing circles from
PostgreSQL to SymPy, we create and register the following typecast function::

>>> from sympy import Point, Circle
Expand Down
2 changes: 1 addition & 1 deletion docs/copyright.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Copyright (c) 1995, Pascal Andre
Further modifications copyright (c) 1997-2008 by D'Arcy J.M. Cain
(darcy@PyGreSQL.org)

Further modifications copyright (c) 2009-2017 by the PyGreSQL team.
Further modifications copyright (c) 2009-2018 by the PyGreSQL team.

Permission to use, copy, modify, and distribute this software and its
documentation for any purpose, without fee, and without a written agreement
Expand Down
10 changes: 5 additions & 5 deletions docs/download/download.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ A **FreeBSD package** is available in their ports collection
An **openSUSE package** is available through their build service at
* https://software.opensuse.org/package/PyGreSQL?search_term=pygresql
A **Win32 installer** for various Python versions is available at
* http://pygresql.org/files/PyGreSQL-5.0.4.win-amd64-py2.6.exe
* http://pygresql.org/files/PyGreSQL-5.0.4.win-amd64-py2.7.exe
* http://pygresql.org/files/PyGreSQL-5.0.4.win-amd64-py3.4.exe
* http://pygresql.org/files/PyGreSQL-5.0.4.win-amd64-py3.5.exe
* http://pygresql.org/files/PyGreSQL-5.0.4.win-amd64-py3.6.exe
* http://pygresql.org/files/PyGreSQL-5.0.5.win-amd64-py2.6.exe
* http://pygresql.org/files/PyGreSQL-5.0.5.win-amd64-py2.7.exe
* http://pygresql.org/files/PyGreSQL-5.0.5.win-amd64-py3.4.exe
* http://pygresql.org/files/PyGreSQL-5.0.5.win-amd64-py3.5.exe
* http://pygresql.org/files/PyGreSQL-5.0.5.win-amd64-py3.6.exe

Older PyGreSQL versions
-----------------------
Expand Down
2 changes: 1 addition & 1 deletion mktar
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh

VERSION=5.0.4
VERSION=5.0.5
DISTDIR=/u/WEB/pyg/files

# some safety tests
Expand Down
2 changes: 1 addition & 1 deletion pg.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
For a DB-API 2 compliant interface use the newer pgdb module.
"""

# Copyright (c) 1997-2017 by D'Arcy J.M. Cain.
# Copyright (c) 1997-2018 by D'Arcy J.M. Cain.
#
# Contributions made by Ch. Zwerschke and others.
#
Expand Down
4 changes: 2 additions & 2 deletions pgmodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* AUTHOR HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES,
* ENHANCEMENTS, OR MODIFICATIONS.
*
* Further modifications copyright 1997 to 2017 by D'Arcy J.M. Cain
* Further modifications copyright 1997 to 2018 by D'Arcy J.M. Cain
* (darcy@PyGreSQL.org) subject to the same terms and conditions as above.
*
*/
Expand Down Expand Up @@ -3488,7 +3488,7 @@ connGetAttr(connObject *self, PyObject *nameobj)
if (!strcmp(name, "host"))
{
char *r = PQhost(self->cnx);
if (!r || r[0] == '/') /* Pg 9.6 can return a Unix socket path */
if (!r || r[0] == '/') /* Pg >= 9.6 can return a Unix socket path */
r = "localhost";
return PyStr_FromString(r);
}
Expand Down
7 changes: 4 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /usr/bin/python
# $Id$

"""Setup script for PyGreSQL version 5.0.4
"""Setup script for PyGreSQL version 5.0.5
PyGreSQL is an open-source Python module that interfaces to a
PostgreSQL database. It embeds the PostgreSQL query library to allow
Expand All @@ -13,15 +13,16 @@
* setup script created 2000 by Mark Alexander <mwa@gate.net>
* improved 2000 by Jeremy Hylton <jeremy@cnri.reston.va.us>
* improved 2001 by Gerhard Haering <gerhard@bigfoot.de>
* improved 2006 to 2017 by Christoph Zwerschke <cito@online.de>
* improved 2006 to 2018 by Christoph Zwerschke <cito@online.de>
Prerequisites to be installed:
* Python including devel package (header files and distutils)
* PostgreSQL libs and devel packages (header file of the libpq client)
* PostgreSQL pg_config tool (usually included in the devel package)
(the Windows installer has it as part of the database server feature)
The supported versions are Python 2.6-2.7, 3.3-3.6 and PostgreSQL 9.0-9.6.
PyGreSQL currently supports Python versions 2.6, 2.7 and 3.3 to 3.6,
and PostgreSQL versions 9.0 to 9.6 and 10.
Use as follows:
python setup.py build # to build the module
Expand Down

0 comments on commit 2086435

Please sign in to comment.