diff --git a/README.md b/README.md index 007f0ae..e323f58 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,8 @@ -[![test](https://github.com/ilastik/ilastikrag/actions/workflows/test.yaml/badge.svg)](https://github.com/ilastik/ilastikrag/actions/workflows/test.yaml) +[![test](https://github.com/ilastik/ilastikrag/actions/workflows/test.yml/badge.svg)](https://github.com/ilastik/ilastikrag/actions/workflows/test.yml) +[![conda version on ilastik-forge](https://anaconda.org/ilastik-forge/ilastikrag/badges/version.svg)](https://anaconda.org/ilastik-forge/ilastikrag) +[![platforms on ilastik-forge](https://anaconda.org/ilastik-forge/ilastikrag/badges/platforms.svg)](https://anaconda.org/ilastik-forge/ilastikrag) +[![downloads on ilastik-forge]( +https://anaconda.org/ilastik-forge/ilastikrag/badges/downloads.svg)](https://anaconda.org/ilastik-forge/ilastikrag) ilastikrag ========== @@ -16,5 +20,5 @@ Installation conda install -c ilastik-forge ilastikrag ``` -[Documentation]: http://stuarteberg.github.io/ilastikrag -[Quickstart Tutorial]: http://stuarteberg.github.io/ilastikrag/_static/quickstart-tutorial.html +[Documentation]: https://ilastik.github.io/ilastikrag/ +[Quickstart Tutorial]: https://ilastik.github.io/ilastikrag/_static/quickstart-tutorial.html diff --git a/dev/environment-dev.yaml b/dev/environment-dev.yaml index 8c330d1..ba76420 100644 --- a/dev/environment-dev.yaml +++ b/dev/environment-dev.yaml @@ -10,3 +10,6 @@ dependencies: - python>=3.7 - setuptools_scm - vigra + # for building the docs + - sphinx + - sphinx_rtd_theme diff --git a/docs/push-to-origin-gh-pages.sh b/docs/push-to-origin-gh-pages.sh index 0ddb709..18247a7 100755 --- a/docs/push-to-origin-gh-pages.sh +++ b/docs/push-to-origin-gh-pages.sh @@ -22,7 +22,7 @@ curr_commit=$(git rev-parse HEAD) # Read the url of the user's 'origin' remote origin_details=$(git remote -v | grep "^origin\s") -origin_url=$(echo ${origin_details} | python -c "import sys; print sys.stdin.read().split(' ')[1]") +origin_url=$(echo ${origin_details} | python -c "import sys; print(sys.stdin.read().split(' ')[1])") # Clone a copy into /tmp/ rm -rf /tmp/ilastikrag-gh-pages @@ -41,8 +41,6 @@ cp -r "${repo_dir}"/docs/build/html/* . # but we don't need jekyll anyway. Disable it. touch .nojekyll -# Copy circle.yml so that circle-ci knows not to build this branch. -cp -r ${repo_dir}/circle.yml . # Commit everything to gh-pages git add .