Merge branch 'master' of github.com:jorgebastida/glue

jorgebastida · Mar 2, 2015 · a4f26f1 · a4f26f1
2 parents af0715f + bb02512
commit a4f26f1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,6 @@
 language: python
 python:
+  - "3.4"
   - "3.3"
   - "2.7"
   - "2.6"

diff --git a/docs/installation.rst b/docs/installation.rst
@@ -12,7 +12,7 @@ Before installing ``Homebrew`` you'll need to install Xcode, then you can follow
 
 .. code-block:: bash
 
-    $ sudo brew install jpeg
+    $ brew install jpeg
     $ sudo pip install glue
 
 .. note::

diff --git a/glue/bin.py b/glue/bin.py
@@ -16,7 +16,7 @@ def main(argv=None):
 
     argv = (argv or sys.argv)[1:]
 
-    parser = argparse.ArgumentParser(usage=("usage: %(prog)s [source | --source | -s] [output | --output | -o]"))
+    parser = argparse.ArgumentParser(usage=("%(prog)s [source | --source | -s] [output | --output | -o]"))
 
     parser.add_argument("--source", "-s",
                         dest="source",
-Original file line number
+Diff line change
@@ -1,5 +1,6 @@
     language: python
     python:
+      - "3.4"
       - "3.3"
       - "2.7"
       - "2.6"
@@ Expand Down @@