Skip to content

Commit

Permalink
Merge 3695e8b into 97f5218
Browse files Browse the repository at this point in the history
  • Loading branch information
Maximilian committed Aug 24, 2019
2 parents 97f5218 + 3695e8b commit a72e15e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -15,7 +15,7 @@ before_install:
- source activate myenv
- pip install --upgrade pip
install:
- conda install --yes python=$TRAVIS_PYTHON_VERSION numpy
- conda install --yes libgfortran==1 numpy
- pip install --upgrade quantities future
- pip install pytest pytest-cov coveralls
- pip install h5py_wrapper
Expand Down
5 changes: 3 additions & 2 deletions README.md
Expand Up @@ -23,8 +23,9 @@ The user can set two global parameters:
throw an error in this case.


![Python2.7](https://img.shields.io/badge/python-2.7-blue.svg)
![Python3.6](https://img.shields.io/badge/python-3.6-blue.svg)
[![Python2.7](https://img.shields.io/badge/python-2.7-blue.svg)](https://www.python.org/downloads/release/python-2714/)
[![Python3.6](https://img.shields.io/badge/python-3.6-red.svg)](https://www.python.org/downloads/release/python-369/)
[![Documentation](https://readthedocs.org/projects/python-dicthash/badge/?version=latest)](https://python-dicthash.readthedocs.io/en/latest/)
[![PyPI version fury.io](https://d25lcipzij17d.cloudfront.net/badge.svg?id=py&type=6&v=0.0.2&x2=0)](https://pypi.org/project/dicthash/)
[![GPL license](https://img.shields.io/badge/License-GPLv2-blue.svg)](https://www.gnu.org/licenses/old-licenses/gpl-2.0.html)

Expand Down

0 comments on commit a72e15e

Please sign in to comment.