BREAKING CHANGE: bump nanite to 3.0.0

AFM-analysis · Aug 9, 2021 · eb46a6c · eb46a6c
1 parent d652e50
commit eb46a6c
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,8 +1,11 @@
 0.10.0
+ - BREAKING CHANGE: The default contact point estimation method
+   changed. This means that your fitted contact points and any
+   E(delta)-related results will change!
  - feat: allow to select point of contact method
  - enh: restructure preprocessing tab and avoid situations where
    preprocessing dependencies are not met
- - setup: bump nanite from 2.0.0 to 2.1.0 (improved preprocessing)
+ - setup: bump nanite from 2.0.0 to 3.0.0 (improved preprocessing)
 0.9.4
  - enh: only show exact sneddon model "sneddon_spher" in developer
    mode to avoid confusion

diff --git a/pyjibe/fd/tab_preprocess.py b/pyjibe/fd/tab_preprocess.py
@@ -24,7 +24,7 @@ def __init__(self, *args, **kwargs):
             self.layout_preproc_area.addWidget(pwidget)
             pwidget.stateChanged.connect(self.check_selection)
             if pid == "correct_tip_offset":
-                idx = pwidget.comboBox.findData("scheme_2020")
+                idx = pwidget.comboBox.findData("deviation_from_baseline")
                 pwidget.comboBox.setCurrentIndex(idx)
         spacer_item = QtWidgets.QSpacerItem(20, 0,
                                             QtWidgets.QSizePolicy.Minimum,

diff --git a/setup.py b/setup.py
@@ -25,7 +25,7 @@
     description=description,
     long_description=open('README.rst').read() if exists('README.rst') else '',
     install_requires=["afmformats>=0.16.0",
-                      "nanite>=2.0.1",
+                      "nanite>=3.0.0",
                       "matplotlib>=3",  # NavigationToolbar2QT mod
                       "pyqt5"],
     python_requires='>=3.6, <4',

diff --git a/tests/test_fd_base.py b/tests/test_fd_base.py
@@ -60,10 +60,9 @@ def test_fit_all(qtbot):
 
 
 @pytest.mark.parametrize("method,contact_point", [
-    ["scheme_2020", 1805],
-    ["gradient_zero_crossing", 1902],
-    ["fit_constant_line", 1838],
-    ["deviation_from_baseline", 1805],
+    ["gradient_zero_crossing", 1895],
+    ["fit_constant_line", 1919],
+    ["deviation_from_baseline", 1908],
     ])
 def test_preprocessing_poc_estimation(method, contact_point):
     main_window = pyjibe.head.PyJibe()

diff --git a/tests/test_fd_fit.py b/tests/test_fd_fit.py
@@ -172,6 +172,8 @@ def test_apply_and_fit_all_with_bad_data(qtbot, monkeypatch):
     main_window = pyjibe.head.PyJibe()
     main_window.load_data(files=files)
     war = main_window.subwindows[0].widget()
+    war.tab_preprocess.set_preprocessing(
+        ["compute_tip_position", "correct_force_offset", "correct_tip_offset"])
 
     # Hit "apply model and fit all"
     qtbot.mouseClick(war.btn_fitall, QtCore.Qt.LeftButton, delay=200)