Skip to content

Commit

Permalink
set deps to rc2
Browse files Browse the repository at this point in the history
  • Loading branch information
Helveg committed Mar 28, 2024
1 parent fd33144 commit 5be8bd8
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 20 deletions.
34 changes: 17 additions & 17 deletions bsb_test/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
import numpy as _np
import requests
from bsb import (
Configuration as _Configuration,
Scaffold as _Scaffold,
parse_morphology_file as _parse,
Chunk as _Chunk,
Storage as _Storage,
get_engine_node as _get_engine_node,
Chunk,
Configuration,
Scaffold,
Storage,
UrlScheme,
get_engine_node,
parse_morphology_file,
)

from .configs import (
Expand All @@ -37,7 +37,7 @@
from bsb import Configuration, Scaffold, Storage


__version__ = "0.0.0-rc1"
__version__ = "4.0.0-rc2"


class NetworkFixture:
Expand All @@ -53,7 +53,7 @@ def setUp(self):
kwargs["storage"] = self.storage
except Exception:
pass
self.network = _Scaffold(**kwargs)
self.network = Scaffold(**kwargs)
super().setUp()


Expand Down Expand Up @@ -92,8 +92,8 @@ def random_storage(cls):
rstr = cls._rootf()
else:
# Get the engine's storage node default value, assuming it is random
rstr = _get_engine_node(cls._engine)(engine=cls._engine).root
s = _Storage(cls._engine, rstr)
rstr = get_engine_node(cls._engine)(engine=cls._engine).root
s = Storage(cls._engine, rstr)
cls._open_storages.append(s)
return s

Expand All @@ -102,7 +102,7 @@ class FixedPosConfigFixture:
cfg: "Configuration"

def setUp(self):
self.cfg = _Configuration.default(
self.cfg = Configuration.default(
cell_types=dict(test_cell=dict(spatial=dict(radius=2, count=100))),
placement=dict(
ch4_c25=dict(
Expand All @@ -114,10 +114,10 @@ def setUp(self):
)
self.chunk_size = cs = self.cfg.network.chunk_size
self.chunks = [
_Chunk((0, 0, 0), cs),
_Chunk((0, 0, 1), cs),
_Chunk((1, 0, 0), cs),
_Chunk((1, 0, 1), cs),
Chunk((0, 0, 0), cs),
Chunk((0, 0, 1), cs),
Chunk((1, 0, 0), cs),
Chunk((1, 0, 1), cs),
]
self.cfg.placement.ch4_c25.positions = MPI.bcast(
_np.vstack(
Expand Down Expand Up @@ -158,9 +158,9 @@ def setUp(self):
if self._morpho_filters and all(mpath.find(filter) == -1 for filter in self._morpho_filters):
continue
if mpath.endswith("swc"):
self.network.morphologies.save(Path(mpath).stem, _parse(mpath))
self.network.morphologies.save(Path(mpath).stem, parse_morphology_file(mpath))
else:
self.network.morphologies.save(Path(mpath).stem, _parse(mpath, parser="morphio"))
self.network.morphologies.save(Path(mpath).stem, parse_morphology_file(mpath, parser="morphio"))
MPI.barrier()
super().setUp()

Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ readme = "README.md"
license = {file = "LICENSE"}
classifiers = ["License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)"]
dynamic = ["version", "description"]
dependencies = ["bsb-core>=4.0.0rc0,<=4.0.0rc9999"]
dependencies = ["bsb-core==4.0.0rc2"]

[project.optional-dependencies]
test = ["bsb-core[parallel]", "bsb-hdf5>=1.0.0rc0", "coverage~=7.0"]
test = ["bsb-core[parallel]", "bsb-hdf5==4.0.0rc2", "coverage~=7.0"]

[tool.flit.module]
name = "bsb_test"
Expand All @@ -24,7 +24,7 @@ line-length=120
profile = "black"

[tool.bumpversion]
current_version = "0.0.0-rc1"
current_version = "4.0.0-rc2"
parse = """(?x)
(?P<major>0|[1-9]\\d*)\\.
(?P<minor>0|[1-9]\\d*)\\.
Expand Down

0 comments on commit 5be8bd8

Please sign in to comment.