Skip to content

Commit

Permalink
Merge pull request #37 from predicthq/pytest
Browse files Browse the repository at this point in the history
Switch to pytest
  • Loading branch information
mbonnefoy committed Nov 13, 2019
2 parents d10cfbc + bbba759 commit 2e4d981
Show file tree
Hide file tree
Showing 20 changed files with 617 additions and 599 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Expand Up @@ -13,10 +13,10 @@ cache:
- $HOME/.cache

install:
- pip install "setuptools>=17.1" coveralls
- pip install -r requirements.txt

script:
- python setup.py nosetests
- pytest --cov=predicthq tests/

after_success:
- coveralls
Expand Down
2 changes: 1 addition & 1 deletion predicthq/version.py
@@ -1 +1 @@
__version__ = '0.3.2'
__version__ = '0.3.3'
10 changes: 10 additions & 0 deletions requirements.txt
@@ -0,0 +1,10 @@
coveralls>=1.8.2,<2.0
mock==1.3.0
pytest>=4.6.0,<5.0
pytest-cov>=2.8.1,<3.0
python-dateutil>=2.4.2,<3.0
pytz==2015.4
requests>=2.7.0,<3.0
responses==0.5.1
schematics==2.0.0.dev2
six>=1.9.0,<2.0
9 changes: 2 additions & 7 deletions setup.cfg
@@ -1,10 +1,5 @@
[wheel]
universal = 1

[nosetests]
verbosity=2
detailed-errors=1
with-coverage=1
cover-package=predicthq
cover-erase=1
cover-min-percentage=90
[aliases]
test=pytest
11 changes: 2 additions & 9 deletions setup.py
Expand Up @@ -36,22 +36,15 @@ def read(*parts):
author_email="developers@predicthq.com",
url=REPO_URL,
packages=find_packages(exclude=("tests*",)),
test_suite="nose.collector",
setup_requires=[
"nose==1.3.7"
],
tests_require=[
"nose==1.3.7",
"coverage>=4.0.0",
"responses==0.5.1",
"mock==1.3.0",
'pytest-runner>=5.1,<6.0',
],
install_requires=[
"six>=1.9.0",
"requests>=2.7.0",
"schematics==2.0.0.dev2",
"python-dateutil>=2.4.2",
"pytz>=2015.4",
"pytz==2015.4",
],
classifiers=[
"Development Status :: 4 - Beta",
Expand Down
62 changes: 0 additions & 62 deletions tests/config_tests.py

This file was deleted.

2 changes: 0 additions & 2 deletions tests/endpoints/__init__.py
@@ -1,2 +0,0 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals, absolute_import, print_function
123 changes: 0 additions & 123 deletions tests/endpoints/decorators_tests.py

This file was deleted.

0 comments on commit 2e4d981

Please sign in to comment.