Skip to content

Commit c920fdd

Browse files
PinkShnackEoghan O'Connell
andauthored
Fix: plot autoscaling not being recognised (#42)
* setup: set setuptools section for debugging gui * setup: set new author in alphab order * fix: correctly get the plot checkState.value for autoscaling * ci: update actions matrix to newer py versions * ci: test out all latest py versions on gha * ci: limit pipelines to py310 and py311 for now --------- Co-authored-by: Eoghan O'Connell <eoghan.oconnell@mpl.mpg.de>
1 parent 4df1ae1 commit c920fdd

3 files changed

Lines changed: 10 additions & 6 deletions

File tree

.github/workflows/check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
python-version: ['3.10']
14+
python-version: ['3.10', '3.11']
1515
os: [macos-latest, ubuntu-latest, windows-latest]
1616
env:
1717
# Display must be available globally for linux to know where xvfb is

pyjibe/fd/widget_plot_fd.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ def fd(self):
2222

2323
def mpl_curve_update(self, fdist):
2424
"""Update the force-indentation curve"""
25-
autoscale_x = self.fd.cb_mpl_rescale_plot_x.checkState() == 2
26-
autoscale_y = self.fd.cb_mpl_rescale_plot_y.checkState() == 2
25+
autoscale_x = self.fd.cb_mpl_rescale_plot_x.checkState().value == 2
26+
autoscale_y = self.fd.cb_mpl_rescale_plot_y.checkState().value == 2
2727
if autoscale_x:
2828
rescale_x = None
2929
else:

pyproject.toml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ build-backend = "setuptools.build_meta"
1010
name = "pyjibe"
1111
authors = [
1212
# In alphabetical order.
13+
{name = "Eoghan O'Connell"},
1314
{name = "Paul Müller"},
1415
]
1516
maintainers = [
@@ -25,13 +26,13 @@ classifiers = [
2526
'Topic :: Scientific/Engineering :: Visualization',
2627
'Intended Audience :: Science/Research'
2728
]
28-
license = {text = "GPL version 3.0 or later"}
29+
license = { text = "GPL version 3.0 or later" }
2930
dependencies = [
3031
"afmformats>=0.18.0",
3132
"nanite>=4.2.1",
3233
# https://github.com/AFM-analysis/PyJibe/issues/32
33-
"matplotlib>=3,<3.7.5", # NavigationToolbar2QT mod
34-
"packaging", # for version checking during update
34+
"matplotlib>=3,<3.7.5", # NavigationToolbar2QT mod
35+
"packaging", # for version checking during update
3536
"pyqt6",
3637
]
3738
dynamic = ["version"]
@@ -45,6 +46,9 @@ tracker = "https://github.com/AFM-analysis/PyJibe/Issues"
4546
documentation = "https://pyjibe.readthedocs.io/en/stable/"
4647
changelog = "https://pyjibe.readthedocs.io/en/stable/sec_changelog.html"
4748

49+
[tool.setuptools]
50+
packages = ["pyjibe"]
51+
4852
[tool.setuptools_scm]
4953
write_to = "pyjibe/_version.py"
5054
version_scheme = "post-release"

0 commit comments

Comments
 (0)