diff --git a/.github/workflows/2.x-aarch64.yml b/.github/workflows/2.x-aarch64.yml index 78dd6804..4adeb404 100644 --- a/.github/workflows/2.x-aarch64.yml +++ b/.github/workflows/2.x-aarch64.yml @@ -171,7 +171,7 @@ jobs: apt update -y > /dev/null apt install python3 python3-pip -y > /dev/null pip3 install --upgrade pip > /dev/null - pip3 install numpy psutil pandas faker toml > /dev/null + pip3 install decorator numpy psutil pandas faker toml > /dev/null pip3 install taospy > /dev/null pip3 install fabric2 > /dev/null diff --git a/.github/workflows/2.x-archlinux-release.yml b/.github/workflows/2.x-archlinux-release.yml index 91c174dc..061ba74a 100644 --- a/.github/workflows/2.x-archlinux-release.yml +++ b/.github/workflows/2.x-archlinux-release.yml @@ -172,7 +172,7 @@ jobs: && github.event_name == 'pull_request') || github.event_name == 'push' run: | - pip3 install numpy fabric2 psutil pandas faker toml > /dev/null 2>&1 + pip3 install decorator numpy fabric2 psutil pandas faker toml > /dev/null pip3 install taospy > /dev/null cd TDengine/tests/pytest diff --git a/.github/workflows/2.x-centos-release.yml b/.github/workflows/2.x-centos-release.yml index b57f561e..7bdb9b1e 100644 --- a/.github/workflows/2.x-centos-release.yml +++ b/.github/workflows/2.x-centos-release.yml @@ -178,7 +178,7 @@ jobs: && github.event_name == 'pull_request') || github.event_name == 'push' run: | - pip3 install numpy fabric2 psutil pandas faker toml > /dev/null 2>&1 + pip3 install decorator numpy fabric2 psutil pandas faker toml > /dev/null pip3 install taospy > /dev/null cd TDengine/tests/pytest diff --git a/.github/workflows/2.x-macos-debug.yml b/.github/workflows/2.x-macos-debug.yml index e70eece6..85110fde 100644 --- a/.github/workflows/2.x-macos-debug.yml +++ b/.github/workflows/2.x-macos-debug.yml @@ -101,7 +101,7 @@ jobs: # - name: Func Test # run: | # cd TDengine/tests/pytest - # pip3 install taospy numpy fabric2 psutil pandas faker toml > /dev/null 2>&1 + # pip3 install decorator taospy numpy fabric2 psutil pandas faker toml > /dev/null # sudo pkill -9 taosadapter || : # sudo pkill -9 taosd || : # diff --git a/.github/workflows/2.x-macos-release.yml b/.github/workflows/2.x-macos-release.yml index 0aa70679..064d2568 100644 --- a/.github/workflows/2.x-macos-release.yml +++ b/.github/workflows/2.x-macos-release.yml @@ -101,7 +101,7 @@ jobs: # - name: Func Test # run: | # cd TDengine/tests/pytest - # pip3 install taospy numpy fabric2 psutil pandas faker toml > /dev/null 2>&1 + # pip3 install decorator taospy numpy fabric2 psutil pandas faker toml > /dev/null # sudo pkill -9 taosadapter || : # sudo pkill -9 taosd || : # diff --git a/.github/workflows/2.x-taosbenchmark-debug.yml b/.github/workflows/2.x-taosbenchmark-debug.yml index c7b1eaa5..bec9d897 100644 --- a/.github/workflows/2.x-taosbenchmark-debug.yml +++ b/.github/workflows/2.x-taosbenchmark-debug.yml @@ -97,7 +97,7 @@ jobs: echo "taos-tools build failure" exit 1 fi - pip3 install numpy fabric2 psutil pandas faker toml taospy > /dev/null + pip3 install decorator numpy fabric2 psutil pandas faker toml taospy > /dev/null sudo pkill -9 taosadapter || : sudo pkill -9 taosd || : diff --git a/.github/workflows/2.x-taosbenchmark-release.yml b/.github/workflows/2.x-taosbenchmark-release.yml index aed9cc75..6c16bc82 100644 --- a/.github/workflows/2.x-taosbenchmark-release.yml +++ b/.github/workflows/2.x-taosbenchmark-release.yml @@ -96,7 +96,7 @@ jobs: echo "taos-tools build failure" exit 1 fi - pip3 install numpy fabric2 psutil pandas faker toml taospy > /dev/null + pip3 install decorator numpy fabric2 psutil pandas faker toml taospy > /dev/null - name: taosBenchmark Test if: steps.changed-files-specific.outputs.any_changed == 'true' diff --git a/.github/workflows/2.x-taosdump-debug.yml b/.github/workflows/2.x-taosdump-debug.yml index 613b634f..115b334b 100644 --- a/.github/workflows/2.x-taosdump-debug.yml +++ b/.github/workflows/2.x-taosdump-debug.yml @@ -100,8 +100,7 @@ jobs: echo "taos-tools build failure" exit 1 fi - pip3 install numpy fabric2 psutil pandas faker toml > /dev/null - pip3 install git+https://github.com/taosdata/taos-connector-python > /dev/null + pip3 install decorator numpy fabric2 psutil pandas faker toml taospy > /dev/null - name: taosdump Func Test if: steps.changed-files-specific.outputs.any_changed == 'true' diff --git a/.github/workflows/2.x-taosdump-release.yml b/.github/workflows/2.x-taosdump-release.yml index 5f7d5326..a684a395 100644 --- a/.github/workflows/2.x-taosdump-release.yml +++ b/.github/workflows/2.x-taosdump-release.yml @@ -106,8 +106,7 @@ jobs: echo "taos-tools build failure" exit 1 fi - pip3 install numpy fabric2 psutil pandas faker toml > /dev/null 2>&1 - pip3 install git+https://github.com/taosdata/taos-connector-python > /dev/null + pip3 install decorator numpy fabric2 psutil pandas faker toml taospy > /dev/null - name: taosdump Func Test if: steps.changed-files-specific.outputs.any_changed == 'true' diff --git a/.github/workflows/2.x-windows-build.yml b/.github/workflows/2.x-windows-build.yml index 766785fa..99e17fe4 100644 --- a/.github/workflows/2.x-windows-build.yml +++ b/.github/workflows/2.x-windows-build.yml @@ -90,8 +90,7 @@ jobs: # - name: Func Test # run: | # cd TDengine/tests/pytest - # pip3 install numpy fabric2 psutil pandas faker toml > /dev/null 2>&1 - # pip3 install git+https://github.com/taosdata/taos-connector-python > /dev/null + # pip3 install decorator numpy fabric2 psutil pandas faker toml taospy > /dev/null # sudo pkill -9 taosadapter || : # sudo pkill -9 taosd || : # diff --git a/.github/workflows/3.0-coveralls.yml b/.github/workflows/3.0-coveralls.yml index c78e8476..37de1fad 100644 --- a/.github/workflows/3.0-coveralls.yml +++ b/.github/workflows/3.0-coveralls.yml @@ -168,8 +168,7 @@ jobs: echo "taos-tools build failure" exit 1 fi - pip3 install numpy fabric2 psutil pandas faker toml > /dev/null - pip3 install git+https://github.com/taosdata/taos-connector-python > /dev/null + pip3 install decorator numpy fabric2 psutil pandas faker toml taospy > /dev/null - name: exp Test if: diff --git a/.github/workflows/3.0-taosbenchmark-debug.yml b/.github/workflows/3.0-taosbenchmark-debug.yml index 94a0f7be..e5737b5e 100644 --- a/.github/workflows/3.0-taosbenchmark-debug.yml +++ b/.github/workflows/3.0-taosbenchmark-debug.yml @@ -153,8 +153,7 @@ jobs: && github.event_name == 'pull_request') || github.event_name == 'push' run: | - pip3 install numpy fabric2 psutil pandas faker toml > /dev/null 2>&1 - pip3 install git+https://github.com/taosdata/taos-connector-python > /dev/null + pip3 install decorator numpy fabric2 psutil pandas faker toml taospy > /dev/null - name: Run standard test cases if: diff --git a/.github/workflows/3.0-taosbenchmark-release.yml b/.github/workflows/3.0-taosbenchmark-release.yml index 37a75e24..3d2110ac 100644 --- a/.github/workflows/3.0-taosbenchmark-release.yml +++ b/.github/workflows/3.0-taosbenchmark-release.yml @@ -153,8 +153,7 @@ jobs: && github.event_name == 'pull_request') || github.event_name == 'push' run: | - pip3 install numpy fabric2 psutil pandas faker toml > /dev/null 2>&1 - pip3 install git+https://github.com/taosdata/taos-connector-python > /dev/null + pip3 install decorator numpy fabric2 psutil pandas faker toml taospy > /dev/null - name: Run standard test cases if: diff --git a/.github/workflows/3.0-taosdump-debug.yml b/.github/workflows/3.0-taosdump-debug.yml index 54524e3a..32815f89 100644 --- a/.github/workflows/3.0-taosdump-debug.yml +++ b/.github/workflows/3.0-taosdump-debug.yml @@ -140,8 +140,7 @@ jobs: && github.event_name == 'pull_request') || github.event_name == 'push' run: | - pip3 install numpy fabric2 psutil pandas faker toml > /dev/null - pip3 install git+https://github.com/taosdata/taos-connector-python > /dev/null + pip3 install decorator numpy fabric2 psutil pandas faker toml taospy > /dev/null - name: taosdump old Test if: diff --git a/.github/workflows/3.0-taosdump-release-ws.yml b/.github/workflows/3.0-taosdump-release-ws.yml index 574b8924..f2644566 100644 --- a/.github/workflows/3.0-taosdump-release-ws.yml +++ b/.github/workflows/3.0-taosdump-release-ws.yml @@ -175,8 +175,7 @@ jobs: && github.event_name == 'pull_request') || github.event_name == 'push' run: | - pip3 install numpy fabric2 psutil pandas faker toml > /dev/null - pip3 install git+https://github.com/taosdata/taos-connector-python > /dev/null + pip3 install decorator numpy fabric2 psutil pandas faker toml taospy > /dev/null - name: taosdump Develop Test if: diff --git a/.github/workflows/3.0-taosdump-release.yml b/.github/workflows/3.0-taosdump-release.yml index f7106abd..9118672c 100644 --- a/.github/workflows/3.0-taosdump-release.yml +++ b/.github/workflows/3.0-taosdump-release.yml @@ -140,8 +140,7 @@ jobs: && github.event_name == 'pull_request') || github.event_name == 'push' run: | - pip3 install numpy fabric2 psutil pandas faker toml > /dev/null - pip3 install git+https://github.com/taosdata/taos-connector-python > /dev/null + pip3 install decorator numpy fabric2 psutil pandas faker toml taospy > /dev/null - name: taosdump old Test if: diff --git a/.github/workflows/3.0-windows-build.yml b/.github/workflows/3.0-windows-build.yml index f72f53ea..59489e82 100644 --- a/.github/workflows/3.0-windows-build.yml +++ b/.github/workflows/3.0-windows-build.yml @@ -64,7 +64,7 @@ jobs: with: repository: 'taosdata/TDengine' path: 'TDengine' - ref: 'fix/sangshuduo/taosbenchmark-stb-rest-socket-main' + ref: 'main' - name: create debug directory if: | @@ -141,8 +141,7 @@ jobs: # - name: Func Test # run: | # cd TDengine/tests/pytest - # pip3 install numpy fabric2 psutil pandas faker toml > /dev/null 2>&1 - # pip3 install git+https://github.com/taosdata/taos-connector-python > /dev/null + # pip3 install decorator numpy fabric2 psutil pandas faker toml taospy > /dev/null # sudo pkill -9 taosadapter || : # sudo pkill -9 taosd || : # diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 17c1f65f..08a9d73c 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -86,8 +86,7 @@ jobs: sleep 10 ctest --verbose cd ../../../../tests/pytest - pip3 install numpy fabric2 psutil pandas faker toml > /dev/null - pip3 install git+https://github.com/taosdata/taos-connector-python > /dev/null + pip3 install decorator numpy fabric2 psutil pandas faker toml taospy > /dev/null sudo pkill -9 taosadapter || : sudo pkill -9 taosd || : python3 ./test.py -f tools/taosdumpTest.py diff --git a/.github/workflows/coveralls.yml b/.github/workflows/coveralls.yml index c143e438..2b49fac8 100644 --- a/.github/workflows/coveralls.yml +++ b/.github/workflows/coveralls.yml @@ -143,8 +143,7 @@ jobs: echo "taos-tools build failure" exit 1 fi - pip3 install numpy fabric2 psutil pandas faker toml > /dev/null - pip3 install git+https://github.com/taosdata/taos-connector-python > /dev/null + pip3 install decorator numpy fabric2 psutil pandas faker toml taospy > /dev/null - name: exp Test if: steps.changed-files-specific.outputs.any_changed == 'true'