Skip to content

Commit

Permalink
Add Python 3.7 support
Browse files Browse the repository at this point in the history
  • Loading branch information
aboudreault committed Jul 4, 2019
1 parent 7a5bc1c commit fe3636c
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 17 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.rst
Expand Up @@ -4,6 +4,7 @@ Not released

Features
--------
* Add Python 3.7 support (PYTHON-1016)
* Future-proof Mapping imports (PYTHON-1023)

Bug Fixes
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Expand Up @@ -6,7 +6,7 @@ DataStax Python Driver for Apache Cassandra

A modern, `feature-rich <https://github.com/datastax/python-driver#features>`_ and highly-tunable Python client library for Apache Cassandra (2.1+) using exclusively Cassandra's binary protocol and Cassandra Query Language v3.

The driver supports Python 2.7, 3.4, 3.5, and 3.6.
The driver supports Python 2.7, 3.4, 3.5, 3.6 and 3.7.

If you require compatibility with DataStax Enterprise, use the `DataStax Enterprise Python Driver <http://docs.datastax.com/en/developer/python-dse-driver/>`_.

Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Expand Up @@ -3,9 +3,9 @@ environment:
- PYTHON: "C:\\Python27-x64"
cassandra_version: 3.11.2
ci_type: standard
- PYTHON: "C:\\Python34"
- PYTHON: "C:\\Python35-x64"
cassandra_version: 3.11.2
ci_type: unit
ci_type: standard
os: Visual Studio 2015
platform:
- x64
Expand Down
15 changes: 8 additions & 7 deletions build.yaml
Expand Up @@ -8,7 +8,7 @@ schedules:
EXCLUDE_LONG=1
matrix:
exclude:
- python: [3.4, 3.6]
- python: [3.4, 3.6, 3.7]

nightly_master:
schedule: nightly
Expand All @@ -18,7 +18,7 @@ schedules:
EVENT_LOOP_MANAGER='libev'
matrix:
exclude:
- python: [3.4, 3.6]
- python: [3.4, 3.6, 3.7]

commit_long_test:
schedule: per_commit
Expand All @@ -28,7 +28,7 @@ schedules:
EVENT_LOOP_MANAGER='libev'
matrix:
exclude:
- python: [3.4, 3.6]
- python: [3.4, 3.6, 3.7]
- cassandra: ['2.0', '2.1', '3.0']

commit_branches:
Expand All @@ -40,7 +40,7 @@ schedules:
EXCLUDE_LONG=1
matrix:
exclude:
- python: [3.4, 3.6]
- python: [3.4, 3.6, 3.7]
- cassandra: ['2.0', '2.1', '3.0']

commit_branches_dev:
Expand All @@ -52,7 +52,7 @@ schedules:
EXCLUDE_LONG=1
matrix:
exclude:
- python: [2.7, 3.4, 3.6]
- python: [2.7, 3.4, 3.6, 3.7]
- cassandra: ['2.0', '2.1', '2.2', '3.0', 'test-dse']

release_test:
Expand All @@ -77,7 +77,7 @@ schedules:
EVENT_LOOP_MANAGER='gevent'
matrix:
exclude:
- python: [3.4, 3.5, 3.6]
- python: [3.4, 3.5, 3.6, 3.7]

weekly_eventlet:
schedule: 0 18 * * 6
Expand Down Expand Up @@ -119,14 +119,15 @@ schedules:
JUST_UPGRADE=True
matrix:
exclude:
- python: [3.4, 3.6]
- python: [3.4, 3.6, 3.7]
- cassandra: ['2.0', '2.1', '2.2', '3.0', 'test-dse']

python:
- 2.7
- 3.4
- 3.5
- 3.6
- 3.7

os:
- ubuntu/bionic64/python-driver
Expand Down
4 changes: 2 additions & 2 deletions cassandra/cluster.py
Expand Up @@ -2420,10 +2420,10 @@ def add_request_init_listener(self, fn, *args, **kwargs):
Adds a callback with arguments to be called when any request is created.
It will be invoked as `fn(response_future, *args, **kwargs)` after each client request is created,
and before the request is sent\*. This can be used to create extensions by adding result callbacks to the
and before the request is sent. This can be used to create extensions by adding result callbacks to the
response future.
\* where `response_future` is the :class:`.ResponseFuture` for the request.
`response_future` is the :class:`.ResponseFuture` for the request.
Note that the init callback is done on the client thread creating the request, so you may need to consider
synchronization if you have multiple threads. Any callbacks added to the response future will be executed
Expand Down
4 changes: 2 additions & 2 deletions cassandra/util.py
Expand Up @@ -732,7 +732,7 @@ class OrderedMap(Mapping):
['value', 'value2']
These constructs are needed to support nested collections in Cassandra 2.1.3+,
where frozen collections can be specified as parameters to others\*::
where frozen collections can be specified as parameters to others::
CREATE TABLE example (
...
Expand All @@ -743,7 +743,7 @@ class OrderedMap(Mapping):
This class derives from the (immutable) Mapping API. Objects in these maps
are not intended be modified.
\* Note: Because of the way Cassandra encodes nested types, when using the
Note: Because of the way Cassandra encodes nested types, when using the
driver with nested collections, :attr:`~.Cluster.protocol_version` must be 3
or higher.
Expand Down
2 changes: 1 addition & 1 deletion docs/index.rst
Expand Up @@ -4,7 +4,7 @@ A Python client driver for `Apache Cassandra <http://cassandra.apache.org>`_.
This driver works exclusively with the Cassandra Query Language v3 (CQL3)
and Cassandra's native protocol. Cassandra 2.1+ is supported.

The driver supports Python 2.7, 3.4, 3.5, and 3.6.
The driver supports Python 2.7, 3.4, 3.5, 3.6 and 3.7.

This driver is open source under the
`Apache v2 License <http://www.apache.org/licenses/LICENSE-2.0.html>`_.
Expand Down
2 changes: 1 addition & 1 deletion docs/installation.rst
Expand Up @@ -3,7 +3,7 @@ Installation

Supported Platforms
-------------------
Python 2.7, 3.4, 3.5 and 3.6 are supported. Both CPython (the standard Python
Python 2.7, 3.4, 3.5, 3.6 and 3.7 are supported. Both CPython (the standard Python
implementation) and `PyPy <http://pypy.org>`_ are supported and tested.

Linux, OSX, and Windows are supported.
Expand Down
1 change: 0 additions & 1 deletion tox.ini
@@ -1,6 +1,5 @@
[tox]
envlist = py{27,34,35,36,37},pypy
skip_missing_interpreters = True

[base]
deps = nose
Expand Down

0 comments on commit fe3636c

Please sign in to comment.