Skip to content

Commit

Permalink
Fix tox invocation errors caused by sitepackages.
Browse files Browse the repository at this point in the history
sitepackages was set to True in tox.ini which allowed an error to occur
when global packages were modified. Added new files to tox ignore and
added funcsigs (used by mock) to setup.py
  • Loading branch information
sloboste committed Jul 13, 2015
1 parent f67c557 commit 403a8b2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ def publish():
setup_requires=[
'coverage==3.7.1',
'nose==1.3.1',
'mock==1.1.2'
'mock==1.1.2',
'funcsigs==0.4'
],
package_dir={'pygatt': 'pygatt'},
zip_safe=False,
Expand Down
3 changes: 1 addition & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
envlist = py27

[testenv]
sitepackages=True
commands =
{envpython} setup.py nosetests
flake8
Expand All @@ -17,4 +16,4 @@ passenv = PROGRAMFILES

[flake8]
max-line-length = 80
exclude=.coverage,.eggs,.git,.gitignore,.tox,.travis.yml,coverage*, nose*,include,Include,LICENSE,lib,local,Lib,MANIFEST.in,Makefile,NOTICE, README.rst,bin,Scripts,build,cover,dist,docs,man, nostests.xm., pip-selfcheck.json,pygatt.egg-info,requirements.txt,setup.py,setup.cfg,tox.ini
exclude=.coverage,*.egg,.eggs,.git,.gitignore,.tox,.travis.yml,coverage*, nose*,include,Include,LICENSE,lib,local,Lib,MANIFEST.in,Makefile,NOTICE, README.rst,bin,Scripts,build,cover,dist,docs,man, nostests.xm., pip-selfcheck.json,pygatt.egg-info,requirements.txt,setup.py,setup.cfg,tox.ini

0 comments on commit 403a8b2

Please sign in to comment.