Skip to content

Commit

Permalink
Adapted travis config.
Browse files Browse the repository at this point in the history
  • Loading branch information
mschoengens committed May 7, 2018
1 parent df27306 commit 579f6d1
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ install:
- pip install -r requirements/backend-spark.txt
script:
- make test
before_deploy:
- make clean
- mkdir dist
deploy:
- provider: pypi
user: mschoengens
Expand Down
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ help:

clean:
find . -name "*.pyc" -type f -delete
find . -name "*.pkl" -type f -delete
find . -name "__pycache__" -delete
find . -name ".#*" -delete
find . -name "#*#" -delete
Expand Down Expand Up @@ -72,6 +73,7 @@ reinstall: uninstall install


whl_file: clean
mkdir -p build/dist
python3 setup.py -v bdist_wheel -d build/dist
@echo
@echo "Find" `ls build/dist` "in build/dist/."
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ scientists by providing
# Documentation
For more information, check out the

* [Tutorial](http://abcpy.readthedocs.io/en/v0.5.0/README.html)
* [Documentation](http://abcpy.readthedocs.io/en/v0.5.0)
* [Examples](https://github.com/eth-cscs/abcpy/tree/v0.5.0/examples) directory and
* [Reference](http://abcpy.readthedocs.io/en/v0.5.0/abcpy.html)

Expand Down
2 changes: 1 addition & 1 deletion doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def __getattr__(cls, name):
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
#sys.path.insert(0, os.path.abspath('.'))
sys.path.insert(0, os.path.abspath('.'))
# -- General configuration ------------------------------------------------

# If your documentation needs a minimal Sphinx version, state it here.
Expand Down
3 changes: 3 additions & 0 deletions examples/extensions/models/gaussian_cpp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ INCLUDEPATH=/usr/include/python3.4m

cpp_simple: _gaussian_model_simple.so gaussian_model_simple.py

clean:
rm gaussian_model_simple.o gaussian_model_simple.py gaussian_model_simple_wrap.cpp

%.py: %.i
$(SWIG) $(SWIGFLAGS) -o $@ $<

Expand Down
10 changes: 8 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
# Always prefer setuptools over distutils
import sys
from setuptools import setup, find_packages
from pip.req import parse_requirements
from pip.download import PipSession
from os import path

try: # for pip >= 10
from pip._internal.req import parse_requirements
from pip._internal.download import PipSession
except ImportError: # for pip <= 9.0.3
from pip.req import parse_requirements
from pip.download import PipSession

here = path.abspath(path.dirname(__file__))

install_reqs_raw = parse_requirements('requirements.txt', session=PipSession())
Expand Down

0 comments on commit 579f6d1

Please sign in to comment.