Skip to content

Commit

Permalink
Add support for PG 10 and Python 3.6. Drop support for 9.2.
Browse files Browse the repository at this point in the history
  • Loading branch information
jmafc committed Oct 31, 2017
1 parent e68ae19 commit 42220a2
Show file tree
Hide file tree
Showing 7 changed files with 38 additions and 37 deletions.
2 changes: 1 addition & 1 deletion README.rst
Expand Up @@ -21,7 +21,7 @@ Features
Requirements
------------

- PostgreSQL 9.2 or higher
- PostgreSQL 9.3 or higher

- Python 2.7 or higher

Expand Down
4 changes: 2 additions & 2 deletions docs/devel.rst
Expand Up @@ -61,7 +61,7 @@ Programming Language
To contribute to Pyrseas, you need at least one version of `Python
<http://www.python.org>`_. You can develop using Python 3, but since
we want to continue supporting Python 2, you'll want to install Python
2.7 in addition to Python 3.4 or 3.5.
2.7 in addition to Python 3.6 or 3.5.

If Python is not already available on your machine, either `download
and install one or both <http://www.python.org/download/>`_ of the
Expand All @@ -75,7 +75,7 @@ Database Installation

To participate in Pyrseas development, you'll also need one or more
installations of `PostgreSQL <http://www.postgresql.org>`_, versions
9.5, 9.4, 9.3 or 9.2. If you only have limited space, it is
10, 9.6, 9.5, 9.4 or 9.3. If you only have limited space, it is
preferable to install one of the latest two versions.

The versions can be obtained as binary packages or installers from the
Expand Down
2 changes: 1 addition & 1 deletion docs/index.rst
Expand Up @@ -20,7 +20,7 @@ Features
Requirements
------------

- `PostgreSQL <http://www.postgresql.org/>`_ 9.2 or higher
- `PostgreSQL <http://www.postgresql.org/>`_ 9.3 or higher

- `Python <http://www.python.org/>`_ 2.7 or higher

Expand Down
4 changes: 2 additions & 2 deletions docs/install.rst
Expand Up @@ -19,7 +19,7 @@ Requirements

Pyrseas provides tools for `PostgreSQL <http://www.postgresql.org>`_,
so obviously you need **PostgreSQL** to start with. Pyrseas has been
tested with PG 9.2, 9.3, 9.4 and 9.5, and we'll certainly keep up with
tested with PG 9.3, 9.4, 9.5, 9.6 and 10, and we'll certainly keep up with
future releases. Please refer to section III, `Server Administration
<http://www.postgresql.org/docs/current/interactive/admin.html>`_ of
the PostgreSQL documentation for details on installation, setup and
Expand All @@ -28,7 +28,7 @@ the various Linux, Unix and Windows platforms supported.
You will also need **Python**. Pyrseas has been tested with `Python
<http://www.python.org>`_ 2.7, but should also work with 2.6. It has
also been ported to Python 3 and tested against versions from 3.2
through 3.5. On Linux or \*BSD, Python may already be part of your
through 3.6. On Linux or \*BSD, Python may already be part of your
distribution or may be available as a package. For Windows and Mac OS
please refer to the `Python download page
<http://www.python.org/download/>`_ for installers and instructions.
Expand Down
10 changes: 5 additions & 5 deletions docs/testing.rst
Expand Up @@ -65,7 +65,7 @@ test failures. See `this blog post
<http://pyrseas.wordpress.com/2012/10/17/testing-python-and-postgresql-on-windows-part-5/>`_
for more details.

The COLLATION tests, run under PostgreSQL 9.2 and later, require the
The COLLATION tests, run under PostgreSQL 9.3 and later, require the
``fr_FR.utf8`` locale (or ``French.France.1252`` language on Windows)
to be installed.

Expand All @@ -85,10 +85,10 @@ privileges, at either the operating system or PostgreSQL level.

- ``git clone git://github.com/perseas/Pyrseas.git``

- Install Python 2.7 and 3.4 or 3.5, using package manager or from
- Install Python 2.7 and 3.6 or 3.5, using package manager or from
installers at http://www.python.org/download/.

- Install PostgreSQL 9.5, 9.4, 9.3 and 9.2, using package manager or
- Install PostgreSQL 10, 9.6, 9.5, 9.4 and 9.3, using package manager or
binary installers at http://www.postgresql.org/download/

.. note:: On Linux, make sure you install the contrib and plperl
Expand Down Expand Up @@ -119,7 +119,7 @@ privileges, at either the operating system or PostgreSQL level.
- Install Tox, from PyPI (http://pypi.python.org/pypi/tox)

.. note:: Psycopg2, PyYAML and Tox all have to be installed twice,
i.e., once under Python 2.7 and another under 3.4 or 3.5.
i.e., once under Python 2.7 and another under 3.6 or 3.5.

- On Windows, install Perl (see discussion above under
"Restrictions"). On Linux, usually Perl is already available.
Expand Down Expand Up @@ -173,7 +173,7 @@ privileges, at either the operating system or PostgreSQL level.
PostgreSQL ports.

- Invoke ``tox``. This will create two virtualenvs in a ``.tox``
subdirectory--one for Python 2.7 and another for 3.5 or 3.4,
subdirectory--one for Python 2.7 and another for 3.6 or 3.5,
install Pyrseas and its prerequisites (Psycopg2 and PyYAML) into
each virtualenv and run the unit tests for each combination of
PostgreSQL and Python.
1 change: 1 addition & 0 deletions setup.py
Expand Up @@ -64,6 +64,7 @@ def run_tests(self):
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: SQL',
'Topic :: Database :: Front-Ends',
'Topic :: Software Development :: Code Generators',
Expand Down
52 changes: 26 additions & 26 deletions tox.ini
@@ -1,3 +1,7 @@
[pg100]
setenv =
PYRSEAS_TEST_PORT={env:PG100_PORT}

[pg96]
setenv =
PYRSEAS_TEST_PORT={env:PG96_PORT}
Expand All @@ -14,9 +18,10 @@ setenv =
setenv =
PYRSEAS_TEST_PORT={env:PG93_PORT}

[pg92]
setenv =
PYRSEAS_TEST_PORT={env:PG92_PORT}
[testenv:py27pg100]
basepython=python2.7
envdir={toxworkdir}/py27
setenv = {[pg100]setenv}

[testenv:py27pg96]
basepython=python2.7
Expand All @@ -38,36 +43,31 @@ basepython=python2.7
envdir={toxworkdir}/py27
setenv = {[pg93]setenv}

[testenv:py27pg92]
basepython=python2.7
envdir={toxworkdir}/py27
setenv = {[pg92]setenv}

[testenv:py35pg95]
basepython=python3.5
envdir={toxworkdir}/py35
setenv = {[pg95]setenv}
[testenv:py36pg100]
basepython=python3.6
envdir={toxworkdir}/py36
setenv = {[pg100]setenv}

[testenv:py35pg96]
basepython=python3.5
envdir={toxworkdir}/py35
[testenv:py36pg96]
basepython=python3.6
envdir={toxworkdir}/py36
setenv = {[pg96]setenv}

[testenv:py35pg94]
basepython=python3.5
envdir={toxworkdir}/py35
[testenv:py36pg95]
basepython=python3.6
envdir={toxworkdir}/py36
setenv = {[pg95]setenv}

[testenv:py36pg94]
basepython=python3.6
envdir={toxworkdir}/py36
setenv = {[pg94]setenv}

[testenv:py35pg93]
basepython=python3.5
envdir={toxworkdir}/py35
[testenv:py36pg93]
basepython=python3.6
envdir={toxworkdir}/py36
setenv = {[pg93]setenv}

[testenv:py35pg92]
basepython=python3.5
envdir={toxworkdir}/py35
setenv = {[pg92]setenv}

[testenv]
deps=pytest
setenv =
Expand Down

0 comments on commit 42220a2

Please sign in to comment.