This is an automated email from the ASF dual-hosted git repository. colinlee pushed a commit to branch fix_release_for_python_pypi_for_read_tree in repository https://gitbox.apache.org/repos/asf/tsfile.git
commit 44c4d1f26978c4dc1c58edf847e3fd30be21720e Author: shuolin_l <[email protected]> AuthorDate: Thu Nov 6 15:13:12 2025 +0800 bump version . --- cpp/pom.xml | 2 +- pom.xml | 11 ++++++---- python/pom.xml | 56 +++++---------------------------------------------- python/pyproject.toml | 2 +- python/setup.py | 2 +- 5 files changed, 15 insertions(+), 58 deletions(-) diff --git a/cpp/pom.xml b/cpp/pom.xml index 572b8cd2..390a0b87 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.0-SNAPSHOT</version> + <version>2.1.4</version> </parent> <artifactId>tsfile-cpp</artifactId> <packaging>pom</packaging> diff --git a/pom.xml b/pom.xml index dbd4143b..208c5755 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ </parent> <groupId>org.apache.tsfile</groupId> <artifactId>tsfile-parent</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>2.1.4</version> <packaging>pom</packaging> <name>Apache TsFile Project Parent POM</name> <properties> @@ -137,6 +137,8 @@ <exclude>**/third_party/**</exclude> <exclude>**/.python-version</exclude> <exclude>**/**venv-py**/**</exclude> + <exclude>**/.python-version</exclude> + <exclude>python/.python-version</exclude> </excludes> </configuration> </plugin> @@ -447,6 +449,8 @@ <indentSize>4</indentSize> <excludes> <exclude>**/target/**</exclude> + <exclude>python/.python-version</exclude> + <exclude>**/.python-version</exclude> </excludes> </configuration> </execution> @@ -589,7 +593,6 @@ <profile> <id>with-python</id> <modules> - <module>cpp</module> <module>python</module> </modules> </profile> @@ -753,8 +756,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/pom.xml b/python/pom.xml index 8474470b..8c7b478e 100644 --- a/python/pom.xml +++ b/python/pom.xml @@ -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> @@ -90,24 +75,6 @@ </arguments> </configuration> </execution> - <execution> - <id>python-install-wheel</id> - <phase>validate</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <executable>${python.venv.bin}${python.exe.bin}</executable> - <arguments> - <argument>-m</argument> - <argument>pip</argument> - <argument>install</argument> - <argument>--only-binary=:all:</argument> - <argument>--no-deps</argument> - <argument>${project.basedir}/dist/tsfile-*.whl</argument> - </arguments> - </configuration> - </execution> <execution> <id>compile-python-code</id> <phase>compile</phase> @@ -115,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> @@ -130,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> @@ -139,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> @@ -159,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 index cb8d098d..09a80bdd 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -28,7 +28,7 @@ build-backend = "setuptools.build_meta" [project] name = "tsfile" -version = "2.1.2" +version = "2.1.4" requires-python = ">=3.9" description = "TsFile Python" readme = {file = "README.md", content-type = "text/markdown"} diff --git a/python/setup.py b/python/setup.py index a80ef7eb..f7b1f9bd 100644 --- a/python/setup.py +++ b/python/setup.py @@ -33,7 +33,7 @@ CPP_OUT = ROOT / ".." / "cpp" / "target" / "build" CPP_LIB = CPP_OUT / "lib" CPP_INC = CPP_OUT / "include" -version = "2.1.2" +version = "2.2.0.dev" system = platform.system() (PKG / "include").mkdir(exist_ok=True)
