You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2024/06/27 04:13:32 UTC

(iotdb) branch rc/1.3.2 updated (6f4a4a7e109 -> 7a4df3d76f5)

This is an automated email from the ASF dual-hosted git repository.

haonan pushed a change to branch rc/1.3.2
in repository https://gitbox.apache.org/repos/asf/iotdb.git


    from 6f4a4a7e109 fix compile
     new b9ed80b5ace [PY-client] Unify setup.py and requirement.txt (#12601)
     new 5f79351fd13 Fix python CI (#12754)
     new 7a4df3d76f5 Allow using python 3.6 and enable CI (#12792)

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 iotdb-client/client-py/iotdb/utils/IoTDBRpcDataSet.py | 16 +++++++++++-----
 iotdb-client/client-py/requirements.txt               |  8 ++++----
 iotdb-client/client-py/requirements_dev.txt           |  8 ++++----
 iotdb-client/client-py/resources/setup.py             |  7 +++----
 iotdb-client/client-py/tests/test_todf.py             |  6 +++---
 5 files changed, 25 insertions(+), 20 deletions(-)


(iotdb) 03/03: Allow using python 3.6 and enable CI (#12792)

Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

haonan pushed a commit to branch rc/1.3.2
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 7a4df3d76f5361e8d3404e7b56cc9b8ad3281992
Author: Haonan <hh...@outlook.com>
AuthorDate: Wed Jun 26 15:31:49 2024 +0800

    Allow using python 3.6 and enable CI (#12792)
    
    * Enable python 3.6 CI
    
    * Enable python 3.6 CI
    
    * Enable python 3.6 CI
    
    * Enable python 3.6 CI
    
    * try Enable python 3.6 CI
    
    * try Enable python 3.6 CI
    
    * Fix python CI
    
    * Fix python CI
    
    * Fix python CI
    
    * Fix python CI
    
    * Fix python CI
    
    * Fix python CI
    
    * allow python 3.6
---
 iotdb-client/client-py/iotdb/utils/IoTDBRpcDataSet.py | 2 +-
 iotdb-client/client-py/requirements.txt               | 4 ++--
 iotdb-client/client-py/requirements_dev.txt           | 8 ++++----
 iotdb-client/client-py/resources/setup.py             | 6 +++---
 iotdb-client/client-py/tests/test_todf.py             | 6 +++---
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/iotdb-client/client-py/iotdb/utils/IoTDBRpcDataSet.py b/iotdb-client/client-py/iotdb/utils/IoTDBRpcDataSet.py
index eb859d7d30c..3151b2acfd8 100644
--- a/iotdb-client/client-py/iotdb/utils/IoTDBRpcDataSet.py
+++ b/iotdb-client/client-py/iotdb/utils/IoTDBRpcDataSet.py
@@ -361,7 +361,7 @@ class IoTDBRpcDataSet(object):
                 result[k] = pd.Series(np.concatenate(v, axis=0)).astype("Int32")
             elif v[0].dtype == "Int64":
                 result[k] = pd.Series(np.concatenate(v, axis=0)).astype("Int64")
-            elif v[0].dtype == "boolean":
+            elif v[0].dtype == bool:
                 result[k] = pd.Series(np.concatenate(v, axis=0)).astype("boolean")
             else:
                 result[k] = np.concatenate(v, axis=0)
diff --git a/iotdb-client/client-py/requirements.txt b/iotdb-client/client-py/requirements.txt
index 23c97837a79..490393d157c 100644
--- a/iotdb-client/client-py/requirements.txt
+++ b/iotdb-client/client-py/requirements.txt
@@ -17,8 +17,8 @@
 #
 
 # Pandas Export
-pandas>=1.3.5
-numpy>=1.21.4
+pandas>=1.0.0
+numpy>=1.0.0
 thrift>=0.14.1
 # SQLAlchemy Dialect
 sqlalchemy<1.5,>=1.4
diff --git a/iotdb-client/client-py/requirements_dev.txt b/iotdb-client/client-py/requirements_dev.txt
index 38fe8ccd816..53b73454f90 100644
--- a/iotdb-client/client-py/requirements_dev.txt
+++ b/iotdb-client/client-py/requirements_dev.txt
@@ -18,11 +18,11 @@
 
 -r requirements.txt
 # Pytest to run tests
-pytest==7.2.0
-flake8==3.9.0
-black==24.3.0
+pytest>=7.0.0
+flake8>=5.0.0
+black>=22.8.0
 # Testcontainer
 testcontainers==3.4.2
 # For releases
 twine==3.4.1
-wheel==0.38.1
\ No newline at end of file
+wheel>=0.37.1
diff --git a/iotdb-client/client-py/resources/setup.py b/iotdb-client/client-py/resources/setup.py
index acf5857327a..202507af804 100644
--- a/iotdb-client/client-py/resources/setup.py
+++ b/iotdb-client/client-py/resources/setup.py
@@ -41,8 +41,8 @@ setuptools.setup(
     packages=setuptools.find_packages(),
     install_requires=[
         "thrift>=0.14.1",
-        "pandas>=1.3.5",
-        "numpy>=1.21.4",
+        "pandas>=1.0.0",
+        "numpy>=1.0.0",
         "sqlalchemy<1.5,>=1.4",
         "sqlalchemy-utils>=0.37.8",
     ],
@@ -53,7 +53,7 @@ setuptools.setup(
         "Topic :: Software Development :: Libraries",
         "Topic :: Software Development :: Libraries :: Python Modules",
     ],
-    python_requires=">=3.7",
+    python_requires=">=3.6",
     license="Apache License, Version 2.0",
     website="https://iotdb.apache.org",
     entry_points={
diff --git a/iotdb-client/client-py/tests/test_todf.py b/iotdb-client/client-py/tests/test_todf.py
index 6fce1cd18d7..03e97974776 100644
--- a/iotdb-client/client-py/tests/test_todf.py
+++ b/iotdb-client/client-py/tests/test_todf.py
@@ -98,7 +98,7 @@ def test_simple_query():
         df_output = df_output[df_input.columns.tolist()]
 
         session.close()
-    assert_frame_equal(df_input, df_output)
+    assert_frame_equal(df_input, df_output, check_dtype=False)
 
 
 def test_with_null_query():
@@ -178,7 +178,7 @@ def test_with_null_query():
         df_output = df_output[df_input.columns.tolist()]
 
         session.close()
-    assert_frame_equal(df_input, df_output)
+    assert_frame_equal(df_input, df_output, check_dtype=False)
 
 
 def test_multi_fetch():
@@ -216,4 +216,4 @@ def test_multi_fetch():
         df_output = df_output[df_input.columns.tolist()]
 
         session.close()
-    assert_frame_equal(df_input, df_output)
+    assert_frame_equal(df_input, df_output, check_dtype=False)


(iotdb) 01/03: [PY-client] Unify setup.py and requirement.txt (#12601)

Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

haonan pushed a commit to branch rc/1.3.2
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit b9ed80b5ace0a2ff426948ab426a30e2dbe64d7a
Author: Haonan <hh...@outlook.com>
AuthorDate: Thu Jun 6 17:36:55 2024 +0800

    [PY-client] Unify setup.py and requirement.txt (#12601)
---
 iotdb-client/client-py/requirements.txt   | 4 ++--
 iotdb-client/client-py/resources/setup.py | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/iotdb-client/client-py/requirements.txt b/iotdb-client/client-py/requirements.txt
index ba23aeea071..23c97837a79 100644
--- a/iotdb-client/client-py/requirements.txt
+++ b/iotdb-client/client-py/requirements.txt
@@ -21,5 +21,5 @@ pandas>=1.3.5
 numpy>=1.21.4
 thrift>=0.14.1
 # SQLAlchemy Dialect
-sqlalchemy == 1.3.20
-sqlalchemy-utils == 0.36.8
\ No newline at end of file
+sqlalchemy<1.5,>=1.4
+sqlalchemy-utils>=0.37.8
diff --git a/iotdb-client/client-py/resources/setup.py b/iotdb-client/client-py/resources/setup.py
index 3af2705af26..acf5857327a 100644
--- a/iotdb-client/client-py/resources/setup.py
+++ b/iotdb-client/client-py/resources/setup.py
@@ -40,10 +40,9 @@ setuptools.setup(
     url="https://github.com/apache/iotdb",
     packages=setuptools.find_packages(),
     install_requires=[
-        "thrift>=0.13.0",
-        "pandas>=1.0.0,<1.99.99",
-        "numpy>=1.0.0",
-        "testcontainers>=2.0.0",
+        "thrift>=0.14.1",
+        "pandas>=1.3.5",
+        "numpy>=1.21.4",
         "sqlalchemy<1.5,>=1.4",
         "sqlalchemy-utils>=0.37.8",
     ],


(iotdb) 02/03: Fix python CI (#12754)

Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

haonan pushed a commit to branch rc/1.3.2
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 5f79351fd131f58c857fdcf297a01eb8ab742470
Author: Haonan <hh...@outlook.com>
AuthorDate: Mon Jun 17 21:46:55 2024 +0800

    Fix python CI (#12754)
---
 iotdb-client/client-py/iotdb/utils/IoTDBRpcDataSet.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/iotdb-client/client-py/iotdb/utils/IoTDBRpcDataSet.py b/iotdb-client/client-py/iotdb/utils/IoTDBRpcDataSet.py
index 53ef09b8e7a..eb859d7d30c 100644
--- a/iotdb-client/client-py/iotdb/utils/IoTDBRpcDataSet.py
+++ b/iotdb-client/client-py/iotdb/utils/IoTDBRpcDataSet.py
@@ -151,7 +151,7 @@ class IoTDBRpcDataSet(object):
             self.__query_data_set.time, np.dtype(np.longlong).newbyteorder(">")
         )
         if time_array.dtype.byteorder == ">":
-            time_array = time_array.byteswap().newbyteorder("<")
+            time_array = time_array.byteswap().view(time_array.dtype.newbyteorder("<"))
         result[0] = time_array
         total_length = len(time_array)
         for i in range(self.column_size):
@@ -205,7 +205,9 @@ class IoTDBRpcDataSet(object):
             else:
                 raise RuntimeError("unsupported data type {}.".format(data_type))
             if data_array.dtype.byteorder == ">":
-                data_array = data_array.byteswap().newbyteorder("<")
+                data_array = data_array.byteswap().view(
+                    data_array.dtype.newbyteorder("<")
+                )
             # self.__query_data_set.valueList[location] = None
             if len(data_array) < total_length:
                 # INT32 or INT64 or boolean
@@ -258,7 +260,9 @@ class IoTDBRpcDataSet(object):
                 self.__query_data_set.time, np.dtype(np.longlong).newbyteorder(">")
             )
             if time_array.dtype.byteorder == ">":
-                time_array = time_array.byteswap().newbyteorder("<")
+                time_array = time_array.byteswap().view(
+                    time_array.dtype.newbyteorder("<")
+                )
             if self.ignore_timestamp is None or self.ignore_timestamp is False:
                 result[IoTDBRpcDataSet.TIMESTAMP_STR].append(time_array)
 
@@ -317,7 +321,9 @@ class IoTDBRpcDataSet(object):
                 else:
                     raise RuntimeError("unsupported data type {}.".format(data_type))
                 if data_array.dtype.byteorder == ">":
-                    data_array = data_array.byteswap().newbyteorder("<")
+                    data_array = data_array.byteswap().view(
+                        data_array.dtype.newbyteorder("<")
+                    )
                 self.__query_data_set.valueList[location] = None
                 tmp_array = []
                 if len(data_array) < total_length: