Merge pull request #773 from wearepal/no-implicit-reexport

Disallow implicit reexport with mypy

Author: tmke8

ethicml/data/tabular_data/acs.py

@@ -19,8 +19,9 @@
 from ethicml.utility.data_helpers import undo_one_hot
 from ethicml.utility.data_structures import DataTuple
 
-from ..dataset import Dataset, DiscFeatureGroup, FeatureOrder, FeatureSplit
+from ..dataset import Dataset, FeatureOrder, FeatureSplit
 from ..util import (
+    DiscFeatureGroup,
     LabelSpec,
     filter_features_by_prefixes,
     flatten_dict,

ethicml/implementations/vfae_modules/__init__.py

@@ -1,4 +1,4 @@
 """Modules used within the VFAE implementation."""
 
 from .utils import *
-from .vfae_network import VFAENetwork
+from .vfae_network import VFAENetwork as VFAENetwork

ethicml/models/inprocess/adv_debiasing.py

@@ -8,9 +8,8 @@
 
 from ranzen import implements
 
-from ethicml.models.inprocess.in_algorithm import HyperParamType
 from ethicml.models.inprocess.in_subprocess import InAlgorithmSubprocess
-from ethicml.utility.data_structures import ModelType
+from ethicml.utility.data_structures import HyperParamType, ModelType
 
 __all__ = ["AdvDebiasing", "AdvDebArgs"]
 

ethicml/models/inprocess/fair_dummies.py

@@ -8,9 +8,8 @@
 
 from ranzen import implements
 
-from ethicml.models.inprocess.in_algorithm import HyperParamType
 from ethicml.models.inprocess.in_subprocess import InAlgorithmSubprocess
-from ethicml.utility.data_structures import ModelType
+from ethicml.utility.data_structures import HyperParamType, ModelType
 
 __all__ = ["FairDummies", "FairDummiesArgs"]
 

ethicml/models/inprocess/installed_model.py

@@ -13,7 +13,7 @@
 import subprocess
 import sys
 
-import git
+import git.cmd
 from ranzen.decorators import implements
 
 from ethicml.models.inprocess.in_algorithm import InAlgorithm
@@ -86,7 +86,7 @@ def _clone_directory(self, url: str) -> None:
         """
         if not self._store_dir.exists():
             self._store_dir.mkdir()
-            git.Git(self._store_dir).clone(url)
+            git.cmd.Git(self._store_dir).clone(url)
 
     def _create_venv(self, use_poetry: bool) -> None:
         """Create a venv based on the Pipfile in the repository.

ethicml/models/inprocess/kamiran.py

@@ -9,10 +9,18 @@
 import sklearn
 from sklearn.linear_model import LogisticRegression
 
-from ethicml.models.inprocess.in_algorithm import HyperParamType, InAlgorithm
+from ethicml.models.inprocess.in_algorithm import InAlgorithm
 from ethicml.models.inprocess.shared import settings_for_svm_lr
-from ethicml.models.inprocess.svm import KernelType, select_svm
-from ethicml.utility import ClassifierType, DataTuple, Prediction, SoftPrediction, TestTuple
+from ethicml.models.inprocess.svm import select_svm
+from ethicml.utility import (
+    ClassifierType,
+    DataTuple,
+    HyperParamType,
+    KernelType,
+    Prediction,
+    SoftPrediction,
+    TestTuple,
+)
 
 __all__ = ["Reweighting", "compute_instance_weights"]
 

ethicml/models/inprocess/kamishima.py

@@ -8,9 +8,9 @@
 import pandas as pd
 from ranzen import implements
 
-from ethicml.models.inprocess.in_algorithm import HyperParamType, InAlgorithm
+from ethicml.models.inprocess.in_algorithm import InAlgorithm
 from ethicml.models.inprocess.installed_model import InstalledModel
-from ethicml.utility import DataTuple, Prediction, TestTuple
+from ethicml.utility import DataTuple, HyperParamType, Prediction, TestTuple
 
 __all__ = ["Kamishima"]
 

ethicml/models/inprocess/zafar.py

@@ -10,9 +10,9 @@
 from ranzen import implements
 
 from ethicml.preprocessing.adjust_labels import LabelBinarizer
-from ethicml.utility import DataTuple, Prediction, TestTuple
+from ethicml.utility import DataTuple, HyperParamType, Prediction, TestTuple
 
-from .in_algorithm import HyperParamType, InAlgorithm
+from .in_algorithm import InAlgorithm
 from .installed_model import InstalledModel
 
 __all__ = ["ZafarAccuracy", "ZafarBaseline", "ZafarEqOdds", "ZafarEqOpp", "ZafarFairness"]

pyproject.toml

@@ -133,6 +133,7 @@ disallow_incomplete_defs = true
 show_error_codes = true
 warn_unused_ignores = true
 mypy_path = "typings"
+implicit_reexport = false
 
 # ===== the following modules in EthicML aren't ready to be type checked so strictly =====
 [[tool.mypy.overrides]]

tests/models_test/inprocess_test/models_inprocessing_test.py

@@ -10,6 +10,7 @@
     ClassifierType,
     DataTuple,
     FairnessType,
+    HyperParamType,
     KernelType,
     ModelType,
     Prediction,
@@ -39,7 +40,6 @@
     Reweighting,
     SVM,
 )
-from ethicml.models.inprocess.in_algorithm import HyperParamType
 from ethicml.run import CrossValidator, evaluate_models
 
 TMPDIR: Final = Path("/tmp")