Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/ubermag/ubermag
Browse files Browse the repository at this point in the history
  • Loading branch information
marijanbeg committed Nov 4, 2019
2 parents 25a15ee + 509f731 commit 1897b9e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -14,7 +14,7 @@ Marijan Beg<sup>1,2</sup>, Ryan A. Pepper<sup>2</sup>, Thomas Kluyver<sup>1</sup
| Documentation | [![Documentation Status](https://readthedocs.org/projects/ubermag/badge/?version=latest)](https://ubermag.readthedocs.io/en/latest/?badge=latest) |
| Binder | [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/ubermag/ubermag/master?filepath=docs%2Fipynb%2Findex.ipynb) |
| Platforms | [![Platforms](https://anaconda.org/conda-forge/ubermag/badges/platforms.svg)](https://anaconda.org/conda-forge/ubermag) |
| Downloads | [![Downloads](https://anaconda.org/conda-forge/ubermag/badges/downloads.svg)](https://anaconda.org/conda-forge/ubermag) |
| Downloads | [![Anaconda-Server Badge](https://anaconda.org/conda-forge/ubermag/badges/downloads.svg)](https://anaconda.org/conda-forge/ubermag) |
| License | [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause) |

## About
Expand All @@ -25,7 +25,7 @@ It is available on all major operating systems (Windows, MacOS, Linux) and requi

## Installation, testing, and upgrade

We support installation using `conda` package manager. Instructions can be found [here](https://ubermag.readthedocs.io/en/latest/ipynb/00-tutorial-installation-testing-upgrade.html).
We support installation using `conda` package manager. Instructions can be found [here](https://ubermag.readthedocs.io/en/latest/ipynb/01-tutorial-installation.html).

## Binder

Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
@@ -1,6 +1,6 @@
environment:
matrix:
- PYTHON_VERSION: 3.6
- PYTHON_VERSION: 3.7
MINICONDA: C:\Miniconda3-x64

platform:
Expand Down

0 comments on commit 1897b9e

Please sign in to comment.