Skip to content

Commit

Permalink
Merge pull request requests#346 from jdufresne/nose
Browse files Browse the repository at this point in the history
Remove dependency of unmaintained nose
  • Loading branch information
singingwolfboy authored Dec 27, 2018
2 parents febb124 + 2dd4d22 commit 5bfb712
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
.coverage
MANIFEST
coverage.xml
nosetests.xml
junit-report.xml
pylint.txt
toy.py
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ install:
- pip install requests-mock
- pip install coveralls
script:
- coverage run --source=requests_oauthlib -m nose
- coverage run --source=requests_oauthlib -m unittest discover
after_success:
- coveralls
3 changes: 1 addition & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ envlist = py27, py34, py35, py36, py37, pypy, pypy3
[testenv]
deps=
-r{toxinidir}/requirements.txt
nose
mock
coveralls
requests-mock
commands= coverage run --source=requests_oauthlib -m nose
commands= coverage run --source=requests_oauthlib -m unittest discover

0 comments on commit 5bfb712

Please sign in to comment.