Merge branch 'dev-0.5.0' of github.com:SomaLogic/Canopy-internal into…

… dev-0.5.0
SomaLogic · Mar 7, 2024 · 2831b98 · 2831b98
2 parents ba8d0d6 + 23470d2
commit 2831b98
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 307 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
+# Poetry
+poetry.lock
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -12,9 +12,15 @@ include = [
 
 [tool.poetry.dependencies]
 python = "^3.8"
-pandas = ">=1.5.0,<3.0.0"
-numpy = {version = "^1.26.1", python="^3.9,<3.13"}
-openpyxl = ">=3.0"
+pandas = [
+    {version = "<=2.0.3", python = ">=3.8, <3.12"},
+    {version = "^2.2", python = ">=3.12"}
+]
+numpy = [
+    {version = ">=1.19,<1.21", python = ">=3.8,<3.9"},
+    {version = "^1.21", python = ">=3.9"}
+]
+openpyxl = "^3.0"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^8.0.1"

diff --git a/tests/tools/test_adat_concatenation.py b/tests/tools/test_adat_concatenation.py
@@ -317,10 +317,11 @@ def test_smart_adat_warnings(self):
         expected_warnings_regex = (
             r'(Adding column to adat: \w+)|(Removing seqIds from \w{3}: \w, \w)'
         )
-        for rec in records:
+        user_warnings = [rec for rec in records if rec.category == UserWarning]
+        for rec in user_warnings:
             self.assertRegex(rec.message.args[0], expected_warnings_regex)
             print(rec.message.args[0])
-        self.assertEqual(7, len(records))
+        self.assertEqual(7, len(user_warnings))
 
     @pytest.mark.filterwarnings('ignore:Removing seqIds from')
     @pytest.mark.filterwarnings('ignore:Standard column,')