Merge pull request #93 from HIIT/master_clean

Cleaning
elfi-dev · Dec 3, 2016 · 6b935fa · 6b935fa
2 parents 56d406c + 63235dc
commit 6b935fa
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 5 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2016, Helsinki Institute for Information Technology
+Copyright (c) 2016, ELFI Developers and their Assignees
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

diff --git a/docs/conf.py b/docs/conf.py
@@ -94,7 +94,7 @@ def __getattr__(cls, name):
 
 # General information about the project.
 project = 'ELFI'
-copyright = '2016, Helsinki Institute for Information Technology'
+copyright = '2016, ELFI Developers and their Assignees'
 author = 'ELFI authors'
 
 # The version info for the project you're documenting, acts as replacement for

diff --git a/elfi/__init__.py b/elfi/__init__.py
@@ -7,4 +7,4 @@
 
 __author__ = 'ELFI authors'
 __email__ = '[email protected]'
-__version__ = '0.2.0'
+__version__ = '0.2.2'
diff --git a/elfi/examples/ma2.py → examples/ma2.py b/elfi/examples/ma2.py → examples/ma2.py
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