Fix for unicode in test Any file headers (#140)

* Attempt at handling unicode test in headers and unicode filenames in written anymcr files.

* fix: ensure UTF-8 encoding when opening files for AMMR version retrieval

* chore: update version to 1.20.5 and update changelog for pytest plugin fix

* black formatting

---------

Co-authored-by: Morten Enemark Lund <melund@gmail.com>

Author: JDThomsen

CHANGELOG.md

@@ -1,5 +1,10 @@
 # AnyPyTools Change Log
 
+## v1.20.5
+
+* Fix issue with pytest plugin assuming `.any` files to be encode with default 
+  system encoding instead of UTF8.
+
 ## v1.20.4
 
 * Fix crash with pytest plugin when saving output to h5 files.

anypytools/__init__.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 """AnyPyTools library."""
+
 import logging
 import os
 import platform
@@ -36,7 +37,7 @@
     "NORMAL_PRIORITY_CLASS",
 ]
 
-__version__ = "1.20.4"
+__version__ = "1.20.5"
 
 
 def print_versions():
@@ -49,7 +50,7 @@ def print_versions():
     print(f"NumPy version: {np.__version__}")
     print(f"SciPy version: {sp.__version__}")
     print(f"Python version: {sys.version}")
-    (sysname, _, release, version, machine, processor) = platform.uname()
+    sysname, _, release, version, machine, processor = platform.uname()
     print(f"Platform: {sysname}-{release}-{machine} ({version})")
     if not processor:
         processor = "not recognized"

anypytools/datautils.py

@@ -4,6 +4,7 @@
 
 @author: mel
 """
+
 import os
 import re
 import logging
@@ -184,7 +185,7 @@ def _parse_anyoutputfile_constants(strvar):
     value = None
     varname = None
     if strvar.count("=") == 1 and strvar.startswith("Main"):
-        (first, last) = strvar.split("=")
+        first, last = strvar.split("=")
         varname = first.strip()
         last = last.strip()
         value = None

anypytools/h5py_wrapper.py

@@ -4,6 +4,7 @@
 
 @author: mel
 """
+
 import logging
 
 import h5py

anypytools/macroutils.py

@@ -292,10 +292,8 @@ def __init__(self, var, frozen_distribution, default_lower_tail_probability=0.5)
 
         self.var = var
         if not isinstance(frozen_distribution, rv_frozen):
-            raise TypeError(
-                "frozen_distribution must be frozen distribtuion from \
-                            scipy.stats.distributions"
-            )
+            raise TypeError("frozen_distribution must be frozen distribtuion from \
+                            scipy.stats.distributions")
 
         self.rv = frozen_distribution
 

anypytools/pytest_plugin.py

@@ -5,6 +5,7 @@
 
 @author: Morten
 """
+
 import os
 import re
 import ast
@@ -108,7 +109,7 @@ def _read_header(fpath):
     The function remvoes any leading '//' comments.
     """
     code = ""
-    with open(fpath) as f:
+    with open(fpath, encoding="utf8") as f:
         for line in f.readlines():
             if line.startswith("//"):
                 line = line.strip("//")
@@ -200,7 +201,7 @@ def _parse_header(header, test_file):
 
 def _write_macro_file(path, name, macro):
     filename = os.path.join(path, name + ".anymcr")
-    with open(filename, "w") as f:
+    with open(filename, "w", encoding="utf8") as f:
         f.writelines([str(mcr) + "\n" for mcr in macro])
     return filename
 

anypytools/tools.py

@@ -205,7 +205,7 @@ def _anybodycon_version(anybodyconpath):
 
 
 def _ammr_any_version(fpath):
-    with open(fpath) as f:
+    with open(fpath, encoding="utf8") as f:
         out = f.read()
     match = AMMR_VERSION_RE.search(out)
     if match:
@@ -1168,7 +1168,7 @@ def get_bm_constants(ammr_path=None, ammr_version=2):
             ammr_path, "Body/AAUHuman/Documentation/bm_constants.py"
         )
         with suppress(IOError):
-            with open(filename) as fh:
+            with open(filename, encoding="utf8") as fh:
                 bm_constants = literal_eval(fh.read())
     if not isinstance(bm_constants, dict):
         bm_constants = _BM_CONSTANTS if ammr_version >= 2 else _BM_CONSTANTS_AMMR1

pixi.lock

@@ -20,7 +20,7 @@ anypytools = {path= "."}
 
 [package]
 name = "anypytools"
-version="1.20.4"
+version="1.20.5"
 
 [package.build] 
 backend = { name = "pixi-build-python", version = "*" }