moved project to python 3.9 -> interpreter compatibility with cellstar

mc-crocodile · mc-crocodile · commit 798ca9b620ed · 2022-06-27T09:06:14.000+02:00
diff --git a/.idea/ciftools-python.iml b/.idea/ciftools-python.iml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/ciftools/binary/encoding/impl/encoders/string_array.py b/ciftools/binary/encoding/impl/encoders/string_array.py
@@ -1,3 +1,5 @@
+from typing import Union
+
 import numpy as np
 from ciftools.binary.encoding import BinaryCIFEncoder
 from ciftools.binary.encoding.base.cif_encoder_base import CIFEncoderBase
@@ -13,7 +15,7 @@
 
 
 class StringArrayCIFEncoder(CIFEncoderBase):
- def encode(self, data: np.ndarray | list[str]) -> EncodedCIFData:
+ def encode(self, data: Union[np.ndarray, list[str]]) -> EncodedCIFData:
 _map = dict()
 
 strings: list[str] = []
diff --git a/ciftools/tests/delta.py b/ciftools/tests/delta.py
@@ -1,3 +1,4 @@
+import timeit
 import unittest
 
 import msgpack
@@ -13,6 +14,7 @@ def test(self):
 test_arr = np.array([1, 1, 2, 2, 10, -10])
 
 encoder = BinaryCIFEncoder([DELTA_CIF_ENCODER, BYTE_ARRAY_CIF_ENCODER])
+
 encoded = encoder.encode_cif_data(test_arr)
 msgpack.loads(msgpack.dumps(encoded))
 decoded = decode_cif_data(encoded)
diff --git a/ciftools/writer/base.py b/ciftools/writer/base.py
@@ -1,5 +1,5 @@
 import abc
-from typing import Any
+from typing import Any, Union
 
 import numpy as np
 from ciftools.binary.encoding.impl.binary_cif_encoder import BinaryCIFEncoder
@@ -10,7 +10,7 @@ class FieldDesc(abc.ABC):
 name: str
 
 @abc.abstractmethod
- def create_array(self, total_count: int) -> np.ndarray | list:
+ def create_array(self, total_count: int) -> Union[np.ndarray, list]:
 pass
 
 @abc.abstractmethod
diff --git a/ciftools/writer/fields.py b/ciftools/writer/fields.py
@@ -1,4 +1,4 @@
-from typing import Any, Callable, Optional
+from typing import Any, Callable, Optional, Union
 
 import numpy as np
 from ciftools.binary.encoding.impl.binary_cif_encoder import BinaryCIFEncoder
@@ -60,7 +60,7 @@ def create_array(self, total_count: int):
 def __init__(
 self,
 name: str,
- value: Callable[[Any, int], Optional[int | float]],
+ value: Callable[[Any, int], Optional[Union[int, float]]],
 dtype: np.dtype,
 encoder: Callable[[Any], BinaryCIFEncoder],
 presence: Optional[Callable[[Any, int], Optional[ValuePresenceEnum]]] = None,
@@ -75,7 +75,7 @@ def __init__(
 def number_field(
 *,
 name: str,
- value: Callable[[Any, int], Optional[int | float]],
+ value: Callable[[Any, int], Optional[Union[int, float]]],
 dtype: np.dtype,
 encoder: Callable[[Any], BinaryCIFEncoder],
 presence: Optional[Callable[[Any, int], Optional[ValuePresenceEnum]]] = None,
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
 name="CifTools",
- version="0.1.0",
+ version="0.1.1",
 url="https://github.com/molstar/ciftools-python",
 author="Ravi Ramos",
 author_email="souoravi@gmail.com",

-Original file line number
+Diff line change
@@ @@ -1,3 +1,5 @@ @@
 +fromtypingimportUnion
++
 importnumpyasnp
 fromciftools.binary.encodingimportBinaryCIFEncoder
 fromciftools.binary.encoding.base.cif_encoder_baseimportCIFEncoderBase
 classStringArrayCIFEncoder(CIFEncoderBase):
 -defencode(self, data: np.ndarray|list[str]) ->EncodedCIFData:
 +defencode(self, data: Union[np.ndarray, list[str]]) ->EncodedCIFData:
 _map=dict()
 strings: list[str] = []
-Original file line number
+Diff line change
@@ @@ -1,3 +1,4 @@ @@
 +importtimeit
 importunittest
 importmsgpack
 test_arr=np.array([1, 1, 2, 2, 10, -10])
 encoder=BinaryCIFEncoder([DELTA_CIF_ENCODER, BYTE_ARRAY_CIF_ENCODER])
++
 encoded=encoder.encode_cif_data(test_arr)
 msgpack.loads(msgpack.dumps(encoded))
 decoded=decode_cif_data(encoded)
-Original file line number
+Diff line change
@@ @@ -1,5 +1,5 @@ @@
 importabc
 -fromtypingimportAny
 +fromtypingimportAny, Union
 importnumpyasnp
 fromciftools.binary.encoding.impl.binary_cif_encoderimportBinaryCIFEncoder
 name: str
 @abc.abstractmethod
 -defcreate_array(self, total_count: int) ->np.ndarray|list:
 +defcreate_array(self, total_count: int) ->Union[np.ndarray, list]:
 pass
 @abc.abstractmethod