From 4eb3a2d0a4401db163cbf775144c28f5c201678e Mon Sep 17 00:00:00 2001 From: clslgrnc Date: Fri, 15 Mar 2019 15:10:28 +0100 Subject: [PATCH 1/8] add py37 and recent influxdb --- .travis.yml | 11 +++++++---- tox.ini | 32 ++++++++++++++++++++++---------- 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index a1cf7b55..63c34b74 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,14 +4,17 @@ python: - "2.7" - "3.5" - "3.6" + - "3.7" - "pypy" - "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.2.4 # 2017-05-08 + - INFLUXDB_VER=1.3.9 # 2018-01-19 + - INFLUXDB_VER=1.4.3 # 2018-01-30 + - INFLUXDB_VER=1.5.4 # 2018-06-22 + - INFLUXDB_VER=1.6.4 # 2018-10-24 + - INFLUXDB_VER=1.7.4 # 2019-02-14 addons: apt: diff --git a/tox.ini b/tox.ini index 2f9c212c..4f5d74f3 100644 --- a/tox.ini +++ b/tox.ini @@ -1,21 +1,30 @@ [tox] -envlist = py27, py35, py36, pypy, pypy3, flake8, pep257, coverage, docs +envlist = py27, py35, py36, py37, pypy, pypy3, flake8, pep257, coverage, docs [testenv] passenv = INFLUXDB_PYTHON_INFLUXD_PATH setenv = INFLUXDB_PYTHON_SKIP_SERVER_TESTS=False deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt - py27,py34,py35,py36: pandas==0.20.1 - py27,py34,py35,py36: numpy==1.13.3 + py27: pandas==0.20.3 + py27: numpy==1.12.1 + py34: pandas==0.21.1 + py34: numpy==1.13.3 + py35: pandas==0.22.0 + py35: numpy==1.14.6 + py36: pandas==0.23.4 + py36: numpy==1.15.4 + py37: pandas==0.24.2 + py37: numpy==1.16.2 # Only install pandas with non-pypy interpreters +# Testing all combinations would be too expensive commands = nosetests -v --with-doctest {posargs} [testenv:flake8] deps = flake8 pep8-naming -commands = flake8 --ignore=W503,W504,W605,N802,F821 influxdb +commands = flake8 influxdb [testenv:pep257] deps = pydocstyle @@ -26,19 +35,22 @@ deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt pandas coverage - numpy==1.13.3 + numpy commands = nosetests -v --with-coverage --cover-html --cover-package=influxdb [testenv:docs] deps = -r{toxinidir}/requirements.txt - pandas==0.20.1 - numpy==1.13.3 - Sphinx==1.5.5 + pandas==0.24.2 + numpy==1.16.2 + Sphinx==1.8.5 sphinx_rtd_theme commands = sphinx-build -b html docs/source docs/build [flake8] -ignore = N802,F821,E402 -# E402: module level import not at top of file +ignore = W503,W504,W605,N802,F821,E402 +# W503: Line break occurred before a binary operator +# W504: Line break occurred after a binary operator +# W605: invalid escape sequence # N802: nosetests's setUp function # F821: False positive in intluxdb/dataframe_client.py +# E402: module level import not at top of file From 3d85f5cee8ff4ec93d1fc96212fa09ac95285303 Mon Sep 17 00:00:00 2001 From: clslgrnc Date: Fri, 15 Mar 2019 16:38:00 +0100 Subject: [PATCH 2/8] remove useless py34 dep --- tox.ini | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tox.ini b/tox.ini index 4f5d74f3..4a1921e2 100644 --- a/tox.ini +++ b/tox.ini @@ -6,10 +6,8 @@ passenv = INFLUXDB_PYTHON_INFLUXD_PATH setenv = INFLUXDB_PYTHON_SKIP_SERVER_TESTS=False deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt - py27: pandas==0.20.3 - py27: numpy==1.12.1 - py34: pandas==0.21.1 - py34: numpy==1.13.3 + py27: pandas==0.21.1 + py27: numpy==1.13.3 py35: pandas==0.22.0 py35: numpy==1.14.6 py36: pandas==0.23.4 From f3b84ab63c1ddc7d241e55f65bf0b85978c72151 Mon Sep 17 00:00:00 2001 From: clslgrnc Date: Fri, 15 Mar 2019 16:38:56 +0100 Subject: [PATCH 3/8] use py36 for pydocstyle (py27 soon deprecated) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 63c34b74..f5f9e123 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ addons: matrix: include: - - python: 2.7 + - python: 3.6 env: TOX_ENV=pep257 - python: 3.6 env: TOX_ENV=docs From 93872e66128d2c1c8e80bb946d8eead576fbcc28 Mon Sep 17 00:00:00 2001 From: clslgrnc Date: Fri, 15 Mar 2019 16:39:37 +0100 Subject: [PATCH 4/8] ugly fix to numpy inconsistencies --- influxdb/tests/dataframe_client_test.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/influxdb/tests/dataframe_client_test.py b/influxdb/tests/dataframe_client_test.py index ad910a6d..9e6c8ac1 100644 --- a/influxdb/tests/dataframe_client_test.py +++ b/influxdb/tests/dataframe_client_test.py @@ -12,6 +12,7 @@ import unittest import warnings import requests_mock +import numpy from influxdb.tests import skip_if_pypy, using_pypy from nose.tools import raises @@ -396,10 +397,16 @@ def test_write_points_from_dataframe_with_numeric_precision(self): ["2", 2, 2.2222222222222]], index=[now, now + timedelta(hours=1)]) - expected_default_precision = ( - b'foo,hello=there 0=\"1\",1=1i,2=1.11111111111 0\n' - b'foo,hello=there 0=\"2\",1=2i,2=2.22222222222 3600000000000\n' - ) + if tuple(map(int, numpy.version.version.split('.'))) <= (1, 13, 3): + expected_default_precision = ( + b'foo,hello=there 0=\"1\",1=1i,2=1.11111111111 0\n' + b'foo,hello=there 0=\"2\",1=2i,2=2.22222222222 3600000000000\n' + ) + else: + expected_default_precision = ( + b'foo,hello=there 0=\"1\",1=1i,2=1.1111111111111 0\n' + b'foo,hello=there 0=\"2\",1=2i,2=2.2222222222222 3600000000000\n' + ) expected_specified_precision = ( b'foo,hello=there 0=\"1\",1=1i,2=1.1111 0\n' @@ -419,6 +426,9 @@ def test_write_points_from_dataframe_with_numeric_precision(self): cli = DataFrameClient(database='db') cli.write_points(dataframe, "foo", {"hello": "there"}) + print(expected_default_precision) + print(m.last_request.body) + self.assertEqual(m.last_request.body, expected_default_precision) cli = DataFrameClient(database='db') From b337ebd657c9c2cf56bf36f26a476b6fb73e7f4e Mon Sep 17 00:00:00 2001 From: clslgrnc Date: Fri, 15 Mar 2019 16:53:44 +0100 Subject: [PATCH 5/8] py37 is not in ubuntu 14.04 --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f5f9e123..54000db0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ python: - "2.7" - "3.5" - "3.6" - - "3.7" - "pypy" - "pypy3" @@ -31,6 +30,9 @@ matrix: env: TOX_ENV=flake8 - python: 3.6 env: TOX_ENV=coverage + - python: 3.7 + dist: xenial + sudo: true install: - pip install tox-travis From 1a012b3b2c05f97e8e3b81faa7cd76ce53df74c2 Mon Sep 17 00:00:00 2001 From: clslgrnc Date: Fri, 15 Mar 2019 17:00:07 +0100 Subject: [PATCH 6/8] move import numpy and add noqa --- influxdb/tests/dataframe_client_test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/influxdb/tests/dataframe_client_test.py b/influxdb/tests/dataframe_client_test.py index 9e6c8ac1..1de3a501 100644 --- a/influxdb/tests/dataframe_client_test.py +++ b/influxdb/tests/dataframe_client_test.py @@ -12,7 +12,6 @@ import unittest import warnings import requests_mock -import numpy from influxdb.tests import skip_if_pypy, using_pypy from nose.tools import raises @@ -23,6 +22,7 @@ import pandas as pd from pandas.util.testing import assert_frame_equal from influxdb import DataFrameClient + import numpy @skip_if_pypy @@ -405,7 +405,7 @@ def test_write_points_from_dataframe_with_numeric_precision(self): else: expected_default_precision = ( b'foo,hello=there 0=\"1\",1=1i,2=1.1111111111111 0\n' - b'foo,hello=there 0=\"2\",1=2i,2=2.2222222222222 3600000000000\n' + b'foo,hello=there 0=\"2\",1=2i,2=2.2222222222222 3600000000000\n' # noqa E501 line too long ) expected_specified_precision = ( From f59744bcec747cbe572426e41a4f0f5b14836cf2 Mon Sep 17 00:00:00 2001 From: clslgrnc Date: Fri, 15 Mar 2019 17:16:02 +0100 Subject: [PATCH 7/8] get 3.7 into travis matrix --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 54000db0..30133d7d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,9 @@ python: - "2.7" - "3.5" - "3.6" + - "3.7" + dist: xenial + sudo: true - "pypy" - "pypy3" @@ -30,9 +33,6 @@ matrix: env: TOX_ENV=flake8 - python: 3.6 env: TOX_ENV=coverage - - python: 3.7 - dist: xenial - sudo: true install: - pip install tox-travis @@ -53,7 +53,6 @@ notifications: email: false sudo: false - # Travis caching cache: false # directories: From 10de28c4bddcaa2abee903393a5970f5fe8246f6 Mon Sep 17 00:00:00 2001 From: clslgrnc Date: Fri, 15 Mar 2019 17:27:25 +0100 Subject: [PATCH 8/8] get 3.7 into travis matrix --- .travis.yml | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 30133d7d..8c660b67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,9 +4,6 @@ python: - "2.7" - "3.5" - "3.6" - - "3.7" - dist: xenial - sudo: true - "pypy" - "pypy3" @@ -25,6 +22,30 @@ addons: matrix: include: + - python: 3.7 + dist: xenial + sudo: true + env: INFLUXDB_VER=1.2.4 + - python: 3.7 + dist: xenial + sudo: true + env: INFLUXDB_VER=1.3.9 + - python: 3.7 + dist: xenial + sudo: true + env: INFLUXDB_VER=1.4.3 + - python: 3.7 + dist: xenial + sudo: true + env: INFLUXDB_VER=1.5.4 + - python: 3.7 + dist: xenial + sudo: true + env: INFLUXDB_VER=1.6.4 + - python: 3.7 + dist: xenial + sudo: true + env: INFLUXDB_VER=1.7.4 - python: 3.6 env: TOX_ENV=pep257 - python: 3.6 @@ -53,6 +74,7 @@ notifications: email: false sudo: false + # Travis caching cache: false # directories: 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