You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tsfile.apache.org by co...@apache.org on 2026/03/12 09:45:05 UTC
(tsfile) 01/01: support python release.
This is an automated email from the ASF dual-hosted git repository.
colinlee pushed a commit to branch support_release_ci
in repository https://gitbox.apache.org/repos/asf/tsfile.git
commit a303950d3b28935584dc405f28a9dfa0be3da5d2
Author: ColinLee <sh...@163.com>
AuthorDate: Wed Mar 11 22:07:36 2026 +0800
support python release.
---
.github/workflows/unit-test-cpp.yml | 6 +
.github/workflows/unit-test-python.yml | 11 ++
.github/workflows/wheels.yml | 301 +++++++++++++++++++++++++++++++++
cpp/CMakeLists.txt | 2 +-
cpp/pom.xml | 12 +-
java/common/pom.xml | 2 +-
java/examples/pom.xml | 4 +-
java/pom.xml | 4 +-
java/tools/pom.xml | 6 +-
java/tsfile/pom.xml | 4 +-
pom.xml | 12 +-
python/VersionUpdater.groovy | 20 ++-
python/pom.xml | 40 +----
python/pyproject.toml | 69 ++++++++
python/requirements.txt | 4 +-
python/setup.py | 219 ++++++++++--------------
python/tsfile/__init__.py | 14 +-
python/tsfile/tsfile_cpp.pxd | 6 +-
18 files changed, 542 insertions(+), 194 deletions(-)
diff --git a/.github/workflows/unit-test-cpp.yml b/.github/workflows/unit-test-cpp.yml
index 1c3495ea6..2fab96567 100644
--- a/.github/workflows/unit-test-cpp.yml
+++ b/.github/workflows/unit-test-cpp.yml
@@ -109,6 +109,12 @@ jobs:
shell: bash
run: |
if [[ "$RUNNER_OS" == "Linux" ]]; then
+ if command -v apt-get >/dev/null 2>&1; then
+ sudo apt-get update
+ sudo apt-get install -y uuid-dev
+ elif command -v yum >/dev/null 2>&1; then
+ sudo yum install -y libuuid-devel
+ fi
sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-17 100
sudo update-alternatives --set clang-format /usr/bin/clang-format-17
sudo apt-get update
diff --git a/.github/workflows/unit-test-python.yml b/.github/workflows/unit-test-python.yml
index 708f8ec35..9fc002ae8 100644
--- a/.github/workflows/unit-test-python.yml
+++ b/.github/workflows/unit-test-python.yml
@@ -60,6 +60,17 @@ jobs:
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2-
+ - name: Install dependencies
+ shell: bash
+ run: |
+ if [[ "$RUNNER_OS" == "Linux" ]]; then
+ if command -v apt-get >/dev/null 2>&1; then
+ sudo apt-get update
+ sudo apt-get install -y uuid-dev
+ elif command -v yum >/dev/null 2>&1; then
+ sudo yum install -y libuuid-devel
+ fi
+ fi
# On Windows systems the 'mvnw' script needs an additional ".cmd" appended.
- name: Calculate platform suffix
id: platform_suffix
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
new file mode 100644
index 000000000..e47bc1678
--- /dev/null
+++ b/.github/workflows/wheels.yml
@@ -0,0 +1,301 @@
+name: Build TsFile wheels(multi-platform)
+
+on:
+ workflow_dispatch:
+
+jobs:
+ build:
+ name: Build wheels on ${{ matrix.name }}
+ runs-on: ${{ matrix.os }}
+ strategy:
+ fail-fast: false
+ matrix:
+ include:
+ - name: linux-x86_64
+ os: ubuntu-22.04
+ platform: linux
+ cibw_archs_linux: "x86_64"
+
+ - name: linux-aarch64
+ os: ubuntu-22.04-arm
+ platform: linux
+ cibw_archs_linux: "aarch64"
+
+ - name: macos-x86_64
+ os: macos-15-intel
+ platform: macos
+ cibw_archs_macos: "x86_64"
+
+ - name: macos-arm64
+ os: macos-latest
+ platform: macos
+ cibw_archs_macos: "arm64"
+# Windows is handled by the build-windows job below
+
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v4
+ with:
+ submodules: false
+ fetch-depth: 0
+
+ - name: Set up Python
+ uses: actions/setup-python@v4
+ with:
+ python-version: "3.11"
+
+ - name: Set up Java 17
+ uses: actions/setup-java@v4
+ with:
+ distribution: temurin
+ java-version: "17"
+
+ - name: Install system deps (macOS)
+ if: matrix.platform == 'macos'
+ run: |
+ set -eux
+ brew update
+ brew install pkg-config || true
+
+ - name: Install build tools
+ run: |
+ python -m pip install -U pip wheel
+ python -m pip install cibuildwheel==2.21.3
+
+ - name: Pre-download virtualenv for cibuildwheel
+ run: |
+ if [ "$(uname)" = "Darwin" ]; then
+ CACHE_DIR="$HOME/Library/Caches/cibuildwheel"
+ else
+ CACHE_DIR="$HOME/.cache/cibuildwheel"
+ fi
+ mkdir -p "$CACHE_DIR"
+ TARGET="$CACHE_DIR/virtualenv-20.26.6.pyz"
+ if [ ! -f "$TARGET" ]; then
+ curl -sSL --retry 5 --retry-delay 15 --retry-all-errors \
+ -o "$TARGET" \
+ "https://github.com/pypa/get-virtualenv/raw/20.26.6/public/virtualenv.pyz"
+ fi
+ ls -la "$TARGET"
+
+
+ - name: Build C++ core via Maven (macOS)
+ if: matrix.platform == 'macos'
+ shell: bash
+ env:
+ MACOSX_DEPLOYMENT_TARGET: "12.0"
+ CFLAGS: "-mmacosx-version-min=12.0"
+ CXXFLAGS: "-mmacosx-version-min=12.0"
+ LDFLAGS: "-mmacosx-version-min=12.0"
+ run: |
+ set -euxo pipefail
+ chmod +x mvnw || true
+ ./mvnw -Pwith-cpp clean package \
+ -DskipTests -Dspotless.check.skip=true -Dspotless.apply.skip=true \
+ -Dbuild.test=OFF \
+ -Dcmake.args="-DCMAKE_OSX_DEPLOYMENT_TARGET=12.0"
+ otool -l cpp/target/build/lib/libtsfile*.dylib | grep -A2 LC_VERSION_MIN_MACOSX || true
+
+ - name: Build wheels via cibuildwheel
+ if: matrix.platform != 'macos'
+ env:
+ CIBW_ARCHS_LINUX: ${{ matrix.cibw_archs_linux }}
+# CIBW_ARCHS_WINDOWS: ${{ matrix.cibw_archs_windows }}
+
+ CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-* cp313-* cp314-*"
+ CIBW_SKIP: "pp* *-musllinux*"
+
+ CIBW_MANYLINUX_X86_64_IMAGE: "manylinux2014"
+ CIBW_MANYLINUX_AARCH64_IMAGE: "manylinux2014"
+
+ MACOSX_DEPLOYMENT_TARGET: "12.0"
+
+ CIBW_BEFORE_ALL_LINUX: |
+ set -euxo pipefail
+ if command -v yum >/dev/null 2>&1; then
+ yum install -y wget tar gzip pkgconfig libuuid-devel libblkid-devel
+ else
+ echo "Not a yum-based image?" ; exit 1
+ fi
+ ARCH="$(uname -m)"
+ mkdir -p /opt/java
+ if [ "$ARCH" = "x86_64" ]; then
+ JDK_URL="https://download.oracle.com/java/17/archive/jdk-17.0.12_linux-x64_bin.tar.gz"
+ else
+ # aarch64
+ JDK_URL="https://download.oracle.com/java/17/archive/jdk-17.0.12_linux-aarch64_bin.tar.gz"
+ fi
+ curl -L -o /tmp/jdk17.tar.gz "$JDK_URL"
+ tar -xzf /tmp/jdk17.tar.gz -C /opt/java
+ export JAVA_HOME=$(echo /opt/java/jdk-17.0.12*)
+ export PATH="$JAVA_HOME/bin:$PATH"
+ java -version
+
+ chmod +x mvnw || true
+ ./mvnw -Pwith-cpp clean package \
+ -DskipTests -Dbuild.test=OFF \
+ -Dspotless.check.skip=true -Dspotless.apply.skip=true
+ test -d cpp/target/build/lib && test -d cpp/target/build/include
+
+ CIBW_TEST_COMMAND: >
+ python -c "import tsfile, tsfile.tsfile_reader as r; print('import-ok:')"
+ CIBW_BUILD_VERBOSITY: "1"
+ run: cibuildwheel --output-dir wheelhouse python
+
+ - name: Build wheels via cibuildwheel (macOS)
+ if: matrix.platform == 'macos'
+ env:
+ CIBW_ARCHS_MACOS: ${{ matrix.cibw_archs_macos }}
+ CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-* cp313-* cp314-*"
+# CIBW_BUILD: "cp313-*"
+ CIBW_SKIP: "pp*"
+ CIBW_ENVIRONMENT_MACOS: "MACOSX_DEPLOYMENT_TARGET=12.0"
+ MACOSX_DEPLOYMENT_TARGET: "12.0"
+ CIBW_TEST_COMMAND: >
+ python -c "import tsfile, tsfile.tsfile_reader as r; print('import-ok:')"
+ CIBW_BUILD_VERBOSITY: "1"
+ run: cibuildwheel --output-dir wheelhouse python
+
+ - name: Upload wheels as artifact
+ uses: actions/upload-artifact@v4
+ with:
+ name: tsfile-wheels-${{ matrix.name }}
+ path: wheelhouse/*.whl
+
+ # ── Windows: build C++ once, then build wheels for each Python version ──
+ build-windows-cpp:
+ name: Build C++ core (Windows)
+ runs-on: windows-2022
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v4
+ with:
+ submodules: false
+ fetch-depth: 0
+
+ - name: Set up Java 17
+ uses: actions/setup-java@v4
+ with:
+ distribution: temurin
+ java-version: "17"
+
+ - name: Set up MSYS2 / MinGW
+ uses: msys2/setup-msys2@v2
+ with:
+ msystem: MINGW64
+ update: true
+ install: >-
+ mingw-w64-x86_64-gcc
+ mingw-w64-x86_64-cmake
+ mingw-w64-x86_64-make
+ make
+
+ - name: Build C++ core via Maven
+ shell: msys2 {0}
+ run: |
+ set -euxo pipefail
+ export JAVA_HOME="$(cygpath "$JAVA_HOME")"
+ export PATH="$JAVA_HOME/bin:$PATH"
+ java -version
+ chmod +x mvnw || true
+ ./mvnw -Pwith-cpp clean package \
+ -DskipTests -Dbuild.test=OFF \
+ -Dspotless.check.skip=true -Dspotless.apply.skip=true
+ test -d cpp/target/build/lib
+ test -d cpp/target/build/include
+
+ - name: Upload C++ build output
+ uses: actions/upload-artifact@v4
+ with:
+ name: tsfile-cpp-windows
+ path: |
+ cpp/target/build/lib/
+ cpp/target/build/include/
+
+ build-windows-wheels:
+ name: Build wheel (Windows, Python ${{ matrix.python-version }})
+ needs: build-windows-cpp
+ runs-on: windows-2022
+ strategy:
+ fail-fast: false
+ matrix:
+ python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v4
+ with:
+ submodules: false
+ fetch-depth: 0
+
+ - name: Set up Python ${{ matrix.python-version }}
+ uses: actions/setup-python@v4
+ with:
+ python-version: ${{ matrix.python-version }}
+
+ - name: Set up Java 17
+ uses: actions/setup-java@v4
+ with:
+ distribution: temurin
+ java-version: "17"
+
+ - name: Set up MSYS2 / MinGW
+ uses: msys2/setup-msys2@v2
+ with:
+ msystem: MINGW64
+ update: false
+ install: >-
+ mingw-w64-x86_64-gcc
+ mingw-w64-x86_64-make
+ make
+
+ - name: Download C++ build output
+ uses: actions/download-artifact@v4
+ with:
+ name: tsfile-cpp-windows
+ path: cpp/target/build/
+
+ - name: Build wheel
+ shell: msys2 {0}
+ run: |
+ set -euxo pipefail
+ export JAVA_HOME="$(cygpath "$JAVA_HOME")"
+ export PYTHON_HOME="$(cygpath "$pythonLocation")"
+ export PATH="$PYTHON_HOME:$PYTHON_HOME/Scripts:$JAVA_HOME/bin:$PATH"
+
+ # Build wheel via Maven (no clean — keep C++ artifacts from previous job)
+ chmod +x mvnw || true
+ cd python
+ ../mvnw package -DskipTests \
+ -Dspotless.check.skip=true -Dspotless.apply.skip=true
+ ls -la dist/
+
+ - name: Repair wheel (bundle MinGW runtime DLLs)
+ shell: bash
+ run: |
+ set -euxo pipefail
+ python -m pip install delvewheel
+ MINGW_BIN="C:\\msys64\\mingw64\\bin"
+ PKG_DIR="python\\tsfile"
+ mkdir -p python/dist/repaired
+ for whl in python/dist/*.whl; do
+ delvewheel repair "$whl" \
+ --add-path "$MINGW_BIN;$PKG_DIR" \
+ -w python/dist/repaired
+ done
+ rm python/dist/*.whl
+ mv python/dist/repaired/*.whl python/dist/
+ rm -rf python/dist/repaired
+ ls -la python/dist/
+
+ - name: Verify wheel
+ shell: bash
+ run: |
+ python -m pip install python/dist/*.whl
+ python -c "import tsfile, tsfile.tsfile_reader as r; print('import-ok')"
+
+ - name: Upload wheel
+ uses: actions/upload-artifact@v4
+ with:
+ name: tsfile-wheels-windows-py${{ matrix.python-version }}
+ path: python/dist/*.whl
+
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index c85150d8f..244faef2f 100755
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -1,4 +1,4 @@
-#[[
+#[[
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
diff --git a/cpp/pom.xml b/cpp/pom.xml
index b31b2dc12..01cc840e4 100644
--- a/cpp/pom.xml
+++ b/cpp/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-parent</artifactId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.0</version>
</parent>
<artifactId>tsfile-cpp</artifactId>
<packaging>pom</packaging>
@@ -163,16 +163,6 @@
</plugins>
</build>
<profiles>
- <profile>
- <id>linux-install-uuid-dev</id>
- <activation>
- <os>
- <family>unix</family>
- <name>Linux</name>
- </os>
- </activation>
- </profile>
- <!-- When running on jenkins, download the sonar build-wrapper, so we can do a code analysis -->
<profile>
<id>jenkins-build</id>
<!-- This is needed by the groovy hack script -->
diff --git a/java/common/pom.xml b/java/common/pom.xml
index 264bdd085..7fd8e2d2c 100644
--- a/java/common/pom.xml
+++ b/java/common/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-java</artifactId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.0</version>
</parent>
<artifactId>common</artifactId>
<name>TsFile: Java: Common</name>
diff --git a/java/examples/pom.xml b/java/examples/pom.xml
index 264b46f03..90621665d 100644
--- a/java/examples/pom.xml
+++ b/java/examples/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-java</artifactId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.0</version>
</parent>
<artifactId>examples</artifactId>
<name>TsFile: Java: Examples</name>
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile</artifactId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.0</version>
</dependency>
</dependencies>
<build>
diff --git a/java/pom.xml b/java/pom.xml
index 7587a67e5..56ae44872 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -24,10 +24,10 @@
<parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-parent</artifactId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.0</version>
</parent>
<artifactId>tsfile-java</artifactId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.0</version>
<packaging>pom</packaging>
<name>TsFile: Java</name>
<modules>
diff --git a/java/tools/pom.xml b/java/tools/pom.xml
index 42ba58b0c..cc45b1e56 100644
--- a/java/tools/pom.xml
+++ b/java/tools/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-java</artifactId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.0</version>
</parent>
<artifactId>tools</artifactId>
<name>TsFile: Java: Tools</name>
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.apache.tsfile</groupId>
<artifactId>common</artifactId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.0</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile</artifactId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.0</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
diff --git a/java/tsfile/pom.xml b/java/tsfile/pom.xml
index a3d919f2a..cea669e1d 100644
--- a/java/tsfile/pom.xml
+++ b/java/tsfile/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-java</artifactId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.0</version>
</parent>
<artifactId>tsfile</artifactId>
<name>TsFile: Java: TsFile</name>
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.tsfile</groupId>
<artifactId>common</artifactId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.0</version>
</dependency>
<dependency>
<groupId>com.github.luben</groupId>
diff --git a/pom.xml b/pom.xml
index cb06548b4..fb18eaca6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
</parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-parent</artifactId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.0</version>
<packaging>pom</packaging>
<name>Apache TsFile Project Parent POM</name>
<properties>
@@ -135,6 +135,10 @@
<exclude>**/tsfile.egg-info/**</exclude>
<!-- Exclude third_party-->
<exclude>**/third_party/**</exclude>
+ <exclude>**/.python-version</exclude>
+ <exclude>**/**venv-py**/**</exclude>
+ <exclude>**/.python-version</exclude>
+ <exclude>python/.python-version</exclude>
</excludes>
</configuration>
</plugin>
@@ -445,6 +449,8 @@
<indentSize>4</indentSize>
<excludes>
<exclude>**/target/**</exclude>
+ <exclude>python/.python-version</exclude>
+ <exclude>**/.python-version</exclude>
</excludes>
</configuration>
</execution>
@@ -751,8 +757,8 @@
<os.suffix>win</os.suffix>
<os.classifier>windows-amd64</os.classifier>
<cmake.generator>MinGW Makefiles</cmake.generator>
- <python.venv.bin>venv/Scripts/</python.venv.bin>
- <python.exe.bin>python</python.exe.bin>
+ <python.venv.bin/>
+ <python.exe.bin>python.exe</python.exe.bin>
</properties>
</profile>
<!-- profile for windows aarch64 (mainly VM on newer Mac) (Self-Enabling) -->
diff --git a/python/VersionUpdater.groovy b/python/VersionUpdater.groovy
index ee3eab2b8..a586fe936 100644
--- a/python/VersionUpdater.groovy
+++ b/python/VersionUpdater.groovy
@@ -21,13 +21,15 @@
// Synchronize the version in setup.py and the one used in the maven pom.
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-def pyProjectFile = new File(project.basedir, "setup.py")
def currentMavenVersion = project.version as String
def currentPyVersion = currentMavenVersion
if(currentMavenVersion.contains("-SNAPSHOT")) {
currentPyVersion = currentMavenVersion.split("-SNAPSHOT")[0] + ".dev"
}
println "Current Project Version in Maven: " + currentMavenVersion
+
+// Sync setup.py
+def pyProjectFile = new File(project.basedir, "setup.py")
def match = pyProjectFile.text =~ /version\s*=\s*"(.*?)"/
def pyProjectFileVersion = match[0][1]
println "Current Project Version in setup.py: " + pyProjectFileVersion
@@ -35,7 +37,21 @@ println "Current Project Version in setup.py: " + pyProjectFileVersion
if (pyProjectFileVersion != currentPyVersion) {
pyProjectFile.text = pyProjectFile.text.replace("version = \"" + pyProjectFileVersion + "\"", "version = \"" + currentPyVersion + "\"")
println "Version in setup.py updated from " + pyProjectFileVersion + " to " + currentPyVersion
- // TODO: When releasing, we might need to manually add this file to the release preparation commit.
} else {
println "Version in setup.py is up to date"
}
+
+// Sync pyproject.toml
+def pyprojectTomlFile = new File(project.basedir, "pyproject.toml")
+if (pyprojectTomlFile.exists()) {
+ def tomlMatch = pyprojectTomlFile.text =~ /version\s*=\s*"(.*?)"/
+ def tomlVersion = tomlMatch[0][1]
+ println "Current Project Version in pyproject.toml: " + tomlVersion
+
+ if (tomlVersion != currentPyVersion) {
+ pyprojectTomlFile.text = pyprojectTomlFile.text.replaceFirst("version = \"" + tomlVersion + "\"", "version = \"" + currentPyVersion + "\"")
+ println "Version in pyproject.toml updated from " + tomlVersion + " to " + currentPyVersion
+ } else {
+ println "Version in pyproject.toml is up to date"
+ }
+}
diff --git a/python/pom.xml b/python/pom.xml
index 7a39fc7aa..59907c256 100644
--- a/python/pom.xml
+++ b/python/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-parent</artifactId>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.0</version>
</parent>
<artifactId>tsfile-python</artifactId>
<packaging>pom</packaging>
@@ -41,21 +41,6 @@
<artifactId>exec-maven-plugin</artifactId>
<executions>
<!-- Create python virtual environment -->
- <execution>
- <id>python-venv</id>
- <phase>initialize</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <executable>${python.exe.bin}</executable>
- <arguments>
- <argument>-m</argument>
- <argument>venv</argument>
- <argument>${project.basedir}/venv</argument>
- </arguments>
- </configuration>
- </execution>
<execution>
<id>python-upgrade-pip</id>
<phase>initialize</phase>
@@ -63,7 +48,7 @@
<goal>exec</goal>
</goals>
<configuration>
- <executable>${python.venv.bin}${python.exe.bin}</executable>
+ <executable>${python.exe.bin}</executable>
<arguments>
<argument>-m</argument>
<argument>pip</argument>
@@ -80,7 +65,7 @@
<goal>exec</goal>
</goals>
<configuration>
- <executable>${python.venv.bin}${python.exe.bin}</executable>
+ <executable>${python.exe.bin}</executable>
<arguments>
<argument>-m</argument>
<argument>pip</argument>
@@ -97,7 +82,7 @@
<goal>exec</goal>
</goals>
<configuration>
- <executable>${python.venv.bin}${python.exe.bin}</executable>
+ <executable>${python.exe.bin}</executable>
<arguments>
<argument>setup.py</argument>
<argument>build_ext</argument>
@@ -112,7 +97,7 @@
<goal>exec</goal>
</goals>
<configuration>
- <executable>${python.venv.bin}${python.exe.bin}</executable>
+ <executable>${python.exe.bin}</executable>
<arguments>
<argument>-m</argument>
<argument>pip</argument>
@@ -121,19 +106,6 @@
</arguments>
</configuration>
</execution>
- <execution>
- <id>run-python-tests</id>
- <phase>test</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <executable>${python.venv.bin}pytest</executable>
- <arguments>
- <argument>${project.basedir}/tests</argument>
- </arguments>
- </configuration>
- </execution>
<execution>
<id>build-whl</id>
<phase>package</phase>
@@ -141,7 +113,7 @@
<goal>exec</goal>
</goals>
<configuration>
- <executable>${python.venv.bin}${python.exe.bin}</executable>
+ <executable>${python.exe.bin}</executable>
<arguments>
<argument>setup.py</argument>
<argument>bdist_wheel</argument>
diff --git a/python/pyproject.toml b/python/pyproject.toml
new file mode 100644
index 000000000..a7d275dec
--- /dev/null
+++ b/python/pyproject.toml
@@ -0,0 +1,69 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+[build-system]
+requires = [
+ "setuptools>=69",
+ "wheel",
+ "Cython>=3",
+ "numpy>=1.20"
+ ]
+
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "tsfile"
+version = "2.2.0"
+requires-python = ">=3.9"
+description = "TsFile Python"
+readme = {file = "README.md", content-type = "text/markdown"}
+maintainers = [
+ {name = "Apache TsFile Developers", email = "dev@tsfile.apache.org"}
+]
+dependencies = [
+ "numpy>=1.20",
+ "pandas>=2.0"
+]
+
+[project.urls]
+Homepage = "https://tsfile.apache.org/"
+Documentation = "https://tsfile.apache.org/zh/UserGuide/latest/QuickStart/Navigating_Time_Series_Data.html"
+Repository = "https://github.com/apache/tsfile"
+Issues = "https://github.com/apache/tsfile/issues"
+
+[tool.setuptools]
+package-dir = {"" = "."}
+
+[tool.setuptools.packages.find]
+where = ["."]
+include = ["tsfile*"]
+
+[tool.setuptools.package-data]
+tsfile = [
+ "*.pxd",
+ "*.pxi",
+ "*.so",
+ "*.so.*",
+ "*.dylib",
+ "*.dylib.*",
+ "*.dll",
+ "*.dll.a",
+ "*.lib",
+ "*.lib.a",
+ "include/**/*"
+]
diff --git a/python/requirements.txt b/python/requirements.txt
index 5b1c19aa2..dbfac3bca 100644
--- a/python/requirements.txt
+++ b/python/requirements.txt
@@ -18,8 +18,8 @@
#
cython==3.0.10
-numpy==1.26.4
-pandas==2.2.2
+numpy
+pandas
setuptools==78.1.1
wheel==0.46.2
diff --git a/python/setup.py b/python/setup.py
index 9f2a1a37a..757e657d0 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -19,151 +19,120 @@
import os
import platform
import shutil
-
+import sys
import numpy as np
+
+from pathlib import Path
from Cython.Build import cythonize
from setuptools import setup, Extension
from setuptools.command.build_ext import build_ext
-version = "2.2.1.dev"
-system = platform.system()
-
-
-def copy_tsfile_lib(source_dir, target_dir, suffix):
- lib_file_name = f"libtsfile.{suffix}"
- source = os.path.join(source_dir, lib_file_name)
- target = os.path.join(target_dir, lib_file_name)
-
- if os.path.exists(source):
- shutil.copyfile(source, target)
-
- if system == "Linux":
- link_name = os.path.join(target_dir, "libtsfile.so")
- if os.path.exists(link_name):
- os.remove(link_name)
- os.symlink(lib_file_name, link_name)
- elif system == "Darwin":
- link_name = os.path.join(target_dir, "libtsfile.dylib")
- if os.path.exists(link_name):
- os.remove(link_name)
- os.symlink(lib_file_name, link_name)
-
-
-project_dir = os.path.dirname(os.path.abspath(__file__))
-tsfile_py_include = os.path.join(project_dir, "tsfile", "include")
-
-if os.path.exists(tsfile_py_include):
- shutil.rmtree(tsfile_py_include)
-
-shutil.copytree(
- os.path.join(project_dir, "..", "cpp", "target", "build", "include"),
- os.path.join(tsfile_py_include, ""),
-)
-
-
-def copy_tsfile_header(source):
- for file in source:
- if os.path.exists(file):
- target = os.path.join(tsfile_py_include, os.path.basename(file))
- shutil.copyfile(file, target)
+ROOT = Path(__file__).parent.resolve()
+PKG = ROOT / "tsfile"
+CPP_OUT = ROOT / ".." / "cpp" / "target" / "build"
+CPP_LIB = CPP_OUT / "lib"
+CPP_INC = CPP_OUT / "include"
+version = "2.2.0"
+system = platform.system()
-## Copy C wrapper header.
-# tsfile/cpp/src/cwrapper/tsfile_cwrapper.h
-source_headers = [
- os.path.join(project_dir, "..", "cpp", "src", "cwrapper", "tsfile_cwrapper.h"),
-]
-
-copy_tsfile_header(source_headers)
-
-## Copy shared library
-tsfile_shared_source_dir = os.path.join(project_dir, "..", "cpp", "target", "build", "lib")
-tsfile_shared_dir = os.path.join(project_dir, "tsfile")
-
-if system == "Darwin":
- copy_tsfile_lib(tsfile_shared_source_dir, tsfile_shared_dir, version + ".dylib")
-elif system == "Linux":
- copy_tsfile_lib(tsfile_shared_source_dir, tsfile_shared_dir, "so." + version)
+(PKG / "include").mkdir(exist_ok=True)
+if (PKG / "include").exists() and CPP_INC.exists():
+ shutil.rmtree(PKG / "include")
+ shutil.copytree(CPP_INC, PKG / "include")
+if sys.platform.startswith("linux"):
+ candidates = sorted(CPP_LIB.glob("libtsfile.so*"), key=lambda p: len(p.name), reverse=True)
+ if not candidates:
+ raise FileNotFoundError("missing libtsfile.so* in build output")
+ src = candidates[0]
+ dst = PKG / src.name
+ shutil.copy2(src, dst)
+ link_name = PKG / "libtsfile.so"
+ shutil.copy2(src, link_name)
+
+elif sys.platform == "darwin":
+ candidates = sorted(CPP_LIB.glob("libtsfile.*.dylib")) or list(CPP_LIB.glob("libtsfile.dylib"))
+ if not candidates:
+ raise FileNotFoundError("missing libtsfile*.dylib in build output")
+ src = candidates[0]
+ dst = PKG / src.name
+ shutil.copy2(src, dst)
+ link_name = PKG / "libtsfile.dylib"
+ shutil.copy2(src, link_name)
+elif sys.platform == "win32":
+ for base_name in ("libtsfile",):
+ dll_candidates = sorted(CPP_LIB.glob(f"{base_name}*.dll"), key=lambda p: len(p.name), reverse=True)
+ dll_a_candidates = sorted(CPP_LIB.glob(f"{base_name}*.dll.a"), key=lambda p: len(p.name), reverse=True)
+
+ if not dll_candidates:
+ raise FileNotFoundError(f"missing {base_name}*.dll in build output")
+ if not dll_a_candidates:
+ raise FileNotFoundError(f"missing {base_name}*.dll.a in build output")
+
+ dll_src = dll_candidates[0]
+ dll_a_src = dll_a_candidates[0]
+
+ shutil.copy2(dll_src, PKG / f"{base_name}.dll")
+ shutil.copy2(dll_a_src, PKG / f"{base_name}.dll.a")
else:
- copy_tsfile_lib(tsfile_shared_source_dir, tsfile_shared_dir, "dll")
-
-tsfile_include_dir = os.path.join(project_dir, "tsfile", "include")
-
-ext_modules_tsfile = [
- # utils: from python to c or c to python.
- Extension(
- "tsfile.tsfile_py_cpp",
- sources=[os.path.join("tsfile", "tsfile_py_cpp.pyx")],
- libraries=["tsfile"],
- library_dirs=[tsfile_shared_dir],
- include_dirs=[tsfile_include_dir, np.get_include()],
- runtime_library_dirs=[tsfile_shared_dir] if system != "Windows" else None,
- extra_compile_args=(
- ["-std=c++11"] if system != "Windows" else ["-std=c++11", "-DMS_WIN64"]
- ),
- language="c++",
- ),
- # query data and describe schema: tsfile reader module
- Extension(
- "tsfile.tsfile_reader",
- sources=[os.path.join("tsfile", "tsfile_reader.pyx")],
- libraries=["tsfile"],
- library_dirs=[tsfile_shared_dir],
- depends=[os.path.join("tsfile", "tsfile_py_cpp.pxd")],
- include_dirs=[tsfile_include_dir, np.get_include()],
- runtime_library_dirs=[tsfile_shared_dir] if system != "Windows" else None,
- extra_compile_args=(
- ["-std=c++11"] if system != "Windows" else ["-std=c++11", "-DMS_WIN64"]
- ),
- language="c++",
- ),
- # write data and register schema: tsfile writer module
- Extension(
- "tsfile.tsfile_writer",
- sources=[os.path.join("tsfile", "tsfile_writer.pyx")],
- libraries=["tsfile"],
- library_dirs=[tsfile_shared_dir],
- depends=[os.path.join("tsfile", "tsfile_py_cpp.pxd")],
- include_dirs=[tsfile_include_dir, np.get_include()],
- runtime_library_dirs=[tsfile_shared_dir] if system != "Windows" else None,
- extra_compile_args=(
- ["-std=c++11"] if system != "Windows" else ["-std=c++11", "-DMS_WIN64"]
- ),
- language="c++",
- )
-]
+ raise RuntimeError(f"Unsupported platform: {sys.platform}")
class BuildExt(build_ext):
- def build_extensions(self):
- numpy_include = np.get_include()
- for ext in self.extensions:
- ext.include_dirs.append(numpy_include)
- super().build_extensions()
+ def run(self):
+ super().run()
def finalize_options(self):
- if system == "Windows":
+ if sys.platform == "win32":
self.compiler = "mingw32"
super().finalize_options()
+extra_compile_args = []
+extra_link_args = []
+runtime_library_dirs = []
+libraries = []
+library_dirs = [str(PKG)]
+include_dirs = [str(PKG), np.get_include(), str(PKG / "include")]
+
+if sys.platform.startswith("linux"):
+ libraries = ["tsfile"]
+ extra_compile_args += ["-O3", "-std=c++11", "-fvisibility=hidden", "-fPIC"]
+ runtime_library_dirs = ["$ORIGIN"]
+ extra_link_args += ["-Wl,-rpath,$ORIGIN"]
+elif sys.platform == "darwin":
+ libraries = ["tsfile"]
+ extra_compile_args += ["-O3", "-std=c++11", "-fvisibility=hidden", "-fPIC"]
+ extra_link_args += ["-Wl,-rpath,@loader_path", "-stdlib=libc++"]
+elif sys.platform == "win32":
+ libraries = ["Tsfile"]
+ extra_compile_args += ["-O2", "-std=c++11", "-DSIZEOF_VOID_P=8", "-D__USE_MINGW_ANSI_STDIO=1", "-DMS_WIN64",
+ "-D_WIN64"]
+else:
+ raise RuntimeError(f"Unsupported platform: {sys.platform}")
+
+common = dict(
+ language="c++",
+ include_dirs=include_dirs,
+ library_dirs=library_dirs,
+ libraries=libraries,
+ extra_compile_args=extra_compile_args,
+ extra_link_args=extra_link_args,
+ runtime_library_dirs=runtime_library_dirs,
+)
+
+exts = [
+ Extension("tsfile.tsfile_py_cpp", ["tsfile/tsfile_py_cpp.pyx"], **common),
+ Extension("tsfile.tsfile_reader", ["tsfile/tsfile_reader.pyx"], **common),
+ Extension("tsfile.tsfile_writer", ["tsfile/tsfile_writer.pyx"], **common),
+]
+
setup(
name="tsfile",
version=version,
- description="Tsfile reader and writer for python",
- url="https://tsfile.apache.org",
- author='"Apache TsFile"',
packages=["tsfile"],
- license="Apache 2.0",
- ext_modules=cythonize(ext_modules_tsfile),
- cmdclass={"build_ext": BuildExt},
- include_dirs=[np.get_include()],
- package_dir={"tsfile": "./tsfile"},
- package_data={
- "tsfile": [
- "libtsfile.*",
- "*.pxd"
- ]
- },
+ package_dir={"": "."},
include_package_data=True,
+ ext_modules=cythonize(exts, compiler_directives={"language_level": 3}),
+ cmdclass={"build_ext": BuildExt},
)
diff --git a/python/tsfile/__init__.py b/python/tsfile/__init__.py
index a9237257b..f1077619f 100644
--- a/python/tsfile/__init__.py
+++ b/python/tsfile/__init__.py
@@ -19,9 +19,17 @@
import ctypes
import os
import platform
-system = platform.system()
-if system == "Windows":
- ctypes.WinDLL(os.path.join(os.path.dirname(__file__), "libtsfile.dll"), winmode=0)
+import sys
+
+if sys.platform == "win32":
+ _pkg_dir = os.path.dirname(os.path.abspath(__file__))
+ # Register package dir for DLL search (local development)
+ os.add_dll_directory(_pkg_dir)
+ os.environ["PATH"] = _pkg_dir + os.pathsep + os.environ.get("PATH", "")
+ # Register .libs dir for DLL search (wheel install via delvewheel)
+ _libs_dir = os.path.join(_pkg_dir, ".libs")
+ if os.path.isdir(_libs_dir):
+ os.add_dll_directory(_libs_dir)
from .constants import *
from .schema import *
diff --git a/python/tsfile/tsfile_cpp.pxd b/python/tsfile/tsfile_cpp.pxd
index 9c65fb26f..f90b23089 100644
--- a/python/tsfile/tsfile_cpp.pxd
+++ b/python/tsfile/tsfile_cpp.pxd
@@ -22,7 +22,7 @@ from libc.stdint cimport uint32_t, int32_t, int64_t, uint64_t, uint8_t
ctypedef int32_t ErrorCode
# import symbols from tsfile_cwrapper.h
-cdef extern from "./tsfile_cwrapper.h":
+cdef extern from "cwrapper/tsfile_cwrapper.h":
# common
ctypedef int64_t timestamp
@@ -215,7 +215,7 @@ cdef extern from "./tsfile_cwrapper.h":
-cdef extern from "./common/config/config.h" namespace "common":
+cdef extern from "common/config/config.h" namespace "common":
cdef cppclass ConfigValue:
uint32_t tsblock_mem_inc_step_size_
uint32_t tsblock_max_memory_
@@ -237,7 +237,7 @@ cdef extern from "./common/config/config.h" namespace "common":
uint8_t string_encoding_type_;
uint8_t default_compression_type_;
-cdef extern from "./common/global.h" namespace "common":
+cdef extern from "common/global.h" namespace "common":
ConfigValue g_config_value_
int set_datatype_encoding(uint8_t data_type, uint8_t encoding)
int set_global_compression(uint8_t compression)