From 9d33a9ea5b9361ef6eb21a97175e63caec0ebf5c Mon Sep 17 00:00:00 2001 From: 761417898 <761417898@qq.com> Date: Tue, 21 Apr 2026 10:36:36 +0800 Subject: [PATCH 1/7] fix py3.9 black --- .github/workflows/wheels.yml | 7 ++++++- python/requirements.txt | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index a506e3ae0..b8b48a8ba 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -268,8 +268,13 @@ jobs: # Build wheel via Maven (no clean — keep C++ artifacts from previous job) chmod +x mvnw || true cd python + BLACK_VER_PROP="" + case "${{ matrix.python-version }}" in + 3.9) BLACK_VER_PROP="-Dblack.version=25.11.0" ;; + esac ../mvnw package -DskipTests \ - -Dspotless.check.skip=true -Dspotless.apply.skip=true + -Dspotless.check.skip=true -Dspotless.apply.skip=true \ + ${BLACK_VER_PROP} ls -la dist/ - name: Verify wheel diff --git a/python/requirements.txt b/python/requirements.txt index 54e32aa9d..d8b6595e5 100644 --- a/python/requirements.txt +++ b/python/requirements.txt @@ -18,7 +18,8 @@ # cython==3.0.10 -black==26.3.1 +black==25.11.0; python_version < "3.10" +black==26.3.1; python_version >= "3.10" numpy>=2.0.0,<3 pandas==2.2.2 setuptools==78.1.1 From 790ca49f24d59eda843ca22ba4f39a26c30202b5 Mon Sep 17 00:00:00 2001 From: 761417898 <761417898@qq.com> Date: Tue, 21 Apr 2026 10:48:54 +0800 Subject: [PATCH 2/7] ci wheel python 3.14 --- .github/workflows/wheels.yml | 4 ++-- python/pyproject.toml | 3 ++- python/requirements.txt | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index b8b48a8ba..79bb3150d 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -63,7 +63,7 @@ jobs: - name: Install build tools run: | python -m pip install -U pip wheel - python -m pip install cibuildwheel==2.21.3 + python -m pip install cibuildwheel==3.4.1 - name: Pre-download virtualenv for cibuildwheel run: | @@ -222,7 +222,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] + python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"] steps: - name: Checkout uses: actions/checkout@v4 diff --git a/python/pyproject.toml b/python/pyproject.toml index 476f91231..e61eb861f 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -39,7 +39,8 @@ dependencies = [ "numpy>=2.0.0,<3", "pandas>=2.0", "pyarrow>=16.0,<18; python_version<'3.10'", - "pyarrow>=18.0,<20; python_version>='3.10'" + "pyarrow>=18.0,<20; python_version>='3.10' and python_version<'3.14'", + "pyarrow>=22.0,<24; python_version>='3.14'" ] [project.urls] diff --git a/python/requirements.txt b/python/requirements.txt index d8b6595e5..53b32d677 100644 --- a/python/requirements.txt +++ b/python/requirements.txt @@ -21,7 +21,8 @@ cython==3.0.10 black==25.11.0; python_version < "3.10" black==26.3.1; python_version >= "3.10" numpy>=2.0.0,<3 -pandas==2.2.2 +pandas==2.2.2; python_version < "3.14" +pandas>=2.3.3; python_version >= "3.14" setuptools==78.1.1 wheel==0.46.2 pyarrow>=8.0.0 From 3e5c0d9acf3b4bdffe93446bafe8f7625b3036e6 Mon Sep 17 00:00:00 2001 From: 761417898 <761417898@qq.com> Date: Tue, 21 Apr 2026 11:50:07 +0800 Subject: [PATCH 3/7] ci fix --- python/pyproject.toml | 3 ++- python/tests/test_dataframe.py | 4 ++++ python/tests/test_to_tsfile.py | 4 ++++ python/tsfile/tsfile_table_writer.py | 3 +++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/python/pyproject.toml b/python/pyproject.toml index e61eb861f..bad86289a 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -37,7 +37,8 @@ maintainers = [ ] dependencies = [ "numpy>=2.0.0,<3", - "pandas>=2.0", + "pandas>=2.0,<2.3; python_version<'3.14'", + "pandas>=2.3.3; python_version>='3.14'", "pyarrow>=16.0,<18; python_version<'3.10'", "pyarrow>=18.0,<20; python_version>='3.10' and python_version<'3.14'", "pyarrow>=22.0,<24; python_version>='3.14'" diff --git a/python/tests/test_dataframe.py b/python/tests/test_dataframe.py index e376add7a..7dedd0258 100644 --- a/python/tests/test_dataframe.py +++ b/python/tests/test_dataframe.py @@ -51,6 +51,10 @@ def convert_to_nullable_types(df): df[col] = df[col].astype("Float32") elif dtype == "bool": df[col] = df[col].astype("boolean") + elif dtype == object: + non_null = df[col].dropna() + if len(non_null) and non_null.map(lambda x: isinstance(x, str)).all(): + df[col] = df[col].astype("string") return df diff --git a/python/tests/test_to_tsfile.py b/python/tests/test_to_tsfile.py index 446403867..3697e6089 100644 --- a/python/tests/test_to_tsfile.py +++ b/python/tests/test_to_tsfile.py @@ -40,6 +40,10 @@ def convert_to_nullable_types(df): df[col] = df[col].astype("Float32") elif dtype == "bool": df[col] = df[col].astype("boolean") + elif dtype == object: + non_null = df[col].dropna() + if len(non_null) and non_null.map(lambda x: isinstance(x, str)).all(): + df[col] = df[col].astype("string") return df diff --git a/python/tsfile/tsfile_table_writer.py b/python/tsfile/tsfile_table_writer.py index acc5fefb1..fa7133b91 100644 --- a/python/tsfile/tsfile_table_writer.py +++ b/python/tsfile/tsfile_table_writer.py @@ -36,6 +36,9 @@ def validate_dataframe_for_tsfile(df: pd.DataFrame) -> None: for c in columns: if c is None or (isinstance(c, str) and len(c) == 0): raise ValueError("Column name cannot be None or empty") + # pandas may store a None column label as float NaN (see tests with columns=[None, ...]) + if not isinstance(c, str) and pd.isna(c): + raise ValueError("Column name cannot be None or empty") lower = c.lower() if lower in seen: duplicates.append(c) From 713e518d7d7fadd0ccb493bb8e2e626c2f9cf13b Mon Sep 17 00:00:00 2001 From: 761417898 <761417898@qq.com> Date: Tue, 21 Apr 2026 12:10:28 +0800 Subject: [PATCH 4/7] ci fix --- python/tests/test_dataframe.py | 8 +++++++- python/tests/test_to_tsfile.py | 9 ++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/python/tests/test_dataframe.py b/python/tests/test_dataframe.py index 7dedd0258..59cbd918d 100644 --- a/python/tests/test_dataframe.py +++ b/python/tests/test_dataframe.py @@ -51,7 +51,7 @@ def convert_to_nullable_types(df): df[col] = df[col].astype("Float32") elif dtype == "bool": df[col] = df[col].astype("boolean") - elif dtype == object: + elif pd.api.types.is_object_dtype(df[col]): non_null = df[col].dropna() if len(non_null) and non_null.map(lambda x: isinstance(x, str)).all(): df[col] = df[col].astype("string") @@ -96,6 +96,7 @@ def test_write_dataframe_basic(): df_sorted = convert_to_nullable_types( df.sort_values("time").reset_index(drop=True) ) + df_read = convert_to_nullable_types(df_read) assert df_read.shape == (100, 4) assert df_read[TIME_COLUMN].equals(df_sorted["time"]) assert df_read["device"].equals(df_sorted["device"]) @@ -132,6 +133,7 @@ def test_write_dataframe_with_index(): df_read = df_read.sort_values(TIME_COLUMN).reset_index(drop=True) df_sorted = df.sort_index() df_sorted = convert_to_nullable_types(df_sorted.reset_index(drop=True)) + df_read = convert_to_nullable_types(df_read) time_series = pd.Series(df.sort_index().index.values, dtype="Int64") assert df_read.shape == (50, 3) assert df_read[TIME_COLUMN].equals(time_series) @@ -170,6 +172,7 @@ def test_write_dataframe_case_insensitive(): df_sorted = convert_to_nullable_types( df.sort_values("Time").reset_index(drop=True) ) + df_read = convert_to_nullable_types(df_read) assert df_read.shape == (30, 3) assert df_read[TIME_COLUMN].equals(df_sorted["Time"]) assert df_read["device"].equals(df_sorted["Device"]) @@ -274,6 +277,7 @@ def test_write_dataframe_all_datatypes(): df_sorted = convert_to_nullable_types( df.sort_values("time").reset_index(drop=True) ) + df_read = convert_to_nullable_types(df_read) assert df_read.shape == (50, 11) assert df_read["bool_col"].equals(df_sorted["bool_col"]) assert df_read["int32_col"].equals(df_sorted["int32_col"]) @@ -321,6 +325,7 @@ def test_write_dataframe_schema_time_column(): df_sorted = convert_to_nullable_types( df.sort_values("time").reset_index(drop=True) ) + df_read = convert_to_nullable_types(df_read) assert df_read.shape == (50, 3) assert df_read[TIME_COLUMN].equals(df_sorted[TIME_COLUMN]) assert df_read["device"].equals(df_sorted["device"]) @@ -358,6 +363,7 @@ def test_write_dataframe_schema_time_and_dataframe_time(): df_sorted = convert_to_nullable_types( df.sort_values("Time").rename(columns=str.lower).reset_index(drop=True) ) + df_read = convert_to_nullable_types(df_read) assert df_read.shape == (30, 3) assert df_read["time"].equals(df_sorted["time"]) assert df_read["device"].equals(df_sorted["device"]) diff --git a/python/tests/test_to_tsfile.py b/python/tests/test_to_tsfile.py index 3697e6089..f6f8653e0 100644 --- a/python/tests/test_to_tsfile.py +++ b/python/tests/test_to_tsfile.py @@ -40,7 +40,7 @@ def convert_to_nullable_types(df): df[col] = df[col].astype("Float32") elif dtype == "bool": df[col] = df[col].astype("boolean") - elif dtype == object: + elif pd.api.types.is_object_dtype(df[col]): non_null = df[col].dropna() if len(non_null) and non_null.map(lambda x: isinstance(x, str)).all(): df[col] = df[col].astype("string") @@ -69,6 +69,7 @@ def test_dataframe_to_tsfile_basic(): df_sorted = convert_to_nullable_types( df.sort_values("time").reset_index(drop=True) ) + df_read = convert_to_nullable_types(df_read) assert df_read.shape == (100, 4) assert df_read["time"].equals(df_sorted["time"]) @@ -113,6 +114,7 @@ def test_dataframe_to_tsfile_with_index(): df_read = to_dataframe(tsfile_path, table_name="test_table") df_read = df_read.sort_values("time").reset_index(drop=True) + df_read = convert_to_nullable_types(df_read) time_expected = pd.Series(df.index.values, dtype="Int64") assert df_read.shape == (30, 3) assert df_read["time"].equals(time_expected) @@ -150,6 +152,7 @@ def test_dataframe_to_tsfile_custom_time_column(): df_sorted = convert_to_nullable_types( df.sort_values("timestamp").reset_index(drop=True) ) + df_read = convert_to_nullable_types(df_read) assert df_read.shape == (30, 3) assert df_read["timestamp"].equals(df_sorted["timestamp"]) @@ -173,6 +176,7 @@ def test_dataframe_to_tsfile_case_insensitive_time(): dataframe_to_tsfile(df, tsfile_path, table_name="test_table") df_read = to_dataframe(tsfile_path, table_name="test_table") + df_read = convert_to_nullable_types(df_read) assert df_read.shape == (20, 2) assert df_read["time"].equals(pd.Series([i for i in range(20)], dtype="Int64")) finally: @@ -204,6 +208,7 @@ def test_dataframe_to_tsfile_with_tag_columns(): df_sorted = convert_to_nullable_types( df.sort_values("time").reset_index(drop=True) ) + df_read = convert_to_nullable_types(df_read) assert df_read.shape == (20, 4) assert df_read["device"].equals(df_sorted["device"]) @@ -246,6 +251,7 @@ def test_dataframe_to_tsfile_tag_time_unsorted(): df_read = to_dataframe(tsfile_path, table_name="test_table") df_expected = df.sort_values(by=["device", "time"]).reset_index(drop=True) df_expected = convert_to_nullable_types(df_expected) + df_read = convert_to_nullable_types(df_read) assert df_read.shape == (10, 3) assert df_read["device"].equals(df_expected["device"]) @@ -285,6 +291,7 @@ def test_dataframe_to_tsfile_all_datatypes(): df_sorted = convert_to_nullable_types( df.sort_values("time").reset_index(drop=True) ) + df_read = convert_to_nullable_types(df_read) assert df_read.shape == (50, 11) assert df_read["bool_col"].equals(df_sorted["bool_col"]) From 53c3e2ff84db69dfceec3505d1267830b78a2768 Mon Sep 17 00:00:00 2001 From: 761417898 <761417898@qq.com> Date: Tue, 21 Apr 2026 12:34:40 +0800 Subject: [PATCH 5/7] fix ci --- python/pyproject.toml | 4 ++-- python/requirements.txt | 4 ++-- python/tests/test_dataframe.py | 3 +++ python/tests/test_to_tsfile.py | 2 ++ python/tsfile/tsfile_table_writer.py | 17 ++++++++++++----- 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/python/pyproject.toml b/python/pyproject.toml index bad86289a..403b1fa49 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -37,8 +37,8 @@ maintainers = [ ] dependencies = [ "numpy>=2.0.0,<3", - "pandas>=2.0,<2.3; python_version<'3.14'", - "pandas>=2.3.3; python_version>='3.14'", + "pandas>=2.0,<2.3; python_full_version < '3.14.0'", + "pandas>=2.3.3; python_full_version >= '3.14.0'", "pyarrow>=16.0,<18; python_version<'3.10'", "pyarrow>=18.0,<20; python_version>='3.10' and python_version<'3.14'", "pyarrow>=22.0,<24; python_version>='3.14'" diff --git a/python/requirements.txt b/python/requirements.txt index 53b32d677..8733d9887 100644 --- a/python/requirements.txt +++ b/python/requirements.txt @@ -21,8 +21,8 @@ cython==3.0.10 black==25.11.0; python_version < "3.10" black==26.3.1; python_version >= "3.10" numpy>=2.0.0,<3 -pandas==2.2.2; python_version < "3.14" -pandas>=2.3.3; python_version >= "3.14" +pandas==2.2.2; python_full_version < "3.14.0" +pandas>=2.3.3; python_full_version >= "3.14.0" setuptools==78.1.1 wheel==0.46.2 pyarrow>=8.0.0 diff --git a/python/tests/test_dataframe.py b/python/tests/test_dataframe.py index 59cbd918d..aecaa877c 100644 --- a/python/tests/test_dataframe.py +++ b/python/tests/test_dataframe.py @@ -55,6 +55,9 @@ def convert_to_nullable_types(df): non_null = df[col].dropna() if len(non_null) and non_null.map(lambda x: isinstance(x, str)).all(): df[col] = df[col].astype("string") + elif pd.api.types.is_string_dtype(df[col]): + # NumPy/pandas str dtype (e.g. Py3.14) vs object: unify for Series.equals + df[col] = df[col].astype("string") return df diff --git a/python/tests/test_to_tsfile.py b/python/tests/test_to_tsfile.py index f6f8653e0..147b0bea8 100644 --- a/python/tests/test_to_tsfile.py +++ b/python/tests/test_to_tsfile.py @@ -44,6 +44,8 @@ def convert_to_nullable_types(df): non_null = df[col].dropna() if len(non_null) and non_null.map(lambda x: isinstance(x, str)).all(): df[col] = df[col].astype("string") + elif pd.api.types.is_string_dtype(df[col]): + df[col] = df[col].astype("string") return df diff --git a/python/tsfile/tsfile_table_writer.py b/python/tsfile/tsfile_table_writer.py index fa7133b91..94b273511 100644 --- a/python/tsfile/tsfile_table_writer.py +++ b/python/tsfile/tsfile_table_writer.py @@ -34,12 +34,19 @@ def validate_dataframe_for_tsfile(df: pd.DataFrame) -> None: seen = set() duplicates = [] for c in columns: - if c is None or (isinstance(c, str) and len(c) == 0): + if isinstance(c, str): + if len(c) == 0: + raise ValueError("Column name cannot be None or empty") + lower = c.lower() + elif c is None: raise ValueError("Column name cannot be None or empty") - # pandas may store a None column label as float NaN (see tests with columns=[None, ...]) - if not isinstance(c, str) and pd.isna(c): - raise ValueError("Column name cannot be None or empty") - lower = c.lower() + else: + try: + if pd.isna(c): + raise ValueError("Column name cannot be None or empty") + except (TypeError, ValueError): + pass + lower = str(c).lower() if lower in seen: duplicates.append(c) seen.add(lower) From 038c3351137e0882a88795242439e8eb54967cb9 Mon Sep 17 00:00:00 2001 From: 761417898 <761417898@qq.com> Date: Tue, 21 Apr 2026 15:52:56 +0800 Subject: [PATCH 6/7] ci fix --- .github/workflows/wheels.yml | 4 ++-- python/pyproject.toml | 2 +- python/tsfile/tsfile_table_writer.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 79bb3150d..84af04f42 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -108,8 +108,8 @@ jobs: CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-* cp313-* cp314-*" CIBW_SKIP: "pp* *-musllinux*" - CIBW_MANYLINUX_X86_64_IMAGE: "manylinux2014" - CIBW_MANYLINUX_AARCH64_IMAGE: "manylinux2014" + CIBW_MANYLINUX_X86_64_IMAGE: "manylinux_2_28" + CIBW_MANYLINUX_AARCH64_IMAGE: "manylinux_2_28" MACOSX_DEPLOYMENT_TARGET: "12.0" diff --git a/python/pyproject.toml b/python/pyproject.toml index 403b1fa49..51ab8c98f 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -41,7 +41,7 @@ dependencies = [ "pandas>=2.3.3; python_full_version >= '3.14.0'", "pyarrow>=16.0,<18; python_version<'3.10'", "pyarrow>=18.0,<20; python_version>='3.10' and python_version<'3.14'", - "pyarrow>=22.0,<24; python_version>='3.14'" + "pyarrow>=23.0.0,<24; python_version>='3.14'" ] [project.urls] diff --git a/python/tsfile/tsfile_table_writer.py b/python/tsfile/tsfile_table_writer.py index 94b273511..9f3a257e6 100644 --- a/python/tsfile/tsfile_table_writer.py +++ b/python/tsfile/tsfile_table_writer.py @@ -44,7 +44,7 @@ def validate_dataframe_for_tsfile(df: pd.DataFrame) -> None: try: if pd.isna(c): raise ValueError("Column name cannot be None or empty") - except (TypeError, ValueError): + except TypeError: pass lower = str(c).lower() if lower in seen: From ad68d5606dd884326af25b6fdea4789854aa6c5d Mon Sep 17 00:00:00 2001 From: 761417898 <761417898@qq.com> Date: Tue, 21 Apr 2026 16:48:18 +0800 Subject: [PATCH 7/7] ci fix --- python/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/pyproject.toml b/python/pyproject.toml index 51ab8c98f..403b1fa49 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -41,7 +41,7 @@ dependencies = [ "pandas>=2.3.3; python_full_version >= '3.14.0'", "pyarrow>=16.0,<18; python_version<'3.10'", "pyarrow>=18.0,<20; python_version>='3.10' and python_version<'3.14'", - "pyarrow>=23.0.0,<24; python_version>='3.14'" + "pyarrow>=22.0,<24; python_version>='3.14'" ] [project.urls]