Skip to content

Commit e3081a1

Browse files
inderalepture
authored andcommitted
Install nose and flake8 if not available for running make tasks (#273)
* Install nose and flake8 if not available for running make tasks * Add `py35` to tox.ini envlist * Add task `clean-tox` to Makefile
1 parent e1bb478 commit e3081a1

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

Diff for: .gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ cover/
1515
venv/
1616
.tox
1717
*.egg
18+
.ropeproject/

Diff for: Makefile

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
.PHONY: lint test coverage clean clean-pyc clean-build docs
22

33
lint:
4+
@which flake8 || pip install flake8
45
@flake8 flask_oauthlib tests
56

67
test:
8+
@which nosetests || pip install nose
79
@nosetests -s --nologcapture
810

911
coverage:
12+
@which nosetests || pip install nose
1013
@rm -f .coverage
1114
@nosetests --with-coverage --cover-package=flask_oauthlib --cover-html
1215

13-
clean: clean-build clean-pyc clean-docs
16+
clean: clean-build clean-pyc clean-docs clean-tox
1417

1518

1619
clean-build:
@@ -29,5 +32,8 @@ clean-pyc:
2932
clean-docs:
3033
@rm -fr docs/_build
3134

35+
clean-tox:
36+
@rm -rf .tox/
37+
3238
docs:
3339
@$(MAKE) -C docs html

Diff for: tox.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py26,py27,py33,py34,pypy
2+
envlist = py26,py27,py33,py34,py35,pypy
33

44
[testenv]
55
deps =

0 commit comments

Comments
 (0)