Merge pull request #160 from fireeye/fix/bump-v1.2.0

fix travis
mandiant · May 13, 2016 · 537eab1 · 537eab1
2 parents 7aff31d + 9595c27
commit 537eab1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,32 +20,26 @@ matrix:
 before_install:
     # travis doesn't have py2.7 available, so we have to do it ourselves
     # ref: https://github.com/travis-ci/travis-ci/issues/2312
-    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-        git clone https://github.com/MacPython/terryfy ../terryfy;
-        source ../terryfy/travis_tools.sh;
-        get_python_environment macpython 2.7.10;
-      fi
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then git clone https://github.com/MacPython/terryfy ../terryfy; fi
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then source ../terryfy/travis_tools.sh;                         fi
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then get_python_environment macpython 2.7.10;                   fi
 
 install:
     - pip install https://github.com/williballenthin/vivisect/zipball/master
     - pip install pyinstaller pep8
     - echo "__version__ = '$(git describe --tags)'" > floss/version.py
     - pip install -e .
-    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-        # haven't figured how to build wclang on osx yet, so don't build tests
-        sudo apt-get install -y git clang mingw-w64 gcc-mingw-w64 cmake make gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 binutils-mingw-w64-x86-64 mingw-w64-dev  binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686;
-        git clone https://github.com/tpoechtrager/wclang.git ../wclang;
-        pushd ../wclang; cmake -DCMAKE_INSTALL_PREFIX=/usr/local && make && sudo make install; popd;
-        pushd tests/src; make all; popd;
-      fi
+    # haven't figured how to build wclang on osx yet, so don't build tests
+    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y git clang mingw-w64 gcc-mingw-w64 cmake make gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 binutils-mingw-w64-x86-64 mingw-w64-dev  binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686; fi
+    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then git clone https://github.com/tpoechtrager/wclang.git ../wclang;                              fi
+    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then pushd ../wclang; cmake -DCMAKE_INSTALL_PREFIX=/usr/local && make && sudo make install; popd; fi
+    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then pushd tests/src; make all; popd;                                                             fi
     - pyinstaller floss.spec
 
 script:
     - find . -name \*.py -exec pep8 --ignore=E501 {} \;
-    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-        # haven't figured how to build wclang on osx yet, so no tests
-        py.test tests/src/ -v;
-      fi
+    # haven't figured how to build wclang on osx yet, so no tests
+    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then py.test tests/src/ -v; fi
 
 addons:
     artifacts:

diff --git a/floss/version.py b/floss/version.py
@@ -1 +1 @@
-__version__ = "1.2.0"
+__version__ = '1.2.0'