Skip to content

Commit

Permalink
fix documentation and upload
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelbuehlmann committed Sep 1, 2017
1 parent ae3362e commit 7118bbe
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 3 deletions.
12 changes: 10 additions & 2 deletions .travis.yml
Expand Up @@ -68,7 +68,11 @@ jobs:
- doxygen Doxyfile
- make html
- cd ..
- doctr deploy . --built-docs docs/_build/html
- if [ -n "$TRAVIS_TAG" ]; then
doctr deploy . --built-docs docs/_build/html --no-require-master || travis_terminate 1;
else
doctr deploy . --built-docs docs/_build/html --no-require-master --no-push || travis_terminate 1;
fi

- stage: pypi_deploy
env:
Expand All @@ -82,4 +86,8 @@ jobs:
- ls
- python setup.py sdist
# - if [ -n "$TRAVIS_TAG" ]; then twine upload --repository-url "https://test.pypi.org/legacy/" dist/*; else echo "package _not_ uploaded to testpypi"; fi
- if [ -n "$TRAVIS_TAG" ]; then twine upload dist/*; else echo "package _not_ uploaded to pypi"; fi
- if [ -n "$TRAVIS_TAG" ]; then
twine upload dist/* || travis_terminate 1;
else
echo "package _not_ uploaded to pypi";
fi
2 changes: 1 addition & 1 deletion README.rst
Expand Up @@ -48,7 +48,7 @@ For the following steps make sure that your ``CC`` and ``CXX`` variables are set
Installation
============

.. code-block: bash
.. code-block:: bash
pip install catana
Expand Down
4 changes: 4 additions & 0 deletions setup.py
Expand Up @@ -60,10 +60,14 @@ def get_cmdclass():
cmdclass.update({"build_ext": CMakeBuild})
return cmdclass

def readme():
with open('README.rst') as f:
return f.read()

setup(
name='catana',
description='A library for Spherical Fourier Bessel (SFB) Decomposition',
long_description=readme(),
license='GPLv2',
author='Michael Buehlmann',
author_email='michael.buehlmann@oca.eu',
Expand Down

0 comments on commit 7118bbe

Please sign in to comment.