Skip to content

Commit

Permalink
Bump version number, support Py 3.9 and Pg 13
Browse files Browse the repository at this point in the history
  • Loading branch information
Cito committed Sep 25, 2020
1 parent 4023dd5 commit 80ded98
Show file tree
Hide file tree
Showing 14 changed files with 30 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 5.2
current_version = 5.2.1
commit = False
tag = False

Expand Down
6 changes: 5 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ matrix:
- name: Code quality tests
env: TOXENV=flake8,docs
python: 3.8
- name: Unit tests with Python 3.9
env: TOXENV=py39
python: 3.9
- name: Unit tests with Python 3.8
env: TOXENV=py38
python: 3.8
Expand Down Expand Up @@ -36,7 +39,8 @@ script:
- tox -e $TOXENV

addons:
postgresql: "10"
# test with last version that still supports OIDs
postgresql: "11"

services:
- postgresql
Expand Down
4 changes: 2 additions & 2 deletions docs/about.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +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.2 needs PostgreSQL 9.0 to 9.6 or 10 to 12, and
Python 2.7 or 3.5 to 3.8. If you need to support older PostgreSQL versions or
The current version PyGreSQL 5.2.1 needs PostgreSQL 9.0 to 9.6 or 10 to 13, and
Python 2.7 or 3.5 to 3.9. 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 @@ -2,11 +2,11 @@
PyGreSQL Announcements
======================

-------------------------------
Release of PyGreSQL version 5.2
-------------------------------
---------------------------------
Release of PyGreSQL version 5.2.1
---------------------------------

Release 5.2 of PyGreSQL.
Release 5.2.1 of PyGreSQL.

It is available at: https://pypi.org/project/PyGreSQL/.

Expand All @@ -22,8 +22,8 @@ This version has been built and unit tested on:
- openSUSE
- Ubuntu
- Windows 7 and 10 with both MinGW and Visual Studio
- PostgreSQL 9.0 to 9.6 and 10 to 12 (32 and 64bit)
- Python 2.7 and 3.5 to 3.8 (32 and 64bit)
- PostgreSQL 9.0 to 9.6 and 10 to 13 (32 and 64bit)
- Python 2.7 and 3.5 to 3.9 (32 and 64bit)

| D'Arcy J.M. Cain
| darcy@PyGreSQL.org
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
# built documents.
#
# The full version, including alpha/beta/rc tags.
version = release = '5.2'
version = release = '5.2.1'

# 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.2.1 (to be released)
------------------------------
- This version officially supports the new Python 3.9 and PostgreSQL 13.
- Changes to the DB-API 2 module (pgdb):
- The `copy_to()` and `copy_from()` methods now also work with table names
containing schema qualifiers (#47).
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 @@ If you are on Windows, make sure that the directory that contains
libpq.dll is part of your ``PATH`` environment variable.

The current version of PyGreSQL has been tested with Python versions
2.7 and 3.5 to 3.8, and PostgreSQL versions 9.0 to 9.6 and 10 to 12.
2.7 and 3.5 to 3.9, and PostgreSQL versions 9.0 to 9.6 and 10 to 13.

PyGreSQL will be installed as three modules, a shared library called
_pg.so (on Linux) or a DLL called _pg.pyd (on Windows), and two pure
Expand Down
2 changes: 1 addition & 1 deletion docs/contents/pg/adaptation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ 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 12).
``#`` operator does not work (at least not as of PostgreSQL version 13).
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::

Expand Down
3 changes: 2 additions & 1 deletion docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
cloud_sptheme>=1.7.1
sphinx>=3.2,<4
cloud_sptheme>=1.10,<2
9 changes: 5 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# Please see the LICENSE.TXT file for specific restrictions.

"""Setup script for PyGreSQL version 5.2
"""Setup script for PyGreSQL version 5.2.1
PyGreSQL is an open-source Python module that interfaces to a
PostgreSQL database. It embeds the PostgreSQL query library to allow
Expand All @@ -26,8 +26,8 @@
* PostgreSQL pg_config tool (usually included in the devel package)
(the Windows installer has it as part of the database server feature)
PyGreSQL currently supports Python versions 2.7 and 3.5 to 3.8,
and PostgreSQL versions 9.0 to 9.6 and 10 to 12.
PyGreSQL currently supports Python versions 2.7 and 3.5 to 3.9,
and PostgreSQL versions 9.0 to 9.6 and 10 to 13.
Use as follows:
python setup.py build_ext # to build the module
Expand All @@ -52,7 +52,7 @@
from distutils.ccompiler import get_default_compiler
from distutils.sysconfig import get_python_inc, get_python_lib

version = '5.2'
version = '5.2.1'

if not (sys.version_info[:2] == (2, 7)
or (3, 5) <= sys.version_info[:2] < (4, 0)):
Expand Down Expand Up @@ -242,6 +242,7 @@ def finalize_options(self):
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
"Programming Language :: SQL",
"Topic :: Database",
"Topic :: Database :: Front-Ends",
Expand Down
2 changes: 1 addition & 1 deletion tests/test_classic_connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ def testAttributeProtocolVersion(self):
def testAttributeServerVersion(self):
server_version = self.connection.server_version
self.assertIsInstance(server_version, int)
self.assertTrue(90000 <= server_version < 130000)
self.assertTrue(90000 <= server_version < 140000)

def testAttributeSocket(self):
socket = self.connection.socket
Expand Down
2 changes: 1 addition & 1 deletion tests/test_classic_dbwrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ def testAttributeProtocolVersion(self):
def testAttributeServerVersion(self):
server_version = self.db.server_version
self.assertIsInstance(server_version, int)
self.assertTrue(90000 <= server_version < 130000)
self.assertTrue(90000 <= server_version < 140000)
self.assertEqual(server_version, self.db.db.server_version)

def testAttributeSocket(self):
Expand Down
2 changes: 1 addition & 1 deletion tests/test_classic_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ def testPqlibVersion(self):
v = pg.get_pqlib_version()
self.assertIsInstance(v, long)
self.assertGreater(v, 90000)
self.assertLess(v, 130000)
self.assertLess(v, 140000)


class TestParseArray(unittest.TestCase):
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# config file for tox

[tox]
envlist = py{27,35,36,37,38},flake8,docs
envlist = py{27,35,36,37,38,39},flake8,docs

[testenv:flake8]
basepython = python3.8
Expand All @@ -12,7 +12,7 @@ commands =
[testenv:docs]
basepython = python3.8
deps =
sphinx>=2.4,<3
sphinx>=3.2,<4
cloud_sptheme>=1.10,<2
commands =
sphinx-build -b html -nEW docs docs/_build/html
Expand Down

0 comments on commit 80ded98

Please sign in to comment.