diff --git a/.travis.yml b/.travis.yml index b92ffcc..6adf7bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/grafannotate/annotation.py b/grafannotate/annotation.py index 8ce7589..c1317af 100644 --- a/grafannotate/annotation.py +++ b/grafannotate/annotation.py @@ -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()) diff --git a/setup.py b/setup.py index 3dddab6..ac77745 100644 --- a/setup.py +++ b/setup.py @@ -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', @@ -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', ] diff --git a/tox.ini b/tox.ini index c598d09..e80e233 100644 --- a/tox.ini +++ b/tox.ini @@ -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} @@ -10,7 +10,7 @@ deps= requests-mock [testenv:flake8] -basepython = python3.6 +basepython = python3.8 deps = flake8 commands =