Skip to content

Commit

Permalink
Merge branch 'conda-package' of github.com:rsagroup/rsatoolbox into c…
Browse files Browse the repository at this point in the history
…onda-package
  • Loading branch information
JasperVanDenBosch committed Mar 7, 2023
2 parents a73207c + 16d2a8b commit baf73dc
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 9 deletions.
5 changes: 0 additions & 5 deletions .conda/README.md

This file was deleted.

2 changes: 1 addition & 1 deletion .conda/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set name = "rsatoolbox" %}
{% set version = "0.1.1" %}
{% set version = "0.1.2" %}

package:
name: {{ name|lower }}
Expand Down
6 changes: 3 additions & 3 deletions src/rsatoolbox/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ def test_mds(self):
def test_evaluate(self):
"""Covers tqdm usage and evaluate functionality
"""
from rsatoolbox.inference import eval_bootstrap
from rsatoolbox.inference import eval_fixed
from rsatoolbox.model import ModelFixed
model = ModelFixed('G', self.array([2] * 10))
result = eval_bootstrap(model, self.larger_rdms, N=3)
model = ModelFixed('G', self.array(list(range(10))))
result = eval_fixed(model, self.larger_rdms)
self.assertAlmostEqual(result.test_zero()[0], 0)

def test_pandas_io(self):
Expand Down

0 comments on commit baf73dc

Please sign in to comment.