Skip to content

Commit a47c801

Browse files
authored
Merge pull request influxdata#605 from xginn8/influxdb_tsi
Enable testing for InfluxDB v1.3.9, v1.4.2, and v1.5.4 (tsi)
2 parents 4b2f5c0 + 4fea43e commit a47c801

File tree

6 files changed

+16
-15
lines changed

6 files changed

+16
-15
lines changed

.travis.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@ python:
55
- "3.5"
66
- "3.6"
77
- "pypy-5.3.1"
8+
- "pypy3"
89

910
env:
1011
- INFLUXDB_VER=1.2.4
11-
# - INFLUXDB_VER=1.3.9
12-
# - INFLUXDB_VER=1.4.2
13-
# - INFLUXDB_VER=1.5.4
12+
- INFLUXDB_VER=1.3.9
13+
- INFLUXDB_VER=1.4.2
14+
- INFLUXDB_VER=1.5.4
1415

1516
addons:
1617
apt:

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
99
- Finally add a CHANGELOG.md to communicate breaking changes (#598)
1010
- Test multiple versions of InfluxDB in travis
1111
### Changed
12+
- Update test suite to support InfluxDB v1.3.9, v1.4.2, and v1.5.4
1213
- Fix performance degradation when removing NaN values via line protocol (#592)
1314
### Removed
15+
- Dropped support for Python3.4
1416

1517
## [v5.1.0] - 2018-06-26
1618
### Added

README.rst

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ InfluxDB is an open-source distributed time series database, find more about Inf
3939
InfluxDB pre v1.1.0 users
4040
-------------------------
4141

42-
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
43-
yet supported.
42+
This module is tested with InfluxDB versions: v1.2.4, v1.3.9, v1.4.2, and v1.5.4.
4443

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

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

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

65-
**Note:** Python 3.2 and 3.3 are currently untested. See ``.travis.yml``.
64+
**Note:** Python <3.5 are currently untested. See ``.travis.yml``.
6665

6766
Main dependency is:
6867

influxdb/tests/server_tests/influxdb.conf.template

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
bind-address = ":{global_port}"
2+
13
[meta]
24
dir = "{meta_dir}"
35
hostname = "localhost"
@@ -6,10 +8,7 @@
68
[data]
79
dir = "{data_dir}"
810
wal-dir = "{wal_dir}"
9-
10-
[admin]
11-
enabled = true
12-
bind-address = ":{admin_port}"
11+
index-version = "tsi1"
1312

1413
[http]
1514
enabled = true

influxdb/tests/server_tests/influxdb_instance.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def _start_server(self, conf_template, udp_enabled):
8080
# find a couple free ports :
8181
free_ports = get_free_ports(4)
8282
ports = {}
83-
for service in 'http', 'admin', 'meta', 'udp':
83+
for service in 'http', 'global', 'meta', 'udp':
8484
ports[service + '_port'] = free_ports.pop()
8585
if not udp_enabled:
8686
ports['udp_port'] = -1
@@ -113,7 +113,7 @@ def _start_server(self, conf_template, udp_enabled):
113113
"%s > Started influxdb bin in %r with ports %s and %s.." % (
114114
datetime.datetime.now(),
115115
self.temp_dir_base,
116-
self.admin_port,
116+
self.global_port,
117117
self.http_port
118118
)
119119
)
@@ -126,7 +126,7 @@ def _start_server(self, conf_template, udp_enabled):
126126
try:
127127
while time.time() < timeout:
128128
if (is_port_open(self.http_port) and
129-
is_port_open(self.admin_port)):
129+
is_port_open(self.global_port)):
130130
# it's hard to check if a UDP port is open..
131131
if udp_enabled:
132132
# so let's just sleep 0.5 sec in this case

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py27, py34, py35, py36, pypy, pypy3, flake8, pep257, coverage, docs
2+
envlist = py27, py35, py36, pypy, pypy3, flake8, pep257, coverage, docs
33

44
[testenv]
55
passenv = INFLUXDB_PYTHON_INFLUXD_PATH

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy