Skip to content

Commit

Permalink
Merge pull request #11 from eth-cscs/extend_documentation
Browse files Browse the repository at this point in the history
Extend documentation
  • Loading branch information
statrita2004 authored Mar 31, 2017
2 parents d083aff + 2250558 commit d3f5d3a
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 4 deletions.
1 change: 1 addition & 0 deletions VERSION
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0.2
8 changes: 6 additions & 2 deletions doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

import sys
import os
from os import path

import sys
from unittest.mock import MagicMock
Expand Down Expand Up @@ -75,9 +76,12 @@ def __getattr__(cls, name):
# built documents.
#
# The short X.Y version.
version = '0.1'
here = path.abspath(path.dirname(__file__))
with open(path.join(here + "/../..", 'VERSION')) as f:
version = f.read()

# The full version, including alpha/beta/rc tags.
release = '0.1'
release = version

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion examples/extensions/models/gaussian_cpp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ cpp_simple: _gaussian_model_simple.so gaussian_model_simple.py
$(CC) $(CPPFLAGS) -I $(INCLUDEPATH) -c $< -o $@

_%.so: %.o %_wrap.o
$(CC) -shared $< -o $@
$(CC) -shared $^ -o $@

%.i:
$(WGET) "https://raw.githubusercontent.com/numpy/numpy/master/tools/swig/numpy.i"
5 changes: 4 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,16 @@
with open(path.join(here, 'requirements.txt')) as f:
dependencies = f.readlines()

with open(path.join(here, 'VERSION')) as f:
version = f.read()

setup(
name='abcpy',

# Versions should comply with PEP440. For a discussion on single-sourcing
# the version across setup.py and the project code, see
# https://packaging.python.org/en/latest/single_source_version.html
version='0.1',
version=version,

description='An framework for parallel approximate bayesian computation.',
long_description=long_description,
Expand Down

0 comments on commit d3f5d3a

Please sign in to comment.