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

Fix testsuite #333

Merged
merged 8 commits into from
Jun 13, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
language: python
addons:
apt:
packages:
- wget
env:
# - TOX_ENV=py26
# If someone opens a PR to re-enable py26 tests, I will merge it.
# However, that cannot be at the cost of disabling pandas tests in other
# environments.
- TOX_ENV=py27
# - TOX_ENV=py32
# Disabling py32 tests until the following issue is fixed:
Expand All @@ -20,7 +20,7 @@ install:
- pip install tox
- pip install coveralls
- mkdir influxdb_install
- wget https://s3.amazonaws.com/influxdb/influxdb_0.12.1-1_amd64.deb
- wget https://dl.influxdata.com/influxdb/releases/influxdb_0.13.0_amd64.deb
- dpkg -x influxdb*.deb influxdb_install
script:
- export INFLUXDB_PYTHON_INFLUXD_PATH=$(pwd)/influxdb_install/usr/bin/influxd
Expand Down
6 changes: 6 additions & 0 deletions influxdb/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals

from .client import InfluxDBClient
from .client import InfluxDBClusterClient
from .dataframe_client import DataFrameClient
Expand Down
5 changes: 5 additions & 0 deletions influxdb/_dataframe_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
"""
DataFrame client for InfluxDB
"""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals

import math

import pandas as pd
Expand Down
5 changes: 5 additions & 0 deletions influxdb/chunked_json.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
# Source: https://gist.github.com/sampsyo/920215
#

from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals

import json

_decoder = json.JSONDecoder()
Expand Down
4 changes: 4 additions & 0 deletions influxdb/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
"""
Python client for InfluxDB
"""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals

from functools import wraps
import json
Expand Down
4 changes: 4 additions & 0 deletions influxdb/dataframe_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
"""
DataFrame client for InfluxDB
"""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals

__all__ = ['DataFrameClient']

Expand Down
6 changes: 6 additions & 0 deletions influxdb/exceptions.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals


class InfluxDBClientError(Exception):
"""Raised when an error occurs in the request."""
def __init__(self, content, code=None):
Expand Down
5 changes: 5 additions & 0 deletions influxdb/helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
"""
Helper class for InfluxDB
"""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals

from collections import namedtuple, defaultdict
from datetime import datetime
from warnings import warn
Expand Down
6 changes: 6 additions & 0 deletions influxdb/influxdb08/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals

from .client import InfluxDBClient
from .dataframe_client import DataFrameClient
from .helper import SeriesHelper
Expand Down
5 changes: 5 additions & 0 deletions influxdb/influxdb08/chunked_json.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
# Source: https://gist.github.com/sampsyo/920215
#

from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals

import json

_decoder = json.JSONDecoder()
Expand Down
5 changes: 5 additions & 0 deletions influxdb/influxdb08/dataframe_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
"""
DataFrame client for InfluxDB
"""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals

import math
import warnings

Expand Down
5 changes: 5 additions & 0 deletions influxdb/influxdb08/helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
"""
Helper class for InfluxDB
"""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals

from collections import namedtuple, defaultdict
from warnings import warn

Expand Down
4 changes: 4 additions & 0 deletions influxdb/line_protocol.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals

from calendar import timegm
Expand Down
5 changes: 5 additions & 0 deletions influxdb/resultset.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals

import warnings

from influxdb.exceptions import InfluxDBClientError
Expand Down
11 changes: 7 additions & 4 deletions influxdb/tests/__init__.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals

import sys
import os
if sys.version_info < (2, 7):
import unittest2 as unittest
else:
import unittest

import unittest

using_pypy = hasattr(sys, "pypy_version_info")
skipIfPYpy = unittest.skipIf(using_pypy, "Skipping this test on pypy.")
Expand Down
10 changes: 5 additions & 5 deletions influxdb/tests/chunked_json_test.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# -*- coding: utf-8 -*-

import sys
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals

from influxdb import chunked_json

if sys.version_info < (2, 7):
import unittest2 as unittest
else:
import unittest
import unittest


class TestChunkJson(unittest.TestCase):
Expand Down
11 changes: 6 additions & 5 deletions influxdb/tests/client_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@
See client_test_with_server.py for tests against a running server instance.

"""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals

import json
import requests
import requests.exceptions
Expand All @@ -25,11 +30,7 @@
from mock import patch
import warnings
import mock
import sys
if sys.version_info < (2, 7):
import unittest2 as unittest
else:
import unittest
import unittest

from influxdb import InfluxDBClient, InfluxDBClusterClient
from influxdb.client import InfluxDBServerError
Expand Down
11 changes: 6 additions & 5 deletions influxdb/tests/dataframe_client_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@
"""
unit tests for misc module
"""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals

from .client_test import _mocked_session

import sys
if sys.version_info < (2, 7):
import unittest2 as unittest
else:
import unittest
import unittest
import json
import requests_mock
from nose.tools import raises
Expand Down
11 changes: 6 additions & 5 deletions influxdb/tests/helper_test.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
# -*- coding: utf-8 -*-

import sys
if sys.version_info < (2, 7):
import unittest2 as unittest
else:
import unittest
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals

import unittest
import warnings

import mock
Expand Down
6 changes: 1 addition & 5 deletions influxdb/tests/influxdb08/client_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@
import requests.exceptions
import socket
import sys
if sys.version_info < (2, 7):
import unittest2 as unittest
else:
import unittest
import unittest
import requests_mock
import random
from nose.tools import raises
Expand All @@ -21,7 +18,6 @@
from influxdb.influxdb08 import InfluxDBClient
from influxdb.influxdb08.client import session

import sys
if sys.version < '3':
import codecs

Expand Down
6 changes: 1 addition & 5 deletions influxdb/tests/influxdb08/dataframe_client_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,7 @@
"""
from .client_test import _mocked_session

import sys
if sys.version_info < (2, 7):
import unittest2 as unittest
else:
import unittest
import unittest
import json
import requests_mock
from nose.tools import raises
Expand Down
6 changes: 1 addition & 5 deletions influxdb/tests/influxdb08/helper_test.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
# -*- coding: utf-8 -*-

import sys
if sys.version_info < (2, 7):
import unittest2 as unittest
else:
import unittest
import unittest
import warnings

import mock
Expand Down
5 changes: 5 additions & 0 deletions influxdb/tests/misc.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals

import socket


Expand Down
11 changes: 6 additions & 5 deletions influxdb/tests/resultset_test.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
# -*- coding: utf-8 -*-

import sys
if sys.version_info < (2, 7):
import unittest2 as unittest
else:
import unittest
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals

import unittest

from influxdb.exceptions import InfluxDBClientError
from influxdb.resultset import ResultSet
Expand Down
5 changes: 5 additions & 0 deletions influxdb/tests/server_tests/base.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# -*- coding: utf-8 -*-

from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals

import sys

from influxdb.tests import using_pypy
Expand Down
Loading