Merge branch 'master' of github.com:HIIT/elfi

elfi-dev · Dec 3, 2016 · b9fb322 · b9fb322
2 parents c3731e9 + 6e33a4b
commit b9fb322
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 3 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,28 @@
+#### Summary:
+Please provide a short couple sentence summary.
+
+
+#### Description:
+Describe the issue as clearly as possible.
+
+
+#### Reproducible Steps:
+Please report steps to reproduce the issue. If it's not possible to reproduce, please include a description of how you discovered the issue.
+
+If you have a reproducible example, please include it.
+
+
+#### Current Output:
+The current output. Knowing what is the current behavior is useful.
+
+
+#### Expected Output:
+Describe what you expect the output to be. Knowing the correct behavior is also very useful.
+
+
+#### ELFI Version:
+
+#### Python Version:
+
+#### Operating System:
+
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,19 @@
+#### Summary:
+
+#### Intended Effect:
+
+#### How to Verify:
+
+#### Side Effects:
+
+#### Documentation:
+
+#### Reviewer Suggestions: 
+
+#### Copyright and Licensing
+
+Please list the copyright holder for the work you are submitting (this will be you or your assignee, such as a university or company):
+
+By submitting this pull request, the copyright holder is agreeing to license the submitted work under the following licenses:
+- Code: BSD3 (https://opensource.org/licenses/BSD-3-Clause)
+- Documentation: CC-BY 4.0 (https://creativecommons.org/licenses/by/4.0/)
diff --git a/docs/readme.rst b/docs/readme.rst
@@ -20,3 +20,12 @@ Currently implemented ABC methods:
 GitHub page: https://github.com/HIIT/elfi
 
 See examples under the notebooks directory to get started.
+
+Licenses:
+
+- Code: BSD3_
+- Documentation: `CC-BY 4.0`_
+
+.. _BSD3: https://opensource.org/licenses/BSD-3-Clause
+.. _CC-BY 4.0: https://creativecommons.org/licenses/by/4.0
+
diff --git a/elfi/__init__.py b/elfi/__init__.py
@@ -7,4 +7,4 @@
 
 __author__ = 'ELFI authors'
 __email__ = 'aki.vehtari@aalto.fi'
-__version__ = '0.2.1'
+__version__ = '0.2.2'
diff --git a/notebooks/ma2_example.ipynb → notebooks/ELFI_tutorial_MA2.ipynb b/notebooks/ma2_example.ipynb → notebooks/ELFI_tutorial_MA2.ipynb
diff --git a/tests/functional/test_ma2.py b/tests/functional/test_ma2.py
@@ -4,7 +4,7 @@
 import dask
 from elfi.core import *
 from elfi.distributions import *
-from elfi.examples.ma2 import MA2, autocov, distance
+from examples.ma2 import MA2, autocov, distance
 from distributed import Client
 from functools import partial
 

diff --git a/tests/unit/test_random_consistency.py b/tests/unit/test_random_consistency.py
@@ -1,6 +1,6 @@
 import numpy as np
 from elfi import *
-from elfi.examples.ma2 import *
+from examples.ma2 import *
 
 from functools import partial
 import pytest