Merge 3.0 to main 0206 for Python Connector

.github/workflows/mac.yml

@@ -197,6 +197,7 @@ jobs:
       - name: Install Poetry
         uses: snok/install-poetry@v1
         with:
+          version: 1.8.5
           virtualenvs-create: true
           virtualenvs-in-project: true
           installer-parallel: true
@@ -281,7 +282,7 @@ jobs:
 
       - name: Checkout Connector
         uses: actions/checkout@v4
-
+    
       - name: Cache Poetry
         id: cache-poetry
         uses: actions/cache@v4
@@ -295,6 +296,7 @@ jobs:
       - name: Install Poetry
         uses: snok/install-poetry@v1
         with:
+          version: 1.8.5
           virtualenvs-create: true
           virtualenvs-in-project: true
           installer-parallel: true

.github/workflows/release.yml

@@ -62,13 +62,13 @@ jobs:
         run: |
           sudo apt install -y gnome-keyring
           pip3 install --upgrade requests
-          poetry install --no-interaction --no-root
+          poetry install --no-interaction --with=test --no-root
 
       #----------------------------------------------
       # install your root project, if required
       #----------------------------------------------
       - name: Install library
-        run: poetry install --no-interaction
+        run: poetry install --no-interaction --with=test
 
       - name: Set up Go
         uses: actions/setup-go@v2
@@ -103,7 +103,6 @@ jobs:
         run: |
           export LD_LIBRARY_PATH=$PWD/TDengine/build/build/lib
           export TDENGINE_URL=localhost:6041
-          poetry run pip install psutil pandas "numpy<2.0.0" shapely
           poetry run pytest tests
       - name: Build Artifacts
         run: |

.github/workflows/test-td-case.yml

@@ -15,14 +15,15 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Check out repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
 
-      - name: Build tools
+      - name: Setup build tools
         run: |
-          sudo apt-get update -y
-          sudo apt-get install -y build-essential cmake libgeos-dev
-
+          sudo apt update -y
+          sudo apt install -y build-essential cmake \
+              libgeos-dev libjansson-dev libsnappy-dev liblzma-dev libz-dev \
+              zlib1g-dev pkg-config libssl-dev gawk
 
       - name: Set up python
         run: |
@@ -42,6 +43,7 @@ jobs:
       - name: Install Poetry
         uses: snok/install-poetry@v1
         with:
+          version: 1.8.5
           virtualenvs-create: true
           virtualenvs-in-project: true
           installer-parallel: true
@@ -61,13 +63,13 @@ jobs:
       #----------------------------------------------
       - name: Install dependencies
         if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
-        run: poetry install --no-interaction --no-root
+        run: poetry install --no-interaction --with=test --no-root
 
       #----------------------------------------------
       # install your root project, if required
       #----------------------------------------------
       - name: Install library
-        run: poetry install --no-interaction
+        run: poetry install --no-interaction --with=test
 
       #----------------------------------------------
       # build your TDengine 3.0
@@ -81,7 +83,7 @@ jobs:
           if_false: '3.0'
 
       - name: Checkout tdengine
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           repository: "taosdata/TDengine"
           path: "TDengine_v3"

.github/workflows/test-ubuntu-2004.yml

@@ -15,20 +15,19 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Check out repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-
-      - name: Build tools
+      - name: Setup build tools
         run: |
-          sudo apt-get update -y
-          sudo apt-get install -y build-essential cmake libgeos-dev git libssl-dev libgflags2.2 libgflags-dev libsnappy-dev libjansson-dev
-
+          sudo apt update -y
+          sudo apt install -y build-essential cmake \
+              libgeos-dev libjansson-dev libsnappy-dev liblzma-dev libz-dev \
+              zlib1g-dev pkg-config libssl-dev gawk
 
       - name: Set up python
         run: |
           python --version
 
-
       - name: Cache Poetry
         id: cache-poetry
         uses: actions/[email protected]
@@ -42,6 +41,7 @@ jobs:
       - name: Install Poetry
         uses: snok/install-poetry@v1
         with:
+          version: 1.8.5
           virtualenvs-create: true
           virtualenvs-in-project: true
           installer-parallel: true
@@ -61,13 +61,13 @@ jobs:
       #----------------------------------------------
       - name: Install dependencies
         if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
-        run: poetry install --no-interaction --no-root
+        run: poetry install --no-interaction --with=test --no-root
 
       #----------------------------------------------
       # install your root project, if required
       #----------------------------------------------
       - name: Install library
-        run: poetry install --no-interaction
+        run: poetry install --no-interaction --with=test
 
       #----------------------------------------------
       # build your TDengine 3.0
@@ -81,11 +81,11 @@ jobs:
           if_false: '3.0'
 
       - name: Checkout tdengine
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           repository: "taosdata/TDengine"
           path: "TDengine_v3"
-          ref:  '3.0'
+          ref:  ${{ steps.determine-branch.outputs.value }}
 
       - name: Build TDengine 3.0
         run: |
@@ -125,7 +125,6 @@ jobs:
           #source $VENV
           export TDENGINE_URL=localhost:6041
           curl -L -H "Authorization: Basic cm9vdDp0YW9zZGF0YQ==" -d "show databases" localhost:6041/rest/sql
-          poetry run pip install psutil pandas pytest-cov "numpy<2.0.0" shapely
           poetry run pytest --cov-report term --cov-report html --cov-report xml --cov=taos --cov=taosrest --cov-append tests
 
 

.github/workflows/test-ubuntu-2204.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
 
       - name: Build tools
         run: |
@@ -26,28 +26,6 @@ jobs:
         run: |
           sudo apt-get install -y python3 python3-pip python-is-python3
 
-      - name: Build TDengine 2.x
-        run: |
-          git clone --depth 1 https://github.com/taosdata/TDengine.git -b 2.6 TDengine_v2
-          cd TDengine_v2
-          git submodule update --depth 1 --init --recursive
-          mkdir build
-          cd build
-          cmake ../ -DBUILD_HTTP=false -DBUILD_JDBC=false -DBUILD_DEPENDENCY_TESTS=false -DCMAKE_INSTALL_PREFIX:PATH=`realpath ../../local/`
-          make -j14
-          cd ../../
-
-      - name: Start TDengine 2.x
-        run: |
-          tree TDengine_v2/build/build/
-          sudo mkdir -p /etc/taos/ || true
-          export C_INCLUDE_PATH=$PWD/TDengine_v2/build/build/bin
-          export LD_LIBRARY_PATH=$PWD/TDengine_v2/build/build/lib
-          mkdir -p /tmp/taos/v2/data /tmp/taos/log/v2
-          printf "dataDir /tmp/taos/v2/data\nlogDir /tmp/taos/v2/log\ndebugFlag 135\n" |sudo tee /etc/taos/taos.cfg
-          ./TDengine_v2/build/build/bin/taosadapter &
-          ./TDengine_v2/build/build/bin/taosd &
-
       - name: Cache Poetry
         id: cache-poetry
         uses: actions/[email protected]
@@ -60,6 +38,7 @@ jobs:
       - name: Install Poetry
         uses: snok/install-poetry@v1
         with:
+          version: 1.8.5
           virtualenvs-create: true
           virtualenvs-in-project: true
           installer-parallel: true
@@ -78,20 +57,45 @@ jobs:
       #----------------------------------------------
       - name: Install dependencies
         if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
-        run: poetry install --no-interaction --no-root
+        run: | 
+          poetry install --no-interaction --no-root
+          poetry run pip install "numpy<2.0.0"
 
       #----------------------------------------------
       # install your root project, if required
       #----------------------------------------------
       - name: Install library
-        run: poetry install --no-interaction
+        run: | 
+          poetry install --no-interaction --with=test
+          poetry run pip install "numpy<2.0.0"
+
+      - name: Build TDengine 2.x
+        run: |
+          git clone --depth 1 https://github.com/taosdata/TDengine.git -b 2.6 TDengine_v2
+          cd TDengine_v2
+          git submodule update --depth 1 --init --recursive
+          mkdir build
+          cd build
+          cmake ../ -DBUILD_HTTP=false -DBUILD_JDBC=false -DBUILD_DEPENDENCY_TESTS=false -DCMAKE_INSTALL_PREFIX:PATH=`realpath ../../local/`
+          make -j14
+          cd ../../
+
+      - name: Start TDengine 2.x
+        run: |
+          tree TDengine_v2/build/build/
+          sudo mkdir -p /etc/taos/ || true
+          export C_INCLUDE_PATH=$PWD/TDengine_v2/build/build/bin
+          export LD_LIBRARY_PATH=$PWD/TDengine_v2/build/build/lib
+          mkdir -p /tmp/taos/v2/data /tmp/taos/log/v2
+          printf "dataDir /tmp/taos/v2/data\nlogDir /tmp/taos/v2/log\ndebugFlag 135\n" |sudo tee /etc/taos/taos.cfg
+          ./TDengine_v2/build/build/bin/taosadapter &
+          ./TDengine_v2/build/build/bin/taosd &
 
       - name: Test 2.x
         run: |
           export LD_LIBRARY_PATH=$PWD/TDengine_v2/build/build/lib
           #source $VENV
           export TDENGINE_URL=localhost:6041
-          poetry run pip install psutil "numpy<2.0.0" pandas pytest-cov shapely
           poetry run pytest tests --cov-report term --cov-report html --cov-report xml --cov=taos --cov=taosrest tests
 
       - name: 'Upload taosd logs'
@@ -122,7 +126,7 @@ jobs:
         with:
           repository: "taosdata/TDengine"
           path: "TDengine_v3"
-          ref:  '3.0'
+          ref:  ${{ steps.determine-branch.outputs.value }}
 
       - name: Build TDengine 3.0
         run: |
@@ -157,7 +161,6 @@ jobs:
           #source $VENV
           export TDENGINE_URL=localhost:6041
           curl -L -H "Authorization: Basic cm9vdDp0YW9zZGF0YQ==" -d "show databases" localhost:6041/rest/sql
-          poetry run pip install psutil "numpy<2.0.0" pandas pytest-cov shapely
           poetry run pytest --cov-report term --cov-report html --cov-report xml --cov=taos --cov=taosrest --cov-append tests
 
 

pyproject.toml

@@ -23,7 +23,7 @@ python = ">=3.6.2,<3.12"
 pytz = "*"
 iso8601 = "1.0.2"
 requests = ">=2.27.1"
-pytest-cov = "^4.0.0"
+
 
 [tool.poetry.dependencies.taos-ws-py]
 version = ">=0.3.0"
@@ -33,17 +33,39 @@ optional = true
 [tool.poetry.extras]
 ws = ["taos-ws-py"]
 
-[tool.poetry.dev-dependencies]
+[tool.poetry.group.dev]
+
+[tool.poetry.group.dev.dependencies]
 typing = "*"
 pytest = [
   { version = "^4.6", python = ">=2.7,<3.0" },
   { version = "^6.2", python = ">=3.7,<4.0" },
 ]
+pytest-cov = "^4.0.0"
+mypy = { version = "^0.910", python = "^3.6" }
+black = [{ version = ">=21.0", python = ">=3.6.2,<4.0" }]
+sqlalchemy = { version = "^1.4", python = ">=3.6,<4.0" }
+pandas = { version = ">=1.0", python = ">=3.8,<4.0" }
+python-dotenv = { version = "0.20.0" }
+toml = { version = ">=0.8.0", python = ">=3.7,<4.0" }
+shapely = { version = ">=2.0.0", python = ">=3.7,<4.0" }
+
+[tool.poetry.group.test]
+
+[tool.poetry.group.test.dependencies]
+typing = "*"
+pytest = [
+  { version = "^4.6", python = ">=2.7,<3.0" },
+  { version = "^6.2", python = ">=3.7,<4.0" },
+]
+pytest-cov = "^4.0.0"
 mypy = { version = "^0.910", python = "^3.6" }
 black = [{ version = ">=21.0", python = ">=3.6.2,<4.0" }]
 sqlalchemy = { version = "^1.4", python = ">=3.6,<4.0" }
 pandas = { version = ">=1.0", python = ">=3.8,<4.0" }
 python-dotenv = { version = "0.20.0" }
+toml = { version = ">=0.8.0", python = ">=3.7,<4.0" }
+shapely = { version = ">=2.0.0", python = ">=3.7,<4.0" }
 
 [build-system]
 requires = ["poetry-core>=1.0.5"]