Merge pull request #9 from SomaLogic/master

Release of 0.4.1: Bugfix to ADAT writing in Windows environment
SomaLogic · Jan 12, 2023 · 3894833 · 3894833
2 parents 7e94bc1 + 00b95f1
commit 3894833
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/canopy/__init__.py b/canopy/__init__.py
@@ -1,3 +1,4 @@
 from canopy.adat import Adat
 from canopy.io.adat.file import read_file, read_adat
 from canopy.tools.adat_concatenation import concatenate_adats, smart_adat_concatenation
+from canopy.annotations import Annotations
diff --git a/canopy/adat.py b/canopy/adat.py
@@ -105,7 +105,7 @@ def to_adat(self, path_or_buf: Union[str, TextIO], round_rfu: bool = True, conve
         """
 
         if type(path_or_buf) == str:
-            with open(path_or_buf, 'w') as f:
+            with open(path_or_buf, 'w', newline='', encoding='utf-8') as f:
                 io.adat.file.write_adat(self, f, round_rfu, convert_to_v3_seq_ids)
         else:
             io.adat.file.write_adat(self, path_or_buf, round_rfu, convert_to_v3_seq_ids)
diff --git a/canopy/errors.py b/canopy/errors.py
@@ -9,3 +9,5 @@ class AdatKeyError(Exception):
 class AdatMetaError(Exception):
     pass
 
+class AnnotationsLiftingError(Exception):
+    pass
diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 setup(
     name='canopy',
     python_requires='>3.8.0',
-    version='0.4',
+    version='0.4.1',
     packages=find_packages(),
     url='http://confluence.sladmin.com/display/INGEN/Canopy',
     license='',
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,3 +9,5 @@ class AdatKeyError(Exception): @@
     class AdatMetaError(Exception):
         pass
+    class AnnotationsLiftingError(Exception):
+        pass