diff --git a/ChangeLog b/ChangeLog index 376bb643..88133581 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ -2025-01-10 Jan Kotanski +2025-01-13 Jan Kotanski * add support for utf8 in xmla attribute/field values (#174) - * drop support for python2 - * tagged as 4.0.0 + * add support for utf8 in py2 (#176) + * tagged as 3.13.0 2024-09-27 Jan Kotanski * remove NXcollection attribute for nexus_logs (#168) diff --git a/man/nxswriter.1 b/man/nxswriter.1 index ec34a0d4..0e2e2974 100644 --- a/man/nxswriter.1 +++ b/man/nxswriter.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "NXSWRITER" "1" "Jan 10, 2025" "4.0" "NXSDataWriter" +.TH "NXSWRITER" "1" "Jan 13, 2025" "3.13" "NXSDataWriter" .SH NAME nxswriter \- nxswriter Documentation .sp diff --git a/nxswriter/Release.py b/nxswriter/Release.py index 4c4a25f3..0d96fe35 100644 --- a/nxswriter/Release.py +++ b/nxswriter/Release.py @@ -21,4 +21,4 @@ #: package version -__version__ = "4.0.0" +__version__ = "3.13.0" diff --git a/setup.py b/setup.py index 3ef39b69..e9a97dad 100644 --- a/setup.py +++ b/setup.py @@ -110,6 +110,7 @@ def run(self): 'Topic :: Scientific/Engineering :: Physics', 'Topic :: Software Development :: Libraries :: Python Modules', 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)', + 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', diff --git a/test/TangoDataWriterH5Cpp_test.py b/test/TangoDataWriterH5Cpp_test.py index 7dbf558e..e16da4f2 100644 --- a/test/TangoDataWriterH5Cpp_test.py +++ b/test/TangoDataWriterH5Cpp_test.py @@ -50,11 +50,11 @@ class TangoDataWriterH5CppTest(unittest.TestCase): def __init__(self, methodName): unittest.TestCase.__init__(self, methodName) - self._scanXmlpart = """ + self._scanXmlpart = u""" scan instrument - + @@ -1683,7 +1683,10 @@ def test_scanRecord_nexuspath(self): self.assertEqual(at.shape, ()) self.assertEqual(at.dtype, "string") self.assertEqual(at.name, "units") - self.assertEqual(at[...], u"µm") + if sys.version_info > (3, ): + self.assertEqual(at[...], u"\u03bcm") + else: + self.assertEqual(at[...], b"\xce\xbcm") at = cnt.attributes["nexdatas_source"] self.assertTrue(at.is_valid) diff --git a/test/TangoDataWriterH5PY_test.py b/test/TangoDataWriterH5PY_test.py index 0bb936ec..a20f680f 100644 --- a/test/TangoDataWriterH5PY_test.py +++ b/test/TangoDataWriterH5PY_test.py @@ -54,7 +54,7 @@ def __init__(self, methodName): scan instrument - + @@ -1681,7 +1681,10 @@ def test_scanRecord_nexuspath(self): self.assertEqual(at.shape, ()) self.assertEqual(at.dtype, "string") self.assertEqual(at.name, "units") - self.assertEqual(at[...], u"µm") + if sys.version_info > (3, ): + self.assertEqual(at[...], u"\u03bcm") + else: + self.assertEqual(at[...], b"\xce\xbcm") at = cnt.attributes["nexdatas_source"] self.assertTrue(at.is_valid)