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

Merge with atlasgen #199

Merged
merged 119 commits into from
Feb 23, 2024
Merged

Merge with atlasgen #199

merged 119 commits into from
Feb 23, 2024

Conversation

willGraham01
Copy link
Collaborator

@willGraham01 willGraham01 commented Feb 12, 2024

Concerns brainglobe/BrainGlobe#43

This will:

  • Merge bg-atlasgen into this repository. It will become the atlas_generation submodule.
  • Rename the package to brainglobe-atlasapi

After merging:

TODO:

pre-commit-ci bot and others added 17 commits February 6, 2024 08:28
* [pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/astral-sh/ruff-pre-commit: v0.1.9 → v0.2.0](astral-sh/ruff-pre-commit@v0.1.9...v0.2.0)
- [github.com/psf/black: 23.12.1 → 24.1.1](psf/black@23.12.1...24.1.1)

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Add manifest to CI

* Standardise tox.ini into pyproject
* first test functions for validate_mesh_structure_pairs

* storing atlases and successful/failed validation functions in a data frame

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* restoring test_validation.py to the original merged version. Chages are implemented on another branch

* validate_atlases.py: going back to the version on main, appending only the name of the successful and failed functions (not the function object) to lists in validate_atlases function

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* populating dictionaries in for loop, writing JSON files

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* saving JSON files to ~/.brainglobe/atlases/validation

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* printing where to find the result files

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update bg_atlasgen/validate_atlases.py

Co-authored-by: Alessandro Felder <[email protected]>

* Update bg_atlasgen/validate_atlases.py

removing unused variables

Co-authored-by: Alessandro Felder <[email protected]>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* saving only one JSON file with all the information

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* uncommenting test functions

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Alessandro Felder <[email protected]>
viktorpm and others added 4 commits February 21, 2024 16:31
* first test functions for validate_mesh_structure_pairs

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* adding docstring

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* writing docstrings to explain the behaviour of the test functions

* validate_atlases.py: updated validate_mesh_structure_pairs function, test_validation.py: updated tests

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* spliting validate_mesh_structure_pairs function, checking mesh files and structures separately

* writing tests for catch_missing_mesh_files and catch_missing_structures validation functions

* creating an atlas with a missing structure to test catch_missing_structures function

* Update tests/test_unit/test_validation.py

Co-authored-by: Alessandro Felder <[email protected]>

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Alessandro Felder <[email protected]>
@willGraham01 willGraham01 requested a review from a team February 23, 2024 10:58
@willGraham01 willGraham01 marked this pull request as ready for review February 23, 2024 10:58
Copy link
Member

@alessandrofelder alessandrofelder left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good - thanks a lot @willGraham01 !
Tiny suggestion.

pyproject.toml Outdated Show resolved Hide resolved
Co-authored-by: Alessandro Felder <[email protected]>
@willGraham01 willGraham01 merged commit e34a84a into main Feb 23, 2024
8 checks passed
@willGraham01 willGraham01 deleted the atlasgen-merge branch February 23, 2024 11:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.