Merge pull request #73 from Rory-Finnegan/development

Fixed previous yaml load commit and added a tox.ini file.
This commit is contained in:
Anders Ingemann 2014-04-16 09:07:58 +01:00
commit 33d2e1df61
3 changed files with 13 additions and 1 deletions

2
.gitignore vendored
View file

@ -8,3 +8,5 @@ _site/
/build /build
/dist /dist
/bootstrap_vz.egg-info /bootstrap_vz.egg-info
/.tox
/.coverage

View file

@ -67,7 +67,7 @@ def load_json(path):
def load_yaml(path): def load_yaml(path):
import yaml import yaml
with open(path, 'r') as fobj: with open(path, 'r') as fobj:
return yaml.load(fobj) return yaml.safe_load(fobj)
def config_get(path, config_path): def config_get(path, config_path):

10
tox.ini Normal file
View file

@ -0,0 +1,10 @@
[flake8]
ignore = E101,E221,E241,E501,W191
max-line-length = 110
[tox]
envlist = py27
[testenv]
# Once tests have started being written, uncomment this to run tests when running tox.
#commands = nosetests -v tests --with-coverage --cover-package=bootstrapvz --cover-inclusive