Updated tox env and Dockerfile.

Author: Lispython

.gitignore

@@ -7,4 +7,9 @@ __pycache__/*
 .tox/*
 dist/*
 build/*
-.coverage
+.coverage
+\#*\#
+*~
+*.\#*
+.ropeproject/*
+.python-version

.travis.yml

@@ -18,14 +18,14 @@ matrix:
     - python: "2.7"
       env: UWSGI="2.0.14"
 
-    - python: "3.3"
-      env: UWSGI="2.0.14"
+    # - python: "3.3"
+    #   env: UWSGI="2.0.14"
 
-    - python: "3.4"
-      env: UWSGI="2.0.14"
+    # - python: "3.4"
+    #   env: UWSGI="2.0.14"
 
-    - python: "3.5"
-      env: UWSGI="2.0.14"
+    # - python: "3.5"
+    #   env: UWSGI="2.0.14"
 
-    - python: "3.6"
-      env: UWSGI="2.0.14"
+    # - python: "3.6"
+    #   env: UWSGI="2.0.14"

Makefile

@@ -33,14 +33,19 @@ publish: clean-pyc
 	$(DOCKER_RUN_COMMAND) "twine upload dist/*"
 	@echo ""
 
-test:
+test: clean-conteainers
 	@echo "Test application $(version)"
 	$(DOCKER_RUN_COMMAND) "uwsgi --pyrun setup.py --pyargv test --sharedarea=100 --enable-threads"
 	@echo ""
 
-lint:
+tox: clean-containers
+	@echo "Tox test application $(version)"
+	$(DOCKER_RUN_COMMAND) "tox"
+	@echo ""
+
+lint: clean-containers
 	@echo "Linting python files"
 	$(DOCKER_RUN_COMMAND) "PYFLAKES_NODOCTEST=1 flake8 pyprometheus" || exit 1
 	@echo ""
 
-.PHONY: test publish lint help clean-pyc
+.PHONY: test publish lint help clean-pyc tox

ci/test

@@ -1,4 +1,3 @@
 #!/bin/bash -e
 
-
 uwsgi --pyrun setup.py --pyargv test --sharedarea=100 --enable-threads

pyprometheus/compat.py

@@ -0,0 +1,19 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+pyprometheus.compat
+~~~~~~~~~~~~~~~~~~~
+
+Prometheus instrumentation library for Python applications
+
+:copyright: (c) 2017 by Alexandr Lispython.
+:license: , see LICENSE for more details.
+:github: http://github.com/Lispython/pyprometheus
+"""
+
+import sys
+
+# Useful for very coarse version differentiation.
+PY2 = sys.version_info[0] == 2
+PY3 = sys.version_info[0] == 3
+PY34 = sys.version_info[0:2] >= (3, 4)

setup.cfg

@@ -25,6 +25,7 @@ omit =
      fabfile.py
      setup.py
      .eggs/*
+     .tox/*
 
 [coverage:report]
 # Regexes for lines to exclude from consideration

tests_requirements.txt

@@ -1,5 +1,6 @@
 flake8==3.2.1
 tox==2.3.2
+#tox-pyenv==2.3.2
 
 pytest==3.0.6
 pytest-cov==2.4.0

tools/Dockerfile

@@ -12,11 +12,31 @@ RUN apt-get update && apt-get install -y \
 
 COPY tests_requirements.txt /tests_requirements.txt
 
+# Install pyenv for tox
+RUN git clone https://github.com/yyuu/pyenv.git ~/.pyenv
+ENV HOME /root
+ENV PYENV_ROOT $HOME/.pyenv
+ENV PATH $PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH
+
+RUN echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.bash_profile
+RUN echo 'export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.bash_profile
+RUN echo 'eval "$(pyenv init -)"' >> ~/.bash_profile
+
+RUN exec $SHELL
+
+RUN pyenv install 3.2  && \
+    pyenv install 3.3.0 && \
+    pyenv install 3.4.0 && \
+    pyenv install 3.5.0 && \
+    pyenv install 3.6.0 && \
+    pyenv install 3.7-dev && \
+    pyenv install pypy-4.0.1
+
+RUN pyenv local 3.2 3.3.0 3.4.0 3.5.0 3.6.0 3.7-dev pypy-4.0.1
 
 RUN pip install -U pip setuptools wheel==0.30.0a0 pyparsing==2.1.10 twine
 RUN pip install -U plop gprof2dot ipython
 
-
 RUN pip install -U -r /tests_requirements.txt
 
 

tools/Makefile

@@ -3,7 +3,7 @@ clean-containers:
 
 build-images:
 	@echo "Build docker images"
-	docker-compose -f tools/compose-config.yml build --force-rm
+	docker-compose -f tools/compose-config.yml build # --force-rm
 
 
 run-cmd:

tox.ini

@@ -4,9 +4,12 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py27, py33, py34, py35
+envlist = py27#, py33, py34, py35
 
 [testenv]
+deps = -rtests_requirements.txt
+
 commands =
-    pip install -e .[tests]
-    python setup.py test
+    pyenv local
+    #pip install -e .[tests]
+    uwsgi --pyrun setup.py --pyargv test --sharedarea=100 --enable-threads