Revert "Merge pull request #257 from pynamodb/pytest (#263)"

This reverts commit baee9fb.
pynamodb · May 10, 2017 · f9079d0 · f9079d0
1 parent 935063f
commit f9079d0
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -46,6 +46,7 @@ pip-log.txt
 .coverage
 cover/
 .tox
+nosetests.xml
 
 # Translations
 *.mo
@@ -57,6 +58,3 @@ cover/
 
 # PyCharm
 .idea/
-
-# Ignore Cache
-.cache/
diff --git a/.travis.yml b/.travis.yml
@@ -14,7 +14,7 @@ install:
   - pip install -r requirements.txt
 
 script:
-  - py.test --cov=pynamodb pynamodb/tests/
+  - nosetests --with-coverage --cover-package=pynamodb
 
 after_success:
   - coveralls
diff --git a/requirements.txt b/requirements.txt
@@ -2,9 +2,8 @@ sphinx-rtd-theme==0.1.8
 mock==2.0.0
 botocore==1.1.2
 flake8==2.4.1
+nose==1.3.7
 requests==2.7.0
 six==1.8.0
 tox==2.1.1
 python-coveralls==2.5.0
-pytest==3.0.7
-pytest-cov==2.4.0
diff --git a/tox.ini b/tox.ini
@@ -6,4 +6,4 @@ envlist = py26,py27,py33,py34,py35,pypy
 
 [testenv]
 deps = -rrequirements.txt
-commands = py.test pynamodb/tests
+commands = nosetests