This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch ht/playgrand
in repository https://gitbox.apache.org/repos/asf/tsfile.git
The following commit(s) were added to refs/heads/ht/playgrand by this push:
new 664c7c0f fix error
664c7c0f is described below
commit 664c7c0f3b65544eb98679cfd1fbdedaea74175c
Author: HTHou <[email protected]>
AuthorDate: Fri Jul 12 16:32:36 2024 +0800
fix error
---
.github/workflows/unit-test.yml | 8 --------
python/setup.py | 2 +-
2 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
index 9414fc4e..0d525ccd 100644
--- a/.github/workflows/unit-test.yml
+++ b/.github/workflows/unit-test.yml
@@ -78,14 +78,6 @@ jobs:
core.setOutput('platform_suffix', ``)
}
- # Use python 3.12 to avoid Cython files don't compile on Mingw-w64 64-bit
- # https://bugs.python.org/issue40167
-# - name: Set up python 3.12 for windows
-# if: ${{ matrix.os == 'windows-latest'}}
-# uses: actions/setup-python@v5
-# with:
-# python-version: '3.12'
-
# Run the actual maven build including all unit- and integration-tests.
- name: Build and test with Maven (All others)
shell: bash
diff --git a/python/setup.py b/python/setup.py
index b9c40a4d..a356000c 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -80,7 +80,7 @@ ext_modules_tsfile = [
library_dirs=[libtsfile_dir],
include_dirs=[include_dir, np.get_include()],
runtime_library_dirs=[libtsfile_dir] if platform.system() != "Windows"
else None,
- extra_compile_args=["-std=c++11"],
+ extra_compile_args=["-std=c++11"] if platform.system() != "Windows"
else ["-std=c++11", "-DMS_WIN64"],
language="c++",
)
]
