test: pypy-5.4.1, try a matrix, tweaks

.travis.yml

@@ -1,15 +1,17 @@
 language: python
 sudo: required
 dist: precise
-python:
-- '2.7'
+
+matrix:
+  include:
+    - python: 2.7
+      env: TOXENV=py27 INCLUDE=ddb
+    - python: pypy-5.4.1
+      env: TOXENV=pypy INCLUDE=ddb
+    - env: TOXENV=flake8 PRE_TARGETS=
+
 install:
-- pip install virtualenv
-- virtualenv pypy
-- cd pypy/bin && ln -s python pypy && cd ../..
-- source pypy/bin/activate
-- python --version
-- make travis
+- make $INCLUDE travis
 script: tox -- --with-coverage --cover-xml --cover-package=autopush
 after_success:
 - codecov

Makefile

@@ -23,10 +23,10 @@ BUILD_DIRS = bin build deps include lib lib64 lib_pypy lib-python\
 
 all:	build
 
-travis: $(HERE)/ddb $(BIN)/tox
+travis:
 	pip install coverage nose mock moto codecov tox
 
-$(HERE)/ddb:
+ddb:
 	mkdir $@
 	curl -sSL http://dynamodb-local.s3-website-us-west-2.amazonaws.com/dynamodb_local_latest.tar.gz | tar xzvC $@
 
@@ -58,7 +58,7 @@ build: $(BIN)/pip
 	$(INSTALL) -r $(REQS)
 	$(PYTHON) setup.py develop
 
-test: $(BIN)/tox $(HERE)/ddb
+test: $(BIN)/tox ddb
 	$(BIN)/tox
 
 coverage: $(BIN)/tox

base-test-requirements.txt

@@ -0,0 +1,11 @@
+nose
+coverage
+mock>=1.0.1
+funcsigs==1.0.2
+pbr==1.10.0
+-e git+https://github.com/habnabit/txstatsd.git@master#egg=txStatsD
+-e git+https://github.com/bbangert/moto.git@3bdb75a961148ea5aa526f0e88d9e7835a30df3a#egg=moto
+flake8==3.2.0
+psutil
+websocket-client
+Pympler==0.4.3

pypy-test-requirements.txt

@@ -0,0 +1,2 @@
+-r pypy-requirements.txt
+-r base-test-requirements.txt

test-requirements.txt

@@ -1,12 +1,2 @@
 -r requirements.txt
-nose
-coverage
-mock>=1.0.1
-funcsigs==1.0.2
-pbr==1.10.0
--e git+https://github.com/habnabit/txstatsd.git@master#egg=txStatsD
--e git+https://github.com/bbangert/moto.git@3bdb75a961148ea5aa526f0e88d9e7835a30df3a#egg=moto
-flake8==3.2.0
-psutil
-websocket-client
-Pympler==0.4.3
+-r base-test-requirements.txt

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = python,flake8
+envlist = py27,pypy,flake8
 
 [testenv]
 deps = -rtest-requirements.txt
@@ -9,6 +9,9 @@ commands =
     nosetests {posargs} --with-object-tracker autopush
 install_command = pip install --pre {opts} {packages}
 
+[testenv:pypy]
+deps = -rpypy-test-requirements.txt
+
 [testenv:flake8]
 commands = flake8 autopush
 deps = -rtest-requirements.txt