Skip to content
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
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@ sudo: false
dist: xenial
language: python
python:
- 2.7
- 3.4
- 3.6
- 3.7
- 3.8
matrix:
include:
- python: 3.6
- python: 3.8
env: TOXENV=flake8
install:
- pip install tox-travis
Expand Down
6 changes: 1 addition & 5 deletions grafannotate/annotation.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
import requests
import time
from influxdb import InfluxDBClient

try:
from urllib.parse import urlparse
except ImportError:
from urlparse import urlparse
from urllib.parse import urlparse

CURRENT_TIMESTAMP = int(time.time())

Expand Down
9 changes: 4 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
from setuptools import find_packages, setup

dependencies = [
'click==6.7',
'requests==2.21.0',
'influxdb==5.2.2'
'click==7.0',
'requests==2.22.0',
'influxdb==5.2.3'
]

setup(
name='grafannotate',
version='0.2.0',
version='0.2.2',
url='https://github.com/devopsmakers/python-grafannotate',
license='MIT',
author='Tim Birkett',
Expand Down Expand Up @@ -52,7 +52,6 @@
'License :: OSI Approved :: MIT License',
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 3',
#'Topic :: Software Development :: Libraries :: Python Modules',
]
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist=py{27,34,36,37}, flake8
envlist=py{36,37,38}, flake8

[testenv]
commands=py.test --cov grafannotate -vv {posargs}
Expand All @@ -10,7 +10,7 @@ deps=
requests-mock

[testenv:flake8]
basepython = python3.6
basepython = python3.8
deps =
flake8
commands =
Expand Down