update tox environment and tweak Makefile and circle.yml file

Makefile

@@ -8,14 +8,15 @@ help:
 	@echo "  test        run tests"
 	@echo "  coverage    run tests with code coverage"
 
-tox:
-	export PYENV_VERSION="2.7.11:3.5.1:pypy-5.0.0" && tox
-
 env:
-	pip install -r requirements.txt
+	pip install -Ur requirements.txt
 
 dev: env
-	pip install -r requirements.testing.txt
+	pip install -Ur requirements.testing.txt
+	pyenv install -s 2.7.11
+	pyenv install -s 3.5.2
+	pyenv install -s pypy-5.3
+	pyenv local 2.7.11 3.5.2 pypy-5.3
 
 info:
 	@python --version
@@ -35,15 +36,18 @@ docs:
 lint:
 	flake8 twitter > violations.flake8.txt
 
-test:
+test: lint
 	python setup.py test
 
+tox: clean
+	export PYENV_VERSION="2.7.11:3.5.1:pypy-5.0.0" && tox
+
 coverage: clean
 	coverage run --source=twitter setup.py test --addopts "--ignore=venv"
 	coverage html
 	coverage report
 
-ci: info coverage
+ci: tox coverage
 	CODECOV_TOKEN=`cat .codecov-token` codecov
 
 build: clean

circle.yml

@@ -1,4 +1,3 @@
-
 dependencies:
   override:
     - pip install -U pip

pytest.ini

@@ -4,3 +4,11 @@ norecursedirs=
     */python?.?/*
     */site-packages/*
     .tox/*
+
+with-coverage = true
+cover-package = twitter
+cover-html = true
+cover-html-dir = htmlcov
+cover-erase = true
+cover-inclusive = true
+cover-branches = true

requirements.testing.txt

@@ -14,3 +14,5 @@ coverage
 coveralls
 codecov
 check-manifest
+tox
+tox-pyenv

tox.ini

@@ -1,9 +1,18 @@
 [tox]
-envlist = py27, py35
+envlist = py27,py35,pypy,pypy3,codestyle
+skip_missing_interpreters = True
 
 [testenv]
-deps = -rrequirements.testing.txt
+deps = -Ur{toxinidir}/requirements.txt
+       -Ur{toxinidir}/requirements.testing.txt
+
 commands = make test
+
 whitelist_externals = /bin/bash
                       make
+setenv =
+    PYTHONWARNINGS=always::DeprecationWarning
 
+[testenv:codestyle]
+deps = pycodestyle
+commands = pycodestyle --ignore=E501 twitter tests