Use 'tox' to run tests

.gitignore

@@ -5,6 +5,7 @@ build/
 dist/
 .uptodate
 /.env
-/junit.xml
+/junit-*.xml
 /.cache
 .ensure-*
+/.tox

CHANGELOG.rst

@@ -2,6 +2,22 @@
 Changelog
 =========
 
+0.5.0 (2018-??-??)
+==================
+
+New features
+------------
+
+* grafanalib now supports Python 2.7. This enables it to be used within `Bazel <https://bazel.build>`_.
+* Partial support for graphs against Elasticsearch datasources (https://github.com/weaveworks/grafanalib/pull/99)
+
+Extensions
+----------
+
+* Constants for days, hours, and minutes (https://github.com/weaveworks/grafanalib/pull/98)
+* Groups and tags can now be used with templates (https://github.com/weaveworks/grafanalib/pull/97)
+
+
 0.4.0 (2017-11-23)
 ==================
 

Makefile

@@ -23,56 +23,53 @@ DOCKER_IMAGE_DIRS=$(patsubst %/Dockerfile,%,$(DOCKERFILES))
 IMAGE_NAMES=$(foreach dir,$(DOCKER_IMAGE_DIRS),$(patsubst %,$(IMAGE_PREFIX)/%,$(shell basename $(dir))))
 
 # Python-specific stuff
-VIRTUALENV_DIR ?= .env
-VIRTUALENV_BIN = $(VIRTUALENV_DIR)/bin
-DEPS_UPTODATE = $(VIRTUALENV_DIR)/.deps-uptodate
-
-VIRTUALENV := $(shell command -v virtualenv 2> /dev/null)
+TOX := $(shell command -v tox 2> /dev/null)
 PIP := $(shell command -v pip 2> /dev/null)
+FLAKE8 := $(shell command -v flake8 2> /dev/null)
 
-JUNIT_XML := "junit.xml"
-
-.ensure-virtualenv: .ensure-pip
-ifndef VIRTUALENV
-	$(error "virtualenv is not installed. Install with `pip install [--user] virtualenv`.")
+.ensure-tox: .ensure-pip
+ifndef TOX
+	rm -f .ensure-tox
+	$(error "tox is not installed. Install with `pip install [--user] tox`.")
 endif
-	touch .ensure-virtualenv
+	touch .ensure-tox
 
 .ensure-pip:
 ifndef PIP
+	rm -f .ensure-pip
 	$(error "pip is not installed. Install with `python -m [--user] ensurepip`.")
 endif
 	touch .ensure-pip
 
-$(VIRTUALENV_BIN)/pip: .ensure-virtualenv
-	virtualenv $(VIRTUALENV_DIR)
+.ensure-flake8: .ensure-pip
+ifndef FLAKE8
+	rm -f .ensure-flake8
+	$(error "flake8 is not installed. Install with `pip install [--user] flake8`.")
+endif
+	touch .ensure-pip
 
 images:
 	$(info $(IMAGE_NAMES))
 
 all: $(UPTODATE_FILES) test lint
 
-$(DEPS_UPTODATE): setup.py $(VIRTUALENV_BIN)/pip
-	$(VIRTUALENV_BIN)/pip install -e .[dev]
-	touch $(DEPS_UPTODATE)
-
-deps: $(DEPS_UPTODATE)
+deps: setup.py .ensure-tox tox.ini
 
 $(VIRTUALENV_BIN)/flake8 $(VIRTUALENV_BIN)/py.test: $(DEPS_UPTODATE)
 
 gfdatasource/$(UPTODATE): gfdatasource/*
 
-lint: $(VIRTUALENV_BIN)/flake8
-	$(VIRTUALENV_BIN)/flake8 gfdatasource/gfdatasource grafanalib
+lint: .ensure-flake8
+	$(FLAKE8) gfdatasource/gfdatasource grafanalib
 
-test: $(VIRTUALENV_BIN)/py.test
-	$(VIRTUALENV_BIN)/py.test --junitxml=$(JUNIT_XML)
+test: .ensure-tox
+	$(TOX) --skip-missing-interpreters
 
 clean:
 	$(SUDO) docker rmi $(IMAGE_NAMES) >/dev/null 2>&1 || true
 	rm -rf $(UPTODATE_FILES)
 	rm -rf grafanalib.egg-info
-	rm $(DEPS_UPTODATE)
+	rm -f .ensure-pip .ensure-tox .ensure-flake8
 	find . -name '*.pyc' | xargs rm
 
 clean-deps:

README.rst

@@ -129,7 +129,7 @@ Support
 This library is in its very early stages. We'll probably make changes that
 break backwards compatibility, although we'll try hard not to.
 
-grafanalib works with Python 3.4 and 3.5.
+grafanalib works with Python 2.7, 3.4, 3.5, and 3.6.
 
 Developing
 ==========

circle.yml

@@ -9,13 +9,15 @@ machine:
 
 dependencies:
   override:
+    - pip install tox flake8
     - make deps
 
 test:
   override:
     - "mkdir -p $(dirname $SRCDIR) && cp -r $(pwd)/ $SRCDIR"
     - "mkdir -p $CIRCLE_TEST_REPORTS/py.test/"
-    - cd $SRCDIR; make JUNIT_XML=$CIRCLE_TEST_REPORTS/py.test/junit.xml all
+    - cd $SRCDIR; make all
+    - mv $SRCDIR/junit-*.xml $CIRCLE_TEST_REPORTS/py.test/
 
 deployment:
   push:

tox.ini

@@ -0,0 +1,12 @@
+# Tox (https://tox.readthedocs.io/) is a tool for running tests
+# in multiple virtualenvs. This configuration file will run the
+# test suite on all supported python versions. To use it, "pip install tox"
+# and then run "tox" from this directory.
+
+[tox]
+envlist = py27, py34, py35, py36
+
+[testenv]
+commands = pytest --junitxml=junit-{envname}.xml
+deps =
+    pytest