Merge remote-tracking branch 'origin/master'

Conflicts:
	requirements.txt
	setup.py
This commit is contained in:
Anthony Sottile 2014-03-13 12:37:22 -07:00
commit eb592046e3
2 changed files with 2 additions and 0 deletions

View file

@ -1,5 +1,6 @@
argparse argparse
jsonschema jsonschema
plumbum
pyyaml pyyaml
simplejson simplejson

View file

@ -8,6 +8,7 @@ setup(
install_requires=[ install_requires=[
'argparse', 'argparse',
'jsonschema', 'jsonschema',
'plumbum',
'pyyaml', 'pyyaml',
'simplejson', 'simplejson',
], ],