This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 691e1159fa1 Allow using python 3.6 and enable CI (#12792)
691e1159fa1 is described below
commit 691e1159fa1a3fa82f759b55294f83a58dd30fd3
Author: Haonan <[email protected]>
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
---
.github/workflows/multi-language-client.yml | 15 ++++++++++++++-
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 +++---
6 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/.github/workflows/multi-language-client.yml
b/.github/workflows/multi-language-client.yml
index b66fa4ed9f5..3f1180a7d16 100644
--- a/.github/workflows/multi-language-client.yml
+++ b/.github/workflows/multi-language-client.yml
@@ -103,7 +103,16 @@ jobs:
make e2e_test_for_parent_git_repo e2e_test_clean_for_parent_git_repo
python:
- runs-on: ubuntu-latest
+ strategy:
+ fail-fast: false
+ max-parallel: 15
+ matrix:
+ python: ['3.x']
+ os: [ubuntu-latest]
+ include:
+ - python: '3.6'
+ os: ubuntu-20.04
+ runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
@@ -119,9 +128,13 @@ jobs:
run: |
docker build . -f docker/src/main/Dockerfile-1c1d -t "iotdb:dev"
docker images
+ - uses: actions/setup-python@v5
+ with:
+ python-version: ${{ matrix.python }}
- name: Install IoTDB python client requirements
run: pip3 install -r iotdb-client/client-py/requirements_dev.txt
- name: Check code style
+ if: ${{ matrix.python == '3.x'}}
shell: bash
run: black iotdb-client/client-py/ --check --diff
- name: Integration test
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 3fc588338b8..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
+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)
