From dc87cf8874ac9729d960e242b78d6cfd5d7deb99 Mon Sep 17 00:00:00 2001 From: Eoghan O'Connell Date: Wed, 5 Nov 2025 11:48:52 +0100 Subject: [PATCH 1/6] setup: set setuptools section for debugging gui --- pyproject.toml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 63687b6..ca94838 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,7 @@ build-backend = "setuptools.build_meta" name = "pyjibe" authors = [ # In alphabetical order. - {name = "Paul Müller"}, + {name = "Paul Müller", name = "Eoghan O'Connell"}, ] maintainers = [ {name = "Paul Müller", email="dev@craban.de"}, @@ -45,6 +45,9 @@ tracker = "https://github.com/AFM-analysis/PyJibe/Issues" documentation = "https://pyjibe.readthedocs.io/en/stable/" changelog = "https://pyjibe.readthedocs.io/en/stable/sec_changelog.html" +[tool.setuptools] +packages = ["pyjibe"] + [tool.setuptools_scm] write_to = "pyjibe/_version.py" version_scheme = "post-release" \ No newline at end of file From a8252459b6c48c0bff6ff7e0f7bdc8b93056a808 Mon Sep 17 00:00:00 2001 From: Eoghan O'Connell Date: Wed, 5 Nov 2025 11:50:07 +0100 Subject: [PATCH 2/6] setup: set new author in alphab order --- pyproject.toml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index ca94838..ac11625 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,8 @@ build-backend = "setuptools.build_meta" name = "pyjibe" authors = [ # In alphabetical order. - {name = "Paul Müller", name = "Eoghan O'Connell"}, + {name = "Eoghan O'Connell"}, + {name = "Paul Müller"}, ] maintainers = [ {name = "Paul Müller", email="dev@craban.de"}, @@ -25,13 +26,13 @@ classifiers = [ 'Topic :: Scientific/Engineering :: Visualization', 'Intended Audience :: Science/Research' ] -license = {text = "GPL version 3.0 or later"} +license = { text = "GPL version 3.0 or later" } dependencies = [ "afmformats>=0.18.0", "nanite>=4.2.1", # https://github.com/AFM-analysis/PyJibe/issues/32 - "matplotlib>=3,<3.7.5", # NavigationToolbar2QT mod - "packaging", # for version checking during update + "matplotlib>=3,<3.7.5", # NavigationToolbar2QT mod + "packaging", # for version checking during update "pyqt6", ] dynamic = ["version"] From b71f25a9242ed181d7102a4f1a5603e18f3ba99c Mon Sep 17 00:00:00 2001 From: Eoghan O'Connell Date: Wed, 5 Nov 2025 11:50:40 +0100 Subject: [PATCH 3/6] fix: correctly get the plot checkState.value for autoscaling --- pyjibe/fd/widget_plot_fd.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyjibe/fd/widget_plot_fd.py b/pyjibe/fd/widget_plot_fd.py index e997295..65f4105 100644 --- a/pyjibe/fd/widget_plot_fd.py +++ b/pyjibe/fd/widget_plot_fd.py @@ -22,8 +22,8 @@ def fd(self): def mpl_curve_update(self, fdist): """Update the force-indentation curve""" - autoscale_x = self.fd.cb_mpl_rescale_plot_x.checkState() == 2 - autoscale_y = self.fd.cb_mpl_rescale_plot_y.checkState() == 2 + autoscale_x = self.fd.cb_mpl_rescale_plot_x.checkState().value == 2 + autoscale_y = self.fd.cb_mpl_rescale_plot_y.checkState().value == 2 if autoscale_x: rescale_x = None else: From 638382fdb491eb925ea1599a46150f9947448ac9 Mon Sep 17 00:00:00 2001 From: Eoghan O'Connell Date: Wed, 5 Nov 2025 11:57:09 +0100 Subject: [PATCH 4/6] ci: update actions matrix to newer py versions --- .github/workflows/check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 4f5f39b..9c1d615 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.10'] + python-version: ['3.12', '3.13'] os: [macos-latest, ubuntu-latest, windows-latest] env: # Display must be available globally for linux to know where xvfb is From e6fd9182858835580fae163392ca334aea841c3a Mon Sep 17 00:00:00 2001 From: Eoghan O'Connell Date: Wed, 5 Nov 2025 12:28:46 +0100 Subject: [PATCH 5/6] ci: test out all latest py versions on gha --- .github/workflows/check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 9c1d615..c913718 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.12', '3.13'] + python-version: ['3.10', '3.11', '3.12', '3.13', '3.14'] os: [macos-latest, ubuntu-latest, windows-latest] env: # Display must be available globally for linux to know where xvfb is From 1dc7241f7756aa2b4001f0b3195c5d727cd824f5 Mon Sep 17 00:00:00 2001 From: Eoghan O'Connell Date: Wed, 5 Nov 2025 14:46:56 +0100 Subject: [PATCH 6/6] ci: limit pipelines to py310 and py311 for now --- .github/workflows/check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index c913718..782440d 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.10', '3.11', '3.12', '3.13', '3.14'] + python-version: ['3.10', '3.11'] os: [macos-latest, ubuntu-latest, windows-latest] env: # Display must be available globally for linux to know where xvfb is