pninexus 3.2.2__cp37-cp37m-manylinux_2_27_x86_64.whl → 3.3.0__cp37-cp37m-manylinux_2_27_x86_64.whl

pninexus/h5cpp/attribute/__init__.py

@@ -1,5 +1,6 @@
 from __future__ import print_function
 import numpy
+import sys
 
 from pninexus.h5cpp import property
 from pninexus.h5cpp._attribute import AttributeManager
@@ -8,6 +9,10 @@ from pninexus.h5cpp._attribute import Attribute
 __all__ = ["property", "AttributeManager", "Attribute"]
 
 
+if sys.version_info > (3,):
+    unicode = str
+
+
 def attribute__getitem__(self, index):
 
     data = self.read()
@@ -20,15 +25,28 @@ def attribute_write(self, data):
     write_data = data
     if not isinstance(write_data, numpy.ndarray):
         write_data = numpy.array(write_data)
-
     if write_data.dtype.kind == 'U':
-        write_data = write_data.astype("S")
+        try:
+            write_data = write_data.astype("S")
+        except Exception:
+            if isinstance(data, numpy.ndarray) and data.shape:
+                shape = data.shape
+                if len(shape) > 1:
+                    data = data.flatten()
+                write_data = numpy.array(
+                    [bytes(unicode(dt).encode('utf-8')) for dt in data])
+                if len(shape) > 1:
+                    write_data = write_data.reshape(shape)
+            else:
+                write_data = numpy.array(unicode(data).encode('utf-8'))
     elif write_data.dtype == 'bool':
         write_data = write_data.astype("int8")
 
+    #  print("DATA", data, write_data)
     try:
         self._write(write_data)
-    except RuntimeError:
+    except RuntimeError as e:
+        print(str(e))
         print(write_data, write_data.dtype)
 
 

pninexus/h5cpp/node/__init__.py

@@ -5,6 +5,7 @@ from pninexus.h5cpp import dataspace
 from pninexus.h5cpp import datatype
 from pninexus.h5cpp.filter import ExternalFilters
 import numpy
+import sys
 # from collections import OrderedDict
 
 #
@@ -45,6 +46,10 @@ except Exception:
     VDSAvailable = False
 
 
+if sys.version_info > (3,):
+    unicode = str
+
+
 def copy(node, base, path=None, link_creation_list=property.LinkCreationList(),
          object_copy_list=property.ObjectCopyList()):
     """Copy an object within the HDF5 tree
@@ -275,8 +280,19 @@ def dataset_write(self, data, selection=None):
     # if the data is a unicode numpy array we have to convert it to a
     # simple string array
     if data.dtype.kind == 'U':
-        data = data.astype('S')
-
+        try:
+            data = data.astype('S')
+        except Exception:
+            if isinstance(data, numpy.ndarray) and data.shape:
+                shape = data.shape
+                if len(shape) > 1:
+                    data = data.flatten()
+                data = numpy.array(
+                    [bytes(unicode(dt).encode('utf-8')) for dt in data])
+                if len(shape) > 1:
+                    data = data.reshape(shape)
+            else:
+                data = numpy.array(unicode(data).encode('utf-8'))
     #
     # determine memory datatype and dataspace
     # - if the file type is a variable length string we have to adjust the
@@ -286,7 +302,7 @@ def dataset_write(self, data, selection=None):
 
     if isinstance(self.datatype, datatype.String):
         if self.datatype.is_variable_length:
-            memory_type = datatype.String.variable()
+            memory_type = self.datatype
 
     # if the data is bool numpy array we have to convert it to a
     # int array

{pninexus-3.2.2.dist-info → pninexus-3.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pninexus
-Version: 3.2.2
+Version: 3.3.0
 Summary: Python wrapper for the H5CPP and PNI libraries
 Home-page: https://github.com/pni-libraries/python-pninexus
 Author: Eugen Wintersberger
@@ -21,6 +21,7 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: numpy
 
 Python bindings for PNI/NeXus and h5cpp
@@ -103,8 +104,8 @@ For Python3 just replace python with python3 in the above instructions.
 Debian and Ubuntu packages
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Debian ``bookworm``, ``bullseye``, ``buster`` or Ubuntu ``lunar``,
-``jammy``, ``focal`` packages can be found in the HDRI repository.
+Debian ``bookworm``, ``bullseye``, ``buster`` or Ubuntu ``oracular``,
+``noble``, ``jammy`` packages can be found in the HDRI repository.
 
 To install the debian packages, add the PGP repository key
 
@@ -114,19 +115,19 @@ To install the debian packages, add the PGP repository key
        $ curl -s http://repos.pni-hdri.de/debian_repo.pub.gpg  | gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/debian-hdri-repo.gpg --import
        $ chmod 644 /etc/apt/trusted.gpg.d/debian-hdri-repo.gpg
 
-and then download the corresponding source list, e.g. for ``bullseye``
+and then download the corresponding source list, e.g. for ``bookworm``
 
 ::
 
        $ cd /etc/apt/sources.list.d
-       $ wget http://repos.pni-hdri.de/bullseye-pni-hdri.list
+       $ wget http://repos.pni-hdri.de/bookworm-pni-hdri.list
 
-or ``jammy``
+or ``noble``
 
 ::
 
        $ cd /etc/apt/sources.list.d
-       $ wget http://repos.pni-hdri.de/jammy-pni-hdri.list
+       $ wget http://repos.pni-hdri.de/noble-pni-hdri.list
 
 respectively.
 
@@ -135,16 +136,16 @@ Finally,
 ::
 
        $ apt-get update
-       $ apt-get install python-pninexus
+       $ apt-get install python3-pninexus
 
 or
 
 ::
 
        $ apt-get update
-       $ apt-get install python3-pninexus
+       $ apt-get install python-pninexus
 
-for python3.
+for python2.
 
 
 Manylinux wheels from PyPI

{pninexus-3.2.2.dist-info → pninexus-3.3.0.dist-info}/RECORD

@@ -3,12 +3,12 @@ pninexus.libs/libboost_regex-d540ceeb.so.1.67.0,sha256=taV5XTpPfMEjoB676RkDw-ojm
 pninexus.libs/libaec-1bb4980e.so.0.0.8,sha256=BbkOlAFSTzWpavqSUk6bR6ccxgmcuwSNvsX8QRsEeOs,33241
 pninexus.libs/libsnappy-d31ed3fe.so.1.1.7,sha256=0Ok9Dt97FoPUAlmXzX_SX-DFfcuKGYWK3tq1j06VwWc,36849
 pninexus.libs/libjpeg-4f3446bc.so.62.2.0,sha256=W8jUBNrmskizke39gd6OeloECIFMk8cB-YxRVG-lz-I,437929
+pninexus.libs/libpninexus-99d2e4bc.so.3.3.0,sha256=2eZ1yIs2hPbvaG7_gTWAZIEP-YAFn5yqTCCPMzZEEYM,2379745
 pninexus.libs/libbz2-e0ca5bfb.so.1.0.4,sha256=vubLsBlLM6GtTYc9SD3B3IignuU3MJG_km-SSvybLww,79033
 pninexus.libs/libhdf5_serial-063eb5b0.so.103.0.0,sha256=Fv0D2R13fsMu8Sr3R32WDjXvmrhgPobbgovDZkeTv4E,3823857
-pninexus.libs/libpninexus-33fe0cfe.so.3.2.0,sha256=GmRWMtfCn9-XGeF5w8Rd9FkfbaHDsmhUonKNPprWhhs,2370449
-pninexus.libs/libh5cpp-9e3bb076.so.0.6.0,sha256=GOGwBBxCaEWCBiKjpxBozd34U8kvLkX-KnTrm4Cfxok,805265
 pninexus.libs/libhdf5_serial_hl-588b5460.so.100.1.1,sha256=G8kkpVrpDNYFMldXqeredHKfaQyT5ykS8vcx6HlnY00,166193
 pninexus.libs/liblz4-244066c2.so.1.8.3,sha256=C2imoT99UD7X4fdzBDGO6zps7xGZ6iqdaSImmpsQ-dI,126001
+pninexus.libs/libh5cpp-df4379fb.so.0.7.1,sha256=ekLpJHqB4n68DqKr2s0ou37mWE6sv9BvovxqNja2qZI,805265
 pninexus.libs/libboost_date_time-aab2211d.so.1.67.0,sha256=6FVkgMzkskS5aA2MJEXK3m5slyzV9bfimlzMcrOmiC0,97265
 pninexus.libs/libsz-21529705.so.2.0.1,sha256=yB7l2fkLqErDnyDajmQ4LZbQ_g5vNizXnLlz19xoIHQ,16769
 pninexus.libs/libblosc-82b628ea.so.1.15.1,sha256=yLjVA_AbRdDKMHpzCR2Tr2cUhPoNr4Fvl9cHQOT4Y0w,67017
@@ -16,36 +16,36 @@ pninexus.libs/libicudata-11c54049.so.63.1,sha256=QY3cPDdyM4eAmnqbXWapprHAXmJU_s0
 pninexus.libs/libicui18n-e809f84d.so.63.1,sha256=vHj04BC36O24MtUiMB1HooPbXdHXQYU6e6_LDtvAjQQ,3966993
 pninexus.libs/libzstd-6f101564.so.1.3.8,sha256=aL3X6TggG2yWdkP4qqp5k06DKBP6nO0OwU4hV5sBlTY,654065
 pninexus.libs/libboost_python37-fe57a016.so.1.67.0,sha256=gvUSnT6E87GTjz_477Rlo3UDv7hQOr8omTWxFO2uitA,327017
-pninexus-3.2.2.dist-info/METADATA,sha256=lAvKjjl5Zp_BrlhZzCM65AebT6GuZXagEtUJXAHU1OQ,4813
-pninexus-3.2.2.dist-info/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-pninexus-3.2.2.dist-info/WHEEL,sha256=9bnnqBPBvVgvkiUMrd1tEYQXnseyGW4W6pBAcfI6DBA,113
-pninexus-3.2.2.dist-info/RECORD,,
-pninexus-3.2.2.dist-info/top_level.txt,sha256=02ZiLP_54gh4H6BS7DYE4eWvJRPhsCiFNUNgznIbPV8,9
 pninexus/__init__.py,sha256=VGnNxm2gixVy1tn3CamhzVPmQwVHd_nG4B3uJ_cOaMo,126
 pninexus/filters/libh5blosc.so,sha256=tU5sl6hLHAXingnc2DhNCMxRrygcL_kCG0gFWLn_puw,21889
-pninexus/filters/libh5lz4.so,sha256=hpyvukZXvpdeahFWLV9qS4FNSczE-dmiVupFrokvZtU,147129
+pninexus/filters/libh5lz4.so,sha256=NgReOcilHD1Anvd8JBzma7VLiwdhLLvHC3-lOuuklzo,21809
 pninexus/filters/libh5mafisc.so,sha256=WxsM75ivdpKNeG6XqVYYRsRnXQ0Y5JP7lc-G-vbD_kc,244761
 pninexus/filters/libh5zfp.so,sha256=HWmyn_cHPKM1DAKjDq21mlZqgw7zgJnstMpfmFAbI2E,186449
 pninexus/filters/libh5lzf.so,sha256=pccH4EQGdD0nPV36f7wWYjZXyWmMtswr-zKaAliNssY,25649
 pninexus/filters/libh5jpeg.so,sha256=0uo1GZArPrDIkZdOm6S2-nl2jwhbsy2W5YEGQ7WZUAY,22033
-pninexus/filters/libh5bz2.so,sha256=h_tQcYIfKA1e0S-m-3cVa1qSuCh6f0k0faBeunWMP6A,21665
+pninexus/filters/libh5bz2.so,sha256=CafeuVryK-0q46MfAwcXcVk4H34eLc6DPoPhPd_Ex6I,21393
 pninexus/filters/__init__.py,sha256=a_UTMrhbkD1DpGnLkzON92UVCfQWNQTSvJ09Rtqzzqw,175
 pninexus/filters/libh5bshuf.so,sha256=Dxdi9hybyxjStQt3xD93_FiO_dzvnbEL2e9SfJB6E98,165105
-pninexus/nexus/_nexus.cpython-37m-x86_64-linux-gnu.so,sha256=qakVtHES1WS-8MlRSeLIuGcT7jwK9wo3xY7qyaVdwgc,8331713
+pninexus/nexus/_nexus.cpython-37m-x86_64-linux-gnu.so,sha256=88XCrr_Q4rQa5cnkfR0-5u1xtYGaTEy7k73Dh1h-bMc,8327593
 pninexus/nexus/__init__.py,sha256=M7YMP1avSRLSZXeSqO5fWoBmf_oScF2pVshFqo2zKNk,6035
-pninexus/h5cpp/_filter.cpython-37m-x86_64-linux-gnu.so,sha256=mg_Zzwy2bUuMcXsi8l89Tg2QV6sWjcTzSdHCkuneRaA,3119441
-pninexus/h5cpp/_datatype.cpython-37m-x86_64-linux-gnu.so,sha256=PjzP3srBjfURzcn9oPBnuBiUZZEIRL03IUybJNQgQaE,4197505
-pninexus/h5cpp/_file.cpython-37m-x86_64-linux-gnu.so,sha256=jEQtQLkhKJmVsuM5_GFxwOosvbx-tDKFmnbqlHmUyfM,3411225
-pninexus/h5cpp/_node.cpython-37m-x86_64-linux-gnu.so,sha256=al5G-Gl0Z7yyhQikqoNkZWTw5UxyVFYY3vnzTGPpyms,9656089
-pninexus/h5cpp/_attribute.cpython-37m-x86_64-linux-gnu.so,sha256=qlnSqpyOFy7bjbORsdDqZaY4cJNRK_VUgxtbOd0QGO0,4174657
+pninexus/h5cpp/_filter.cpython-37m-x86_64-linux-gnu.so,sha256=H_BCJIdMbaPdYnhXJCGCZyFoXUUVp1KnOtJV8GJcr5A,3119441
+pninexus/h5cpp/_datatype.cpython-37m-x86_64-linux-gnu.so,sha256=P5Im7ioQElSXMgW1AwJGk1VxV506HHCbunzJxtkEEx4,4197505
+pninexus/h5cpp/_file.cpython-37m-x86_64-linux-gnu.so,sha256=rA7FY2-AX2SKz79HgLn0t7A-mU91nH2hdpMupCy3YK0,3411225
+pninexus/h5cpp/_node.cpython-37m-x86_64-linux-gnu.so,sha256=-KhjbQoWTmOjxTIElDmgE26xyerCX1ka2FdmEiiXKRQ,9656089
+pninexus/h5cpp/_attribute.cpython-37m-x86_64-linux-gnu.so,sha256=JH0mPEJO8keyWRAMnG2J8cLw38q7yj00XNNtuGceQfs,4174617
 pninexus/h5cpp/__init__.py,sha256=kL1E5me6zbHAMazYDHGdBaGznqnaYlMrizgHhQnl298,1010
-pninexus/h5cpp/_property.cpython-37m-x86_64-linux-gnu.so,sha256=aX7xgyKO0DkE4JuoCeYO_RSvttLLfDVPuugvhyyYYf4,9364865
-pninexus/h5cpp/_dataspace.cpython-37m-x86_64-linux-gnu.so,sha256=Dm4NeeW7pzqzb0GFtwHN05jhJlsNJiRzyr1oW1YiWcE,4218609
-pninexus/h5cpp/_h5cpp.cpython-37m-x86_64-linux-gnu.so,sha256=W087LjEntUwRYwOiN_OZOimjyxFG-T-v2SbDevPcS-E,3185585
+pninexus/h5cpp/_property.cpython-37m-x86_64-linux-gnu.so,sha256=rNLQ47p21H1VTdj_tGY5oV8P2SPQU8K9dJDes8YTAc4,9364865
+pninexus/h5cpp/_dataspace.cpython-37m-x86_64-linux-gnu.so,sha256=Kz4Blh-qUM0qCVhsjjvfqZ04q3npVjbiLx6D36_2gYU,4218609
+pninexus/h5cpp/_h5cpp.cpython-37m-x86_64-linux-gnu.so,sha256=lM7LfzU7ZT_z24m3i2XMxnjCJf4C7JtbCwtQK9isXT4,3185585
 pninexus/h5cpp/datatype/__init__.py,sha256=1Uasm4jp871gORJwQ2sjvvt_EJ_zTmE58DRYlKIUl2g,5471
 pninexus/h5cpp/dataspace/__init__.py,sha256=fFYOpmSvE1jqOE2cNL8X7npPmtIykDYOMgJc3jm8VpE,756
-pninexus/h5cpp/attribute/__init__.py,sha256=KO8BTlp_wJHpDntHjY-jgkF0WJZA9Fp1uG__OOnJP3Q,1088
-pninexus/h5cpp/node/__init__.py,sha256=1-CY3AowIkqRHDQGjRBX29EXSx5HYWgIzNxXEWW4Aoc,14649
+pninexus/h5cpp/attribute/__init__.py,sha256=FFzFpA-nMwUOcOJFXrVz2i7NWmG192r1N9UVoeudkdc,1729
+pninexus/h5cpp/node/__init__.py,sha256=zy90mD2GVcbsc4hsbOjApVPOJFkWs0Ef32UjHNwRboo,15187
 pninexus/h5cpp/file/__init__.py,sha256=BjZcRliMYQZb-VYc6k-OWm29XXanMsZjzR1iMbQIVds,478
 pninexus/h5cpp/filter/__init__.py,sha256=oHiUNyLk5tCMcieoxXxCLoMd788wx8Flzu407poVVnI,1500
 pninexus/h5cpp/property/__init__.py,sha256=h84toTAZvm9ac6_bX7IsXLN4ZymPHIweCmUcweL14wM,2729
+pninexus-3.3.0.dist-info/METADATA,sha256=FiFOmRRz4TmC6K2EsOpiaSnFR_xmUdzZKRYKe9C8zto,4867
+pninexus-3.3.0.dist-info/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+pninexus-3.3.0.dist-info/WHEEL,sha256=7vW0paDGAbm5dFQ7RIprhucqW2-9R8WwAT-EuvNOHWM,113
+pninexus-3.3.0.dist-info/RECORD,,
+pninexus-3.3.0.dist-info/top_level.txt,sha256=02ZiLP_54gh4H6BS7DYE4eWvJRPhsCiFNUNgznIbPV8,9

{pninexus-3.2.2.dist-info → pninexus-3.3.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.2)
+Generator: bdist_wheel (0.42.0)
 Root-Is-Purelib: false
 Tag: cp37-cp37m-manylinux_2_27_x86_64