Skip to content
This repository has been archived by the owner on Apr 22, 2024. It is now read-only.

adding py35 and py36 #458

Merged
merged 1 commit into from
Jun 5, 2017
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 7 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ matrix:
env: TOX_ENV=pypy
- python: 3.4
env: TOX_ENV=py34
# An issue in travis-ci prevents this case from running
# Link to issue: https://github.com/travis-ci/travis-ci/issues/6304
# - python: pypy3.3-5.2-alpha1
# env: TOX_ENV=pypy3
- python: 3.4
- python: 3.5
env: TOX_ENV=py35
- python: 3.6
env: TOX_ENV=py36
- python: 3.6
env: TOX_ENV=docs
- python: 3.4
- python: 3.6
env: TOX_ENV=flake8
- python: 3.4
- python: 3.6
env: TOX_ENV=coverage

install:
Expand Down
4 changes: 2 additions & 2 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
requests
requests>=2.17.0
nose
mock
pandas
pandas==0.20.1
Sphinx==1.5.5
sphinx_rtd_theme
wheel
Expand Down
2 changes: 2 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Topic :: Software Development :: Libraries',
'Topic :: Software Development :: Libraries :: Python Modules',
),
Expand Down
6 changes: 3 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[tox]
envlist = py27, py34, pypy, pypy3, flake8, coverage, docs
envlist = py27, py34, py35, py36, pypy, pypy3, flake8, 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: pandas
py27,py34,py35,py36: pandas==0.20.1
# Only install pandas with non-pypy interpreters
commands = nosetests -v --with-doctest {posargs}

Expand All @@ -25,7 +25,7 @@ commands = nosetests -v --with-coverage --cover-html --cover-package=influxdb

[testenv:docs]
deps = -r{toxinidir}/requirements.txt
pandas
pandas==0.20.1
Sphinx==1.5.5
sphinx_rtd_theme
commands = sphinx-build -b html docs/source docs/build
Expand Down