Merge pull request #13 from moccu/update-test-settings

Update test settings

.travis.yml

@@ -4,7 +4,6 @@ python:
   - '2.7'
   - '3.4'
   - '3.5'
-  - pypy
 
 env:
   - DJANGO_VERSION=1.9.x
@@ -19,15 +18,6 @@ script:
   - tox -e "$TRAVIS_PYTHON_VERSION-$DJANGO_VERSION"
 
 after_success:
-  - pip install "coveralls==1.0" coverage
+  - pip install "coveralls" coverage
   - coverage report
   - coveralls
-
-notifications:
-  hipchat:
-    on_success: always
-    rooms:
-      secure: cKx7sJTc0kqriAcy86XO5/XNVeT/fW6xt9sjkMQaEbJ9FYp0Q0Lm3dteXCXMW+DvwKvD4ppu2hwAIEkxM+QOa5zxaa02m16EyigencuyLt9kWn7Q0i/wC2nQbmH7Ie81l6UAua+TaLt5WCDWxKOBhsik15EzQeWI7xXGGXHPGMA=
-    template:
-      - "<strong>%{repository_name}</strong> <a href='%{build_url}'>build %{build_number}</a> (%{branch}) %{message}. (%{duration})"
-    format: html

setup.py

@@ -22,19 +22,21 @@
     'mock==1.3.0',
     'openpyxl==2.2.6',
     'psutil==3.2.1',
-    'pytest==2.8.0',
+    'pytest==3.0.3',
     'pytest-cov==2.1.0',
     'pytest-pep8==1.0.6',
     'pytest-flakes==1.0.1',
-    'pytest-django==2.8.0',
+    'pytest-django==3.0.0',
     'factory-boy==2.5.2',
-    'Pillow==2.9.0',
+    'Pillow==3.4.0',
     'django-anylink==0.3.0',
     'django-treebeard>=4.0',
     'django-cms==3.2.5',
     'django-polymorphic==0.8.1',
     'django-compressor==1.6',
     'django-filer==1.1.1',
+    'tox==2.3.1',
+    'tox-pyenv==1.0.3',
 ]
 
 

tox.ini

@@ -1,9 +1,12 @@
 [testenv]
 skipsdist = True
+usedevelop = True
 commands =
-	pip install -e {toxinidir}
-	pip install -e {toxinidir}[tests]
-	py.test -vs --junitxml=junit-{envname}.xml --cache-clear --cov {toxinidir}/barbeque --cov-config {toxinidir}/.coveragerc --cov-report xml
+    pip install wheel
+    pip wheel -w {homedir}/.wheelhouse/ {toxinidir} -f {homedir}/.wheelhouse/
+    pip install --use-wheel --no-index -f {homedir}/.wheelhouse/ -e {toxinidir}
+    pip install --use-wheel -f {homedir}/.wheelhouse/ -e {toxinidir}[tests]
+    py.test -vs --junitxml=junit-{envname}.xml --cache-clear --cov {toxinidir}/barbeque --cov-report xml
 
 deps_django18 =
 	https://github.com/django/django/archive/stable/1.8.x.tar.gz#egg=django
@@ -42,16 +45,6 @@ basepython = python3.5
 deps =
 	{[testenv]deps_django19}
 
-[testenv:pypy-1.8.x]
-basepython = pypy
-deps =
-	{[testenv]deps_django18}
-
-[testenv:pypy-1.9.x]
-basepython = pypy
-deps =
-	{[testenv]deps_django19}
-
 [docs]
 commands =
 	pip install -e {toxinidir}