From 3c545e915a56093b533441aff5344c8e6aaae922 Mon Sep 17 00:00:00 2001 From: Johannes Soltwedel <38459088+jo-mueller@users.noreply.github.com> Date: Tue, 27 May 2025 11:53:02 +0200 Subject: [PATCH 1/5] Delete deploy.bat --- deploy.bat | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 deploy.bat diff --git a/deploy.bat b/deploy.bat deleted file mode 100644 index cf63c525..00000000 --- a/deploy.bat +++ /dev/null @@ -1,7 +0,0 @@ -python -m pip install --user --upgrade setuptools wheel - -python setup.py sdist bdist_wheel - -python -m pip install --user --upgrade twine - -python -m twine upload --repository pypi dist/* From 71ee5de1da46814d37ca7be7bad2f38cc439f3c2 Mon Sep 17 00:00:00 2001 From: Johannes Soltwedel <38459088+jo-mueller@users.noreply.github.com> Date: Tue, 27 May 2025 11:53:15 +0200 Subject: [PATCH 2/5] use qtpy in requirement instead of pyqt5 --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 1154c663..812c01e5 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,5 +1,5 @@ jupyter-book>=0.7.0b napari -pyqt5 # noqa +QtPy napari-stress sphinx>=5.0.0 From 39c2f4f11399319e6e0b14b8ef3a55cc7a77afa7 Mon Sep 17 00:00:00 2001 From: Johannes Soltwedel <38459088+jo-mueller@users.noreply.github.com> Date: Tue, 27 May 2025 11:54:03 +0200 Subject: [PATCH 3/5] force later napari-stress in docs depencency --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 812c01e5..1c3d5acb 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,5 +1,5 @@ jupyter-book>=0.7.0b napari QtPy -napari-stress +napari-stress>=0.3.9 sphinx>=5.0.0 From 2c51c29fed9b67dc2d3dda40d048cdfafb53944a Mon Sep 17 00:00:00 2001 From: Johannes Soltwedel <38459088+jo-mueller@users.noreply.github.com> Date: Tue, 27 May 2025 12:42:37 +0200 Subject: [PATCH 4/5] introduce git tags for versioning --- pyproject.toml | 16 ++++++++-------- src/napari_stress/__init__.py | 2 -- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 750c1b3c..0e1dcf8c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,13 +17,12 @@ classifiers = [ "Programming Language :: Python", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3.7", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", "Topic :: Software Development :: Testing", ] -requires-python = ">=3.7" +requires-python = ">=3.9" dependencies = [ "dask", "distributed", @@ -65,7 +64,7 @@ napari-stress = "napari_stress:napari.yaml" "User Support" = "https://github.com/campaslab/napari-stress/issues" [build-system] -requires = ["setuptools>=42.0.0", "wheel"] +requires = ["setuptools>=42.0.0", "wheel", "setuptools_scm"] build-backend = "setuptools.build_meta" [tool.setuptools] @@ -77,12 +76,13 @@ where = ["src"] [tool.setuptools.package-data] "*" = ["*.yaml"] -[tool.setuptools.dynamic] -version = {attr = "napari_stress.__version__"} +[tool.setuptools_scm] +write_to = "src/napari_stress/_version.py" +fallback_version = "0.0.1+nogit" [tool.black] line-length = 79 -target-version = ['py37', 'py38', 'py39', 'py310'] +target-version = ['py39', 'py310', 'py311'] [tool.ruff] line-length = 79 @@ -127,5 +127,5 @@ exclude = [ "*_vendor*", ] -target-version = "py37" +target-version = "py311" fix = true diff --git a/src/napari_stress/__init__.py b/src/napari_stress/__init__.py index 6e6e3cfa..9dc5a73d 100644 --- a/src/napari_stress/__init__.py +++ b/src/napari_stress/__init__.py @@ -1,5 +1,3 @@ -__version__ = "0.3.9" - from . import _approximation as approximation from . import _measurements as measurements from . import _plotting as plotting From e2bd67f6bbb8aea0d39a6b1edb3502b8b9b90ac7 Mon Sep 17 00:00:00 2001 From: Johannes Soltwedel <38459088+jo-mueller@users.noreply.github.com> Date: Tue, 27 May 2025 14:57:49 +0200 Subject: [PATCH 5/5] import version correctly fix version import --- src/napari_stress/_approximation/fit_ellipsoid.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/napari_stress/_approximation/fit_ellipsoid.py b/src/napari_stress/_approximation/fit_ellipsoid.py index 96e04264..f969fe10 100644 --- a/src/napari_stress/_approximation/fit_ellipsoid.py +++ b/src/napari_stress/_approximation/fit_ellipsoid.py @@ -6,7 +6,7 @@ if TYPE_CHECKING: import napari -from .. import __version__ +from .._version import __version__ from .._utils.frame_by_frame import frame_by_frame