fix setup modules +++ imports

NoahHenrikKleinschmidt · Feb 13, 2023 · 9a89f72 · 9a89f72
1 parent ee261f0
commit 9a89f72
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/qpcr/Plotters/FilterSummary.py b/qpcr/Plotters/FilterSummary.py
@@ -100,17 +100,17 @@ class FilterSummary(base.AssayPlotter):
     def __init__(self, mode=None):
         self._setup_default_params(static=defaults.static_FilterSummary, interactive=defaults.interactive_FilterSummary)
         super().__init__(mode=mode)
-        self._before = Results.Results()
-        self._after = Results.Results()
+        self._before = Results()
+        self._after = Results()
 
     def clear(self):
         """
         Clears the pre- and post-filtering Ct value records.
         """
-        self._before = Results.Results()
-        self._after = Results.Results()
+        self._before = Results()
+        self._after = Results()
 
-    def add_before(self, assay: Assay.Assay):
+    def add_before(self, assay: Assay):
         """
         Add a pre-filtered set of Ct values
         from an `qpcr.Assay` object.
@@ -129,7 +129,7 @@ def add_before(self, assay: Assay.Assay):
 
         self._before.add_Ct(assay)
 
-    def add_after(self, assay: Assay.Assay):
+    def add_after(self, assay: Assay):
         """
         Add a post-filtered set of Ct values
         from an `qpcr.Assay` object.

diff --git a/qpcr/main/Results.py b/qpcr/main/Results.py
@@ -107,7 +107,7 @@ def get(self):
         """
         return self._df
 
-    def add_Ct(self, assay: Assay.Assay):
+    def add_Ct(self, assay: Assay):
         """
         Adds a `"Ct"` column with Delta-Ct values from an ``qpcr.Assay``.
         It will store these as a new column using the Assay's ``id`` as header.
@@ -126,7 +126,7 @@ def add_Ct(self, assay: Assay.Assay):
 
         self.add(assay.Ct)
 
-    def add_dCt(self, assay: Assay.Assay):
+    def add_dCt(self, assay: Assay):
         """
         Adds a `"dCt"` column with Delta-Ct values from an ``qpcr.Assay``.
         It will store these as a new column using the Assay's ``id`` as header.
@@ -145,7 +145,7 @@ def add_dCt(self, assay: Assay.Assay):
 
         self.add(assay.dCt)
 
-    def add_ddCt(self, assay: Assay.Assay):
+    def add_ddCt(self, assay: Assay):
         """
         Adds all `"rel_{}"` columns with Delta-Delta-Ct values from an ``qpcr.Assay``.
         It will store these as new columns using the Assay's ``id`` + the ``_rel_{}`` composite id.
@@ -315,7 +315,7 @@ def drop_cols(self, *cols):
         for c in cols:
             del self[c]
 
-    def setup_cols(self, obj: (Assay.Assay or pd.DataFrame)):
+    def setup_cols(self, obj: (Assay or pd.DataFrame)):
         """
         Adopts the setup columns: ``id, group, group_name`` from another object.
 

diff --git a/setup.py b/setup.py
@@ -20,8 +20,11 @@
         "qpcr.Readers",
         "qpcr.Parsers",
         "qpcr.Filters",
+        "qpcr.Curves",
+        "qpcr.Pipes",
         "qpcr.defaults",
         "qpcr._auxiliary",
+        "qpcr._auxiliary.warnings",
     ],
     install_requires=[
         "numpy",