Merge branch 'master' of https://github.com/vatlab/sos-python

.travis.yml

@@ -0,0 +1,68 @@
+dist: trusty
+group: edge
+os:
+    - linux
+    # travis does not support python on osx yet (https://github.com/travis-ci/travis-ci/issues/4729)
+language: python
+python:
+    #- "3.3" test stops at installing spyder notebook etc
+    #- "3.4" test fails for unknown reason (sh not found):w
+    - "3.5"
+    - "3.6"
+before_install:
+    # Base SoS
+    - sudo apt-get update
+    - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
+    - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
+    - bash miniconda.sh -b -p $HOME/miniconda
+    - export PATH="$HOME/miniconda/bin:$PATH"
+    - hash -r
+    - conda config --set always_yes yes --set changeps1 no
+    - conda update -q conda
+    - conda info -a
+
+    # downgrade python if needed
+    - conda create -n python_test python=$TRAVIS_PYTHON_VERSION anaconda
+    - source activate python_test
+
+    - pip install docker rq
+    - pip install pyyaml psutil tqdm nose
+    - pip install fasteners pygments networkx pydot pydotplus 
+    - pip install entrypoints jupyter coverage codacy-coverage pytest pytest-cov python-coveralls
+    - conda install pandas numpy
+
+    # SoS Notebook
+    - pip install jedi notebook nbconvert nbformat pyyaml psutil tqdm scipy
+    - pip install pygments ipython wand graphviz sos sos-bash
+
+    # Python 2
+    - conda create -n ipykernel_py2 python=2 ipykernel
+    - source activate ipykernel_py2
+    - python -m ipykernel install --user
+    - source deactivate ipykernel_py2
+    - source activate python_test
+
+sudo: required
+install: "python setup.py install"
+before_script:
+    - cd test
+script:
+    - 'if [ $TRAVIS_PYTHON_VERSION == "3.6" ]; then
+           pytest -x -v;
+       else
+           pytest -x -v --cov sos_python --cov-report=xml;
+       fi'
+
+after_success:
+    - 'if [ $TRAVIS_PYTHON_VERSION == "3.5" ]; then
+           coverage combine;
+           coveralls;
+        fi'
+
+notifications:
+    email:
+        recipients:
+            - [email protected]
+        on_success: never
+        on_failure: always
+

README.md

@@ -1,2 +1,9 @@
+[![PyPI version](https://badge.fury.io/py/sos-python.svg)](https://badge.fury.io/py/sos-python)
+[![Build Status](https://travis-ci.org/vatlab/sos-python.svg?branch=master)](https://travis-ci.org/vatlab/sos-python)
+[![Build status](https://ci.appveyor.com/api/projects/status/7t5g42fiklrseyrb/branch/master?svg=true)](https://ci.appveyor.com/project/BoPeng/sos-python/branch/master)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/0d247d947560411ba92e1b62e8dbb109)](https://www.codacy.com/app/BoPeng/sos-python?utm_source=github.com&utm_medium=referral&utm_content=vatlab/sos-python&utm_campaign=Badge_Grade)
+[![Coverage Status](https://coveralls.io/repos/github/vatlab/sos-python/badge.svg)](https://coveralls.io/github/vatlab/sos-python)
+
 # sos-python
-SoS extension for Python2 and Python3
+SoS extension for Python2 and Python3. Please refer to [SoS Homepage](http://vatlab.github.io/SoS/) for details.
+

src/sos_python/_version.py

@@ -33,7 +33,7 @@
 # version of the SoS language
 __sos_version__ = '1.0'
 # version of the sos command
-__version__ = '0.9.9.1'
+__version__ = '0.9.9.2'
 __py_version__ = '{}.{}.{}'.format(_py_ver.major, _py_ver.minor, _py_ver.micro)
 
 #