Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump to brainglobe-space dependency #176

Merged
merged 3 commits into from
Jan 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ The name of the resulting atlases is the string to pass with the `--atlas` flag.
### Input data orientation

If your data does not match the BrainGlobe default orientation (the origin voxel is the most anterior, superior, left-most voxel), then you must specify the orientation by using the `--orientation` flag.
What follows must be a string in the [bg-space](https://github.com/brainglobe/bg-space) "initials" form, to describe the origin voxel.
What follows must be a string in the [brainglobe-space](https://github.com/brainglobe/brainglobe-space) "initials" form, to describe the origin voxel.

If the origin of your data (first, top left voxel) is the most anterior, superior, left part of the brain, then the orientation string would be "asl" (anterior, superior, left), and you would use:

Expand Down
2 changes: 1 addition & 1 deletion brainreg/core/backend/niftyreg/run.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import os
from pathlib import Path

import bg_space as bg
import brainglobe_space as bg
import imio
import numpy as np
from bg_atlasapi import BrainGlobeAtlas
Expand Down
2 changes: 1 addition & 1 deletion brainreg/core/main.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import logging

import bg_space as bg
import brainglobe_space as bg
import imio
from bg_atlasapi import BrainGlobeAtlas
from brainglobe_utils.general.system import get_num_processes
Expand Down
2 changes: 1 addition & 1 deletion brainreg/napari/register.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from enum import Enum
from typing import Dict, List, Tuple

import bg_space as bg
import brainglobe_space as bg
import napari
import numpy as np
from bg_atlasapi import BrainGlobeAtlas
Expand Down
2 changes: 1 addition & 1 deletion brainreg/napari/util.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import logging
from dataclasses import dataclass

import bg_space as bg
import brainglobe_space as bg
import numpy as np
import skimage.transform
from bg_atlasapi import BrainGlobeAtlas
Expand Down
31 changes: 29 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ classifiers = [
"Intended Audience :: Science/Research",
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
Expand All @@ -21,7 +20,7 @@ classifiers = [
requires-python = ">=3.9"
dependencies = [
"bg-atlasapi",
"bg-space",
"brainglobe-space>=1.0.0",
"brainglobe-utils>=0.2.7",
"fancylog",
"imio",
Expand Down Expand Up @@ -95,3 +94,31 @@ line-length = 79
exclude = ["__init__.py", "build", ".eggs"]
select = ["I", "E", "F"]
fix = true

[tool.tox]
legacy_tox_ini = """
[tox]
envlist = py{38,39,310,311}
isolated_build = True

[gh-actions]
python =
3.8: py38
3.9: py39
3.10: py310
3.11: py311

[testenv]
extras =
dev
napari
commands =
pytest -v --color=yes --cov=brainreg --cov-report=xml
passenv =
CI
GITHUB_ACTIONS
DISPLAY
XAUTHORITY
NUMPY_EXPERIMENTAL_ARRAY_FUNCTION
PYVISTA_OFF_SCREEN
"""
24 changes: 0 additions & 24 deletions tox.ini

This file was deleted.