diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 4f5f39b..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'] + 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 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: diff --git a/pyproject.toml b/pyproject.toml index 63687b6..ac11625 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,6 +10,7 @@ build-backend = "setuptools.build_meta" name = "pyjibe" authors = [ # In alphabetical order. + {name = "Eoghan O'Connell"}, {name = "Paul Müller"}, ] maintainers = [ @@ -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"] @@ -45,6 +46,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