Merge branch 'dev' into update_acq_cost

uremes · uremes · commit 559a51712e78 · 2024-04-10T17:03:43.000+03:00
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,7 @@ Changelog
 =========
 
 - Add option to use additive or multiplicative adjustment in any acquisition method
+- Add `arziv`-mocking to rtd-setup
 - Add convenience method for obtaining elfi samples as `InferenceData`` to be used with `arviz`
 - Improve `randmaxvar` batch acquisitions and initialisation by enabling sampling from prior
 - Drop official Python support for 3.7 and 3.8 as GPy is not officially supported for these versions
diff --git a/docs/conf.py b/docs/conf.py
@@ -33,7 +33,7 @@ def __getattr__(cls, name):
         'scipy.sparse', 'scipy.special', 'matplotlib.pyplot', 'numpy.random', 'networkx',
         'ipyparallel', 'numpy.lib', 'numpy.lib.format', 'sklearn.linear_model',
         'sklearn.pipeline', 'sklearn.preprocessing', 'numdifftools', 'GPy.kern', 'GPy.models',
-        'sklearn.covariance', 'sklearn.exceptions'
+        'sklearn.covariance', 'sklearn.exceptions', 'arviz'
     ]
     sys.modules.update((mod_name, Mock()) for mod_name in MOCK_MODULES)
 

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ def __getattr__(cls, name):`
`33`	`33`	`'scipy.sparse', 'scipy.special', 'matplotlib.pyplot', 'numpy.random', 'networkx',`
`34`	`34`	`'ipyparallel', 'numpy.lib', 'numpy.lib.format', 'sklearn.linear_model',`
`35`	`35`	`'sklearn.pipeline', 'sklearn.preprocessing', 'numdifftools', 'GPy.kern', 'GPy.models',`
`36`		`- 'sklearn.covariance', 'sklearn.exceptions'`
	`36`	`+ 'sklearn.covariance', 'sklearn.exceptions', 'arviz'`
`37`	`37`	`]`
`38`	`38`	`sys.modules.update((mod_name, Mock()) for mod_name in MOCK_MODULES)`
`39`	`39`