Merge remote-tracking branch 'origin/master'

Conflicts: requirements.txt setup.py
2026-02-17 08:14:42 +04:00 · 2014-03-13 12:37:22 -07:00 · 2014-03-13 12:37:22 -07:00 · eb592046e3
commit eb592046e3
parent 3945f84e3f 9914255ffa
2 changed files with 2 additions and 0 deletions
--- a/requirements.txt
+++ b/requirements.txt
@ -1,5 +1,6 @@
 argparse
 jsonschema
+plumbum
 pyyaml
 simplejson

--- a/setup.py
+++ b/setup.py
@ -8,6 +8,7 @@ setup(
    install_requires=[
        'argparse',
        'jsonschema',
+        'plumbum',
        'pyyaml',
        'simplejson',
    ],