diff --git a/brainglobe_utils/brainmapper/analysis.py b/brainglobe_utils/brainmapper/analysis.py index 75cf8d8..7d3a2fd 100644 --- a/brainglobe_utils/brainmapper/analysis.py +++ b/brainglobe_utils/brainmapper/analysis.py @@ -9,7 +9,7 @@ import numpy as np import pandas as pd -from bg_atlasapi import BrainGlobeAtlas +from brainglobe_atlasapi import BrainGlobeAtlas from brainglobe_utils.general.system import ensure_directory_exists from brainglobe_utils.pandas.misc import safe_pandas_concat, sanitise_df diff --git a/brainglobe_utils/brainreg/transform.py b/brainglobe_utils/brainreg/transform.py index 703514f..9e05b75 100644 --- a/brainglobe_utils/brainreg/transform.py +++ b/brainglobe_utils/brainreg/transform.py @@ -6,7 +6,7 @@ import numpy as np import pandas as pd import tifffile -from bg_atlasapi import BrainGlobeAtlas +from brainglobe_atlasapi import BrainGlobeAtlas from brainglobe_utils.image_io import get_size_image_from_file_paths diff --git a/brainglobe_utils/citation/repositories.py b/brainglobe_utils/citation/repositories.py index f064d57..845fb35 100644 --- a/brainglobe_utils/citation/repositories.py +++ b/brainglobe_utils/citation/repositories.py @@ -251,8 +251,8 @@ def unique_repositories_from_tools( # Static instances for each of our repositories # that we provide citation information for. -bg_atlasapi = Repository( - "bg-atlasapi", +brainglobe_atlasapi = Repository( + "brainglobe-atlasapi", [ "BrainGlobe AtlasAPI", "AtlasAPI", diff --git a/pyproject.toml b/pyproject.toml index 6956e87..3b647cb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,7 +17,7 @@ classifiers = [ "Programming Language :: Python :: 3.11", ] dependencies = [ - "bg-atlasapi", + "brainglobe-atlasapi >= 2.0.1", "brainglobe-space", "configobj", "natsort", diff --git a/tests/tests/test_citation/test_cite.py b/tests/tests/test_citation/test_cite.py index 53adb86..e2731e1 100644 --- a/tests/tests/test_citation/test_cite.py +++ b/tests/tests/test_citation/test_cite.py @@ -23,16 +23,16 @@ def test_citation_combinations( both_together = cite( "brainglobe-meta", - "bg-atlasapi", + "brainglobe-atlasapi", format=format, newline_separations=newline_separations, ) bg_meta = cite("brainglobe-meta", format=format) - bg_atlasapi = cite("bg-atlasapi", format=format) + brainglobe_atlasapi = cite("brainglobe-atlasapi", format=format) # Fetching both citations together should mean the text from the # individual citations is included - assert bg_meta in both_together and bg_atlasapi in both_together, ( + assert bg_meta in both_together and brainglobe_atlasapi in both_together, ( "Fetching multiple tools at once" "does not generate all requested citations." ) @@ -40,7 +40,7 @@ def test_citation_combinations( # should leave only newline and whitespace characters leftover_text = ( both_together.replace(bg_meta, "") - .replace(bg_atlasapi, "") + .replace(brainglobe_atlasapi, "") .replace(" ", "") .replace("\n", "") ) diff --git a/tests/tests/test_citation/test_repositories.py b/tests/tests/test_citation/test_repositories.py index c7aa8b9..a2b36bb 100644 --- a/tests/tests/test_citation/test_repositories.py +++ b/tests/tests/test_citation/test_repositories.py @@ -31,14 +31,14 @@ def test_repository_basics() -> None: - The less-than comparison (by repo name) """ BrainGlobe = Repository("BrainGlobe", []) - bg_atlasapi = Repository("bg-atlasapi", []) + brainglobe_atlasapi = Repository("brainglobe-atlasapi", []) # URL construction assert BrainGlobe.url == "https://github.com/brainglobe/BrainGlobe" # Equality comparison assert ( - BrainGlobe != bg_atlasapi + BrainGlobe != brainglobe_atlasapi ), "Different repositories are deemed equal!" assert ( BrainGlobe == BrainGlobe @@ -46,7 +46,7 @@ def test_repository_basics() -> None: # Less-than and ordering (alphabetical by Python) assert ( - BrainGlobe < bg_atlasapi + BrainGlobe < brainglobe_atlasapi ), "Repository comparison does not assert alphabetical order by name" @@ -77,7 +77,9 @@ def test_unique_repos() -> None: assert ( len( unique_repositories_from_tools( - "bg-atlasapi", "bg_atlasapi", report_duplicates=True + "brainglobe-atlasapi", + "brainglobe_atlasapi", + report_duplicates=True, ) ) == 1