Skip to content

Commit

Permalink
Merge pull request #103 from jakubplichta/py26
Browse files Browse the repository at this point in the history
drop support for Python 2.6
  • Loading branch information
jakubplichta authored Sep 14, 2017
2 parents 2c0f0bf + dafe314 commit a26cfe5
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 15 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
language: python
python:
- "2.7"
install:
- pip install tox
script:
Expand Down
5 changes: 2 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
# Copyright 2015-2016 grafana-dashboard-builder contributors
# Copyright 2015-2017 grafana-dashboard-builder contributors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -47,7 +47,7 @@ def run_tests(self):

params = {
'name': 'grafana-dashboard-builder',
'version': '0.1.0a16',
'version': '0.2.0a1',
'packages': [
'grafana_dashboards',
'grafana_dashboards.client',
Expand All @@ -71,7 +71,6 @@ def run_tests(self):
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
],
'keywords': 'grafana yaml',
Expand Down
17 changes: 5 additions & 12 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,20 +1,13 @@
[tox]
envlist = pep8, py26, py27
envlist = pep8, py27

[testenv]
passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
deps =
py27: pytest
py27: mock
py27: pytest-cov
py27: coveralls
py26: coveralls==1.1
py26: mock==2.0.0
py26: pytest==3.0.4
py26: pytest-cov==2.4.0
py26: coverage==4.2
py26: requests==2.11.1
py26: py==1.4.31
pytest
mock
pytest-cov
coveralls
commands=
py.test --cov={envsitepackagesdir}/grafana_dashboards
coveralls
Expand Down

0 comments on commit a26cfe5

Please sign in to comment.