Skip to content

Commit

Permalink
Allow using python 3.6 and enable CI (#12792)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
HTHou committed Jun 27, 2024
1 parent 5f79351 commit 7a4df3d
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion iotdb-client/client-py/iotdb/utils/IoTDBRpcDataSet.py
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ def resultset_to_pandas(self):
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)
Expand Down
4 changes: 2 additions & 2 deletions iotdb-client/client-py/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions iotdb-client/client-py/requirements_dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions iotdb-client/client-py/resources/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
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",
],
Expand All @@ -53,7 +53,7 @@
"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={
Expand Down
6 changes: 3 additions & 3 deletions iotdb-client/client-py/tests/test_todf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down Expand Up @@ -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():
Expand Down Expand Up @@ -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)

0 comments on commit 7a4df3d

Please sign in to comment.