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

Cleanup according to Talley's suggestions #68

Merged
merged 6 commits into from
Sep 16, 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
9 changes: 0 additions & 9 deletions .napari-hub/DESCRIPTION.md

This file was deleted.

14 changes: 4 additions & 10 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,12 @@ repos:
- id: trailing-whitespace
exclude: ^\.napari-hub/.*
- id: check-yaml # checks for correct yaml syntax for github actions ex.
- repo: https://github.com/charliermarsh/ruff-pre-commit
rev: v0.0.256
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.4.7
hooks:
- id: ruff
- repo: https://github.com/psf/black
rev: 22.3.0
hooks:
- id: black
- repo: https://github.com/tlambert03/napari-plugin-checks
rev: v0.3.0
hooks:
- id: napari-plugin-checks
args: [--fix]
- id: ruff-format
# https://mypy.readthedocs.io/en/stable/introduction.html
# you may wish to add this as well!
# - repo: https://github.com/pre-commit/mirrors-mypy
Expand Down
5 changes: 0 additions & 5 deletions MANIFEST.in

This file was deleted.

92 changes: 60 additions & 32 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,41 +1,64 @@
[build-system]
requires = ["setuptools>=64", "wheel", "setuptools_scm>=8"]
requires = ["setuptools>=70", "setuptools-scm>=8"]
build-backend = "setuptools.build_meta"

[tool.setuptools_scm]

[tool.black]
line-length = 79
target-version = ['py38', 'py39', 'py310']
[project]
name = "motile-plugin"
dynamic = ["version"]
description = "Tracking with motile"
readme = "README.md"
license = { text = "BSD 3-Clause License" }
requires-python = ">=3.10"
authors = [
{ name = "Caroline Malin-Mayor", email = "[email protected]" },
]
classifiers = [
"Development Status :: 2 - Pre-Alpha",
"Framework :: napari",
"Intended Audience :: Developers",
"License :: OSI Approved :: BSD License",
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Topic :: Scientific/Engineering :: Image Processing",
]

[tool.ruff]
line-length = 79

exclude = [
".bzr",
".direnv",
".eggs",
".git",
".mypy_cache",
".pants.d",
".ruff_cache",
".svn",
".tox",
".venv",
"__pypackages__",
"_build",
"buck-out",
"build",
"dist",
"node_modules",
"venv",
"*vendored*",
"*_vendor*",
dependencies =[
"napari[all]",
"numpy",
"magicgui",
"qtpy",
"scikit-image",
"motile >= 0.3",
"motile_toolbox >=0.3.3",
"pydantic",
"tifffile[all]",
"fonticon-fontawesome6",
"pyqtgraph",
"lxml_html_clean", # only to deal with napari dependencies being broken
]
[project.optional-dependencies]
testing =["napari", "pyqt5", "pytest", "pytest-cov", "pytest-qt"]
docs = ["myst-parser", "sphinx", "sphinx-autoapi", "sphinx_rtd_theme", "sphinxcontrib-video"]

[project.entry-points."napari.manifest"]
motile-plugin = "motile_plugin:napari.yaml"

target-version = "py38"
[project.urls]
"Bug Tracker" = "https://github.com/funkelab/motile-napari-plugin/issues"
"Documentation" ="https://funkelab.github.io/motile_napari_plugin/"

[tool.setuptools_scm]

[tool.ruff]
line-length = 88
target-version = "py310"
fix = true

[tool.ruff.lint]
select = [
"E", "F", "W", #flake8
"UP", # pyupgrade
Expand All @@ -51,10 +74,15 @@ select = [
]

ignore = [
"E501", # line too long. let black handle this
"UP006", "UP007", # type annotation. As using magicgui require runtime type annotation then we disable this.
"SIM117", # flake8-simplify - some of merged with statements are not looking great with black, reanble after drop python 3.9
"ISC001", # implicit string concatenation
]

[tool.ruff.lint.per-file-ignores]
"scripts/*.py" = ["F"]

# https://docs.astral.sh/ruff/formatter/
[tool.ruff.format]

[tool.mypy]
ignore_missing_imports = true
76 changes: 0 additions & 76 deletions setup.cfg

This file was deleted.

Loading