Skip to content
This repository was archived by the owner on Oct 29, 2024. It is now read-only.

Enable testing for InfluxDB v1.3.9, v1.4.2, and v1.5.4 (tsi) #605

Merged
merged 2 commits into from
Jul 4, 2018
Merged

Enable testing for InfluxDB v1.3.9, v1.4.2, and v1.5.4 (tsi) #605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae2a3c7
Enable testing for InfluxDB v1.3.9, v1.4.2, and v1.5.4 (tsi)
xginn8 Jul 1, 2018
4fea43e
Add back PyPy3, remove references to Python 3.4
xginn8 Jul 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@ python:
- "3.5"
- "3.6"
- "pypy-5.3.1"
- "pypy3"

env:
- INFLUXDB_VER=1.2.4
# - INFLUXDB_VER=1.3.9
# - INFLUXDB_VER=1.4.2
# - INFLUXDB_VER=1.5.4
- INFLUXDB_VER=1.3.9
- INFLUXDB_VER=1.4.2
- INFLUXDB_VER=1.5.4

addons:
apt:
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Finally add a CHANGELOG.md to communicate breaking changes (#598)
- Test multiple versions of InfluxDB in travis
### Changed
- Update test suite to support InfluxDB v1.3.9, v1.4.2, and v1.5.4
- Fix performance degradation when removing NaN values via line protocol (#592)
### Removed
- Dropped support for Python3.4

## [v5.1.0] - 2018-06-26
### Added
Expand Down
7 changes: 3 additions & 4 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ InfluxDB is an open-source distributed time series database, find more about Inf
InfluxDB pre v1.1.0 users
-------------------------

This module is tested with InfluxDB v1.2.4, our recommended version. Though there have been v1.3 (initial TSI branch) and v1.4 releases these are not
yet supported.
This module is tested with InfluxDB versions: v1.2.4, v1.3.9, v1.4.2, and v1.5.4.

Those users still on InfluxDB v0.8.x users may still use the legacy client by importing ``from influxdb.influxdb08 import InfluxDBClient``.

Expand All @@ -60,9 +59,9 @@ On Debian/Ubuntu, you can install it with this command::
Dependencies
------------

The influxdb-python distribution is supported and tested on Python 2.7, 3.4, 3.5, 3.6, PyPy and PyPy3.
The influxdb-python distribution is supported and tested on Python 2.7, 3.5, 3.6, PyPy and PyPy3.

**Note:** Python 3.2 and 3.3 are currently untested. See ``.travis.yml``.
**Note:** Python <3.5 are currently untested. See ``.travis.yml``.

Main dependency is:

Expand Down
7 changes: 3 additions & 4 deletions influxdb/tests/server_tests/influxdb.conf.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
bind-address = ":{global_port}"

[meta]
dir = "{meta_dir}"
hostname = "localhost"
Expand All @@ -6,10 +8,7 @@
[data]
dir = "{data_dir}"
wal-dir = "{wal_dir}"

[admin]
enabled = true
bind-address = ":{admin_port}"
index-version = "tsi1"

[http]
enabled = true
Expand Down
6 changes: 3 additions & 3 deletions influxdb/tests/server_tests/influxdb_instance.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def _start_server(self, conf_template, udp_enabled):
# find a couple free ports :
free_ports = get_free_ports(4)
ports = {}
for service in 'http', 'admin', 'meta', 'udp':
for service in 'http', 'global', 'meta', 'udp':
ports[service + '_port'] = free_ports.pop()
if not udp_enabled:
ports['udp_port'] = -1
Expand Down Expand Up @@ -113,7 +113,7 @@ def _start_server(self, conf_template, udp_enabled):
"%s > Started influxdb bin in %r with ports %s and %s.." % (
datetime.datetime.now(),
self.temp_dir_base,
self.admin_port,
self.global_port,
self.http_port
)
)
Expand All @@ -126,7 +126,7 @@ def _start_server(self, conf_template, udp_enabled):
try:
while time.time() < timeout:
if (is_port_open(self.http_port) and
is_port_open(self.admin_port)):
is_port_open(self.global_port)):
# it's hard to check if a UDP port is open..
if udp_enabled:
# so let's just sleep 0.5 sec in this case
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py27, py34, py35, py36, pypy, pypy3, flake8, pep257, coverage, docs
envlist = py27, py35, py36, pypy, pypy3, flake8, pep257, coverage, docs

[testenv]
passenv = INFLUXDB_PYTHON_INFLUXD_PATH
Expand Down