Skip to content

Commit

Permalink
support for python 3.11
Browse files Browse the repository at this point in the history
  • Loading branch information
jouve authored and dvarrazzo committed Nov 11, 2021
1 parent 898cbff commit 5fb1305
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 6 deletions.
10 changes: 7 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,15 @@ jobs:
- {python: "3.8", postgres: "12"}
- {python: "3.9", postgres: "13"}
- {python: "3.10", postgres: "14"}
- {python: "3.11-dev", postgres: "14"}

# Opposite extremes of the supported Py/PG range, other architecture
- {python: "3.6", postgres: "14", architecture: "x86"}
- {python: "3.7", postgres: "13", architecture: "x86"}
- {python: "3.8", postgres: "12", architecture: "x86"}
- {python: "3.9", postgres: "11", architecture: "x86"}
- {python: "3.10", postgres: "10", architecture: "x86"}
- {python: "3.11-dev", postgres: "10", architecture: "x86"}

env:
PSYCOPG2_TESTDB: postgres
Expand All @@ -48,11 +50,13 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Install tox
run: pip install tox
- uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python }}
- name: Install tox
run: pip install tox
- name: Run tests
run: tox -e ${{ matrix.python }}
env:
MATRIX_PYTHON: ${{ matrix.python }}
run: tox -e ${MATRIX_PYTHON%-dev}
timeout-minutes: 5
1 change: 1 addition & 0 deletions psycopg/connection_int.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include "psycopg/green.h"
#include "psycopg/notify.h"

#include <stdlib.h>
#include <string.h>

/* String indexes match the ISOLATION_LEVEL_* consts */
Expand Down
1 change: 1 addition & 0 deletions psycopg/connection_type.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
#include "psycopg/green.h"
#include "psycopg/xid.h"

#include <stdlib.h>
#include <string.h>
#include <ctype.h>

Expand Down
1 change: 1 addition & 0 deletions psycopg/pqpath.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
#include "psycopg/libpq_support.h"
#include "libpq-fe.h"

#include <stdlib.h>
#ifdef _WIN32
/* select() */
#include <winsock2.h>
Expand Down
2 changes: 2 additions & 0 deletions psycopg/psycopgmodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@
#include <datetime.h>
#include "psycopg/adapter_datetime.h"

#include <stdlib.h>

HIDDEN PyObject *psycoEncodings = NULL;
HIDDEN PyObject *sqlstate_errors = NULL;

Expand Down
7 changes: 6 additions & 1 deletion psycopg/replication_connection_type.c
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,11 @@ replicationConnection_repr(replicationConnectionObject *self)
self, self->conn.dsn, self->conn.closed);
}

static int
replicationConnectionType_traverse(PyObject *self, visitproc visit, void *arg)
{
return connectionType.tp_traverse(self, visit, arg);
}

/* object calculated member list */

Expand Down Expand Up @@ -173,7 +178,7 @@ PyTypeObject replicationConnectionType = {
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_ITER |
Py_TPFLAGS_HAVE_GC, /*tp_flags*/
replicationConnectionType_doc, /*tp_doc*/
0, /*tp_traverse*/
replicationConnectionType_traverse, /*tp_traverse*/
0, /*tp_clear*/
0, /*tp_richcompare*/
0, /*tp_weaklistoffset*/
Expand Down
7 changes: 6 additions & 1 deletion psycopg/replication_cursor_type.c
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,11 @@ replicationCursor_repr(replicationCursorObject *self)
"<ReplicationCursor object at %p; closed: %d>", self, self->cur.closed);
}

static int
replicationCursorType_traverse(PyObject *self, visitproc visit, void *arg)
{
return cursorType.tp_traverse(self, visit, arg);
}

/* object type */

Expand Down Expand Up @@ -374,7 +379,7 @@ PyTypeObject replicationCursorType = {
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_ITER |
Py_TPFLAGS_HAVE_GC, /*tp_flags*/
replicationCursorType_doc, /*tp_doc*/
0, /*tp_traverse*/
replicationCursorType_traverse, /*tp_traverse*/
0, /*tp_clear*/
0, /*tp_richcompare*/
0, /*tp_weaklistoffset*/
Expand Down
3 changes: 2 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
[tox]
envlist = {3.6,3.7,3.8,3.9,3.10}
envlist = {3.6,3.7,3.8,3.9,3.10,3.11}

[testenv]
commands = make check
whitelist_externals = make
passenv = PG* PSYCOPG2_TEST*
basepython = python{envname}

[flake8]
max-line-length = 85
Expand Down

0 comments on commit 5fb1305

Please sign in to comment.