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

Various housekeeping #190

Merged
merged 10 commits into from
Jan 10, 2024
Merged
Show file tree
Hide file tree
Changes from 9 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: 0 additions & 2 deletions .github/workflows/test_and_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ jobs:
python-version: "3.10"
- os: windows-latest
python-version: "3.9"
- os: ubuntu-latest
python-version: "3.8"

steps:
- uses: neuroinformatics-unit/actions/test@v1
Expand Down
3 changes: 3 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
include LICENSE
include README.md
include requirements.txt

exclude .codecov.yml
prune tutorials
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[![Wheel](https://img.shields.io/pypi/wheel/bg-atlasapi.svg)](https://pypi.org/project/bg-atlasapi)
[![Development Status](https://img.shields.io/pypi/status/brainatlas-api.svg)](https://github.com/SainsburyWellcomeCentre/brainatlas-api)
[![Downloads](https://pepy.tech/badge/bg-atlasapi)](https://pepy.tech/project/bg-atlasapi)
[![Tests](https://img.shields.io/github/workflow/status/brainglobe/bg-atlasapi/tests)](
[![Tests](https://img.shields.io/github/actions/workflow/status/brainglobe/bg-atlasapi/test_and_deploy.yml?branch=main)](
https://github.com/brainglobe/bg-atlasapi/actions)
[![codecov](https://codecov.io/gh/brainglobe/bg-atlasapi/branch/master/graph/badge.svg?token=WTFPFW0TE4)](https://codecov.io/gh/brainglobe/bg-atlasapi)
[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/python/black)
Expand Down
12 changes: 10 additions & 2 deletions bg_atlasapi/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
__author__ = """brainglobe"""
__version__ = "1.0.2"
from importlib.metadata import PackageNotFoundError, version

try:
__version__ = version("bg-atlasapi")
del version
except PackageNotFoundError:

Check warning on line 6 in bg_atlasapi/__init__.py

View check run for this annotation

Codecov / codecov/patch

bg_atlasapi/__init__.py#L6

Added line #L6 was not covered by tests
# package is not installed
pass

Check warning on line 8 in bg_atlasapi/__init__.py

View check run for this annotation

Codecov / codecov/patch

bg_atlasapi/__init__.py#L8

Added line #L8 was not covered by tests

__author__ = "BrainGlobe Developers"
adamltyson marked this conversation as resolved.
Show resolved Hide resolved


from bg_atlasapi.bg_atlas import BrainGlobeAtlas
Expand Down
Binary file removed docs/img/brainglobe_list.png
Binary file not shown.
32 changes: 21 additions & 11 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,11 @@ classifiers = [
"Intended Audience :: Science/Research",
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.9",
]
requires-python = ">=3.8"
requires-python = ">=3.9"
dependencies = [
"bg-space >= 0.5.0",
"click",
Expand All @@ -32,15 +31,14 @@ dependencies = [
dynamic = ["version"]

[project.urls]
"Homepage" = "https://brainglobe.info/atlas-api"
"Homepage" = "https://brainglobe.info/documentation/bg-atlasapi/index.html"
"Source Code" = "https://github.com/brainglobe/bg-atlasapi"
"Bug Tracker" = "https://github.com/brainglobe/bg-atlasapi/issues"
"Documentation" = "https://docs.brainglobe.info/bg-atlasapi"
"Documentation" = "https://brainglobe.info/documentation/bg-atlasapi/index.html"

[project.optional-dependencies]
dev = [
"check-manifest",
"gitpython",
"pre-commit",
"pytest",
"pytest-cov",
Expand Down Expand Up @@ -74,7 +72,7 @@ markers = [
]

[tool.black]
target-version = ['py38', 'py39', 'py310', 'py311']
target-version = ['py39', 'py310', 'py311']
skip-string-normalization = false
line-length = 79

Expand All @@ -95,8 +93,20 @@ exclude = ["__init__.py","build",".eggs"]
select = ["I", "E", "F"]
fix = true

[tool.cibuildwheel]
build = "cp38-* cp39-* cp310-* cp311-*"
[tool.tox]
legacy_tox_ini = """
# For more information about tox, see https://tox.readthedocs.io/en/latest/
[tox]
envlist = py{38,39,310,311}

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

[tool.cibuildwheel.macos]
archs = ["x86_64", "arm64"]
[testenv]
extras =
dev
commands = pytest -v --color=yes --cov=bg_atlasapi --cov-report=xml
"""
15 changes: 0 additions & 15 deletions tox.ini

This file was deleted.

Loading