Merge branch 'master' of github.com:wfondrie/mokapot

.github/workflows/tests.yml

@@ -9,16 +9,20 @@ on:
 jobs:
   build:
     runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.experimental }}
     strategy:
+      fail-fast: false
       matrix:
+        python-version: ['3.8', '3.9', '3.10',]
         os: [ubuntu-latest, windows-latest, macos-latest]
+        experimental: [false,]
 
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
-        python-version: "3.10"
+        python-version: ${{ matrix.python-version }}
 
     - name: Install dependencies
       run: |

mokapot/model.py

@@ -23,6 +23,7 @@
 from sklearn.base import clone
 from sklearn.svm import LinearSVC
 from sklearn.model_selection import GridSearchCV
+from sklearn.model_selection._search import BaseSearchCV
 from sklearn.preprocessing import StandardScaler
 from sklearn.exceptions import NotFittedError
 
@@ -154,7 +155,7 @@ def __init__(
         self.fold = None
 
         # Sort out whether we need to optimize hyperparameters:
-        if hasattr(self.estimator, "estimator"):
+        if isinstance(self.estimator, BaseSearchCV):
             self._needs_cv = True
         else:
             self._needs_cv = False

mokapot/plugins/__init__.py

@@ -5,10 +5,9 @@
 
 import pandas as pd
 
-try:
-    from importlib.metadata import entry_points
-except ImportError:
-    from importlib_metadata import entry_points
+# Once the min supported version reaches 3.10, the standard library should
+# be used like so -> from importlib.metadata import entry_points
+from importlib_metadata import entry_points
 
 from argparse import _ArgumentGroup
 from typing import Any

pyproject.toml

@@ -23,6 +23,7 @@ dependencies = [
     "lxml>=4.6.2",
     "triqler>=0.6.2",
     "joblib>=1.1.0",
+    "importlib-metadata>=5.1.0",
 ]
 dynamic = ["version"]