Ci/issue 20 action workflow (#53)

* Update CI workflow

* Enable test

Author: Yibo-Chen13

.github/workflows/test.yml

@@ -9,35 +9,39 @@ on:
 name: test
 jobs:
   tests:
-    if: ${{ false }}
+    if: ${{ github.event.action != 'closed' || github.event.pull_request.merged == true }}
     runs-on: ubuntu-20.04
     strategy:
       matrix:
         use-numpy:
           - 0
         python-version:
-          - "3.5"
+          # - "3.5" ,In this old version, example have a syntax error:E999
           - "3.6"
           - "3.7"
           - "3.8"
           - "3.9"
           - "3.10"
           - "3.11"
           - "3.12"
+          - "3.13"
           - "pypy-3.6"
           - "pypy-3.7"
+          - "pypy-3.8"
+          - "pypy-3.9"
+          - "pypy-3.10"
         proton-version:
           - "latest"
         include:
           - proton-version: "latest"
-            use-numpy: 1
             python-version: "3.8"
+            use-numpy: 1
 
     name: ${{ matrix.python-version }} PROTON=${{ matrix.proton-version }} NUMPY=${{ matrix.use-numpy }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           architecture: x64
@@ -56,11 +60,11 @@ jobs:
         run: |
           echo "VERSION=${{ matrix.proton-version }}" > tests/.env
           echo "ORG=timeplus" >> tests/.env
-          docker-compose -f tests/docker-compose.yml up -d
+          docker compose -f tests/docker-compose.yml up -d
       - name: Setup proton-client proxy for docker
         run: |
           # Faking proton-client real communication with container via docker exec.
-          echo -e '#!/bin/bash\n\ndocker exec -e "`env | grep ^TZ=`" test-proton-client proton client "$@"' | sudo tee /usr/local/bin/proton-client > /dev/null
+          echo -e '#!/bin/bash\n\ndocker exec -e "`env | grep ^TZ=`" test-proton-client timeplusd client "$@"' | sudo tee /usr/local/bin/proton-client > /dev/null
           sudo chmod +x /usr/local/bin/proton-client
           # Overriding setup.cfg. Set host=proton-server
           sed -i 's/^host=localhost$/host=proton-server/' setup.cfg
@@ -81,15 +85,15 @@ jobs:
         env:
           USE_NUMPY: ${{ matrix.use-numpy }}
       - name: Run tests
-        run: coverage run -m py.test --timeout=10 -v
+        run: coverage run -m pytest --timeout=10 -v
         timeout-minutes: 5
         env:
           # Set initial TZ for docker exec -e "`env | grep ^TZ`"
           TZ: UTC
       - name: Upload coverage
         run: coveralls
         env:
-          GITHUB_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           COVERALLS_PARALLEL: true
           COVERALLS_FLAG_NAME: ${{ matrix.python-version }} CH=${{ matrix.proton-version }} NUMPY=${{ matrix.use-numpy }}
 
@@ -99,19 +103,19 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Finished
-        uses: coverallsapp/github-action@1.1.3
+        uses: coverallsapp/github-action@v2.3.0
         with:
-          github-token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
           parallel-finished: true
 
   valgrind:
     name: Valgrind check
     needs: tests
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: 3.8
           architecture: x64
@@ -126,13 +130,13 @@ jobs:
         run: |
           echo "VERSION=$VERSION" > tests/.env
           echo "ORG=timeplus" >> tests/.env
-          docker-compose -f tests/docker-compose.yml up -d
+          docker compose -f tests/docker-compose.yml up -d
         env:
           VERSION: latest
       - name: Setup proton-client proxy for docker
         run: |
           # Faking proton-client real communication with container via docker exec.
-          echo -e '#!/bin/bash\n\ndocker exec -e "`env | grep ^TZ=`" test-proton-client proton-client "$@"' | sudo tee /usr/local/bin/proton-client > /dev/null
+          echo -e '#!/bin/bash\n\ndocker exec -e "`env | grep ^TZ=`" test-proton-client timeplusd client "$@"' | sudo tee /usr/local/bin/proton-client > /dev/null
           sudo chmod +x /usr/local/bin/proton-client
           # Overriding setup.cfg. Set host=proton-server
           sed -i 's/^host=localhost$/host=proton-server/' setup.cfg
@@ -145,9 +149,9 @@ jobs:
         env:
           USE_NUMPY: 1
       - name: Run tests under valgrind
-        run: valgrind --error-exitcode=1 --suppressions=valgrind.supp py.test -v
+        run: valgrind --error-exitcode=1 --suppressions=valgrind.supp pytest -v
         env:
           # Set initial TZ for docker exec -e "`env | grep ^TZ`"
           TZ: UTC
           USE_NUMPY: 1
-          PYTHONMALLOC: malloc
+          PYTHONMALLOC: malloc

tests/columns/test_array.py

@@ -2,15 +2,14 @@
 
 from tests.testcase import BaseTestCase
 from proton_driver import errors
-from tests.util import require_server_version
 
 
-class ArrayTestCase(BaseTestCase):
+class arrayTestCase(BaseTestCase):
     def test_empty(self):
-        columns = 'a Array(Int32)'
+        columns = 'a array(int32)'
 
         data = [([], )]
-        with self.create_table(columns):
+        with self.create_stream(columns):
             self.client.execute(
                 'INSERT INTO test (a) VALUES', data
             )
@@ -25,10 +24,10 @@ def test_empty(self):
             self.assertEqual(inserted, data)
 
     def test_simple(self):
-        columns = 'a Array(Int32)'
+        columns = 'a array(int32)'
         data = [([100, 500], )]
 
-        with self.create_table(columns):
+        with self.create_stream(columns):
             self.client.execute(
                 'INSERT INTO test (a) VALUES', data
             )
@@ -43,10 +42,10 @@ def test_simple(self):
             self.assertEqual(inserted, data)
 
     def test_write_column_as_nested_array(self):
-        columns = 'a Array(Int32)'
+        columns = 'a array(int32)'
         data = [([100, 500], ), ([100, 500], )]
 
-        with self.create_table(columns):
+        with self.create_stream(columns):
             self.client.execute(
                 'INSERT INTO test (a) VALUES', data
             )
@@ -61,10 +60,10 @@ def test_write_column_as_nested_array(self):
             self.assertEqual(inserted, data)
 
     def test_nested_with_enum(self):
-        columns = "a Array(Array(Enum8('hello' = -1, 'world' = 2)))"
+        columns = "a array(array(enum8('hello' = -1, 'world' = 2)))"
 
         data = [([['hello', 'world'], ['hello']], )]
-        with self.create_table(columns):
+        with self.create_stream(columns):
             self.client.execute(
                 'INSERT INTO test (a) VALUES', data
             )
@@ -79,7 +78,7 @@ def test_nested_with_enum(self):
             self.assertEqual(inserted, data)
 
     def test_nested_of_nested(self):
-        columns = 'a Array(Array(Array(Int32))), b Array(Array(Array(Int32)))'
+        columns = 'a array(array(array(int32))), b array(array(array(int32)))'
         data = [([
             [[255, 170], [127, 127, 127, 127, 127], [170, 170, 170], [170]],
             [[255, 255, 255], [255]], [[255], [255], [255]]
@@ -88,7 +87,7 @@ def test_nested_of_nested(self):
             [[255, 255, 255], [255]], [[255], [255], [255]]
         ])]
 
-        with self.create_table(columns):
+        with self.create_stream(columns):
             self.client.execute(
                 'INSERT INTO test (a, b) VALUES', data
             )
@@ -107,12 +106,12 @@ def test_nested_of_nested(self):
             self.assertEqual(inserted, data)
 
     def test_multidimensional(self):
-        columns = "a Array(Array(Array(Nullable(String))))"
+        columns = "a array(array(array(nullable(string))))"
         data = [([[['str1_1', 'str1_2', None], [None]],
                   [['str1_3', 'str1_4', None], [None]]], ),
                 ([[['str2_1', 'str2_2', None], [None]]], ),
                 ([[['str3_1', 'str3_2', None], [None]]],)]
-        with self.create_table(columns):
+        with self.create_stream(columns):
             self.client.execute(
                 'INSERT INTO test (a) VALUES', data
             )
@@ -131,12 +130,12 @@ def test_multidimensional(self):
             self.assertEqual(inserted, data)
 
     def test_empty_nested(self):
-        columns = "a Array(Array(Array(Int32))), b Array(Array(Array(Int32)))"
+        columns = "a array(array(array(int32))), b array(array(array(int32)))"
         data = [
             ([], [[]],),
         ]
 
-        with self.create_table(columns):
+        with self.create_stream(columns):
             self.client.execute("INSERT INTO test (a, b) VALUES", data)
 
             query = "SELECT * FROM test"
@@ -149,24 +148,24 @@ def test_empty_nested(self):
             self.assertEqual(inserted, data)
 
     def test_type_mismatch_error(self):
-        columns = 'a Array(Int32)'
+        columns = 'a array(int32)'
         data = [('test', )]
 
-        with self.create_table(columns):
+        with self.create_stream(columns):
             with self.assertRaises(errors.TypeMismatchError):
                 self.client.execute('INSERT INTO test (a) VALUES', data)
 
         data = [(['test'], )]
 
-        with self.create_table(columns):
+        with self.create_stream(columns):
             with self.assertRaises(errors.TypeMismatchError):
                 self.client.execute('INSERT INTO test (a) VALUES', data)
 
     def test_string_array(self):
-        columns = 'a Array(String)'
+        columns = 'a array(string)'
         data = [(['aaa', 'bbb'], )]
 
-        with self.create_table(columns):
+        with self.create_stream(columns):
             self.client.execute(
                 'INSERT INTO test (a) VALUES', data
             )
@@ -181,10 +180,10 @@ def test_string_array(self):
             self.assertEqual(inserted, data)
 
     def test_string_nullable_array(self):
-        columns = 'a Array(Nullable(String))'
+        columns = 'a array(nullable(string))'
         data = [(['aaa', None, 'bbb'], )]
 
-        with self.create_table(columns):
+        with self.create_stream(columns):
             self.client.execute(
                 'INSERT INTO test (a) VALUES', data
             )
@@ -199,13 +198,13 @@ def test_string_nullable_array(self):
             self.assertEqual(inserted, data)
 
     def test_uuid_array(self):
-        columns = 'a Array(UUID)'
+        columns = 'a array(uuid)'
         data = [([
             UUID('c0fcbba9-0752-44ed-a5d6-4dfb4342b89d'),
             UUID('2efcead4-ff55-4db5-bdb4-6b36a308d8e0')
         ], )]
 
-        with self.create_table(columns):
+        with self.create_stream(columns):
             self.client.execute(
                 'INSERT INTO test (a) VALUES', data
             )
@@ -222,14 +221,14 @@ def test_uuid_array(self):
             self.assertEqual(inserted, data)
 
     def test_uuid_nullable_array(self):
-        columns = 'a Array(Nullable(UUID))'
+        columns = 'a array(nullable(uuid))'
         data = [([
             UUID('c0fcbba9-0752-44ed-a5d6-4dfb4342b89d'),
             None,
             UUID('2efcead4-ff55-4db5-bdb4-6b36a308d8e0')
         ], )]
 
-        with self.create_table(columns):
+        with self.create_stream(columns):
             self.client.execute(
                 'INSERT INTO test (a) VALUES', data
             )
@@ -246,12 +245,12 @@ def test_uuid_nullable_array(self):
             inserted = self.client.execute(query)
             self.assertEqual(inserted, data)
 
-    @require_server_version(19, 16, 13)
+    # @require_server_version(19, 16, 13)
     def test_tuple_array(self):
-        columns = 'a Array(Tuple(Int32))'
+        columns = 'a array(tuple(int32))'
         data = [([], )]
 
-        with self.create_table(columns):
+        with self.create_stream(columns):
             self.client.execute(
                 'INSERT INTO test (a) VALUES', data
             )

tests/columns/test_bool.py

@@ -3,13 +3,13 @@
 
 
 class BoolTestCase(BaseTestCase):
-    required_server_version = (21, 12)
+    # required_server_version = (21, 12)
 
     def test_simple(self):
-        columns = ("a Bool")
+        columns = ("a bool")
 
         data = [(1,), (0,), (True,), (False,), (None,), ("False",), ("",)]
-        with self.create_table(columns):
+        with self.create_stream(columns):
             self.client.execute('INSERT INTO test (a) VALUES', data)
 
             query = 'SELECT * FROM test'
@@ -40,19 +40,19 @@ def test_simple(self):
             )
 
     def test_errors(self):
-        columns = "a Bool"
-        with self.create_table(columns):
+        columns = "a bool"
+        with self.create_stream(columns):
             with self.assertRaises(errors.TypeMismatchError):
                 self.client.execute(
                     'INSERT INTO test (a) VALUES', [(1, )],
                     types_check=True
                 )
 
     def test_nullable(self):
-        columns = "a Nullable(Bool)"
+        columns = "a nullable(bool)"
 
         data = [(None, ), (True, ), (False, )]
-        with self.create_table(columns):
+        with self.create_stream(columns):
             self.client.execute('INSERT INTO test (a) VALUES', data)
 
             query = 'SELECT * FROM test'

tests/columns/test_common.py

@@ -17,7 +17,7 @@ def send_data(*args, **kwargs):
         self.client.connection.send_data = send_data
 
     def test_insert_block_size(self):
-        with self.create_table('a UInt8'):
+        with self.create_stream('a uint8'):
             data = [(x, ) for x in range(4)]
             self.client.execute(
                 'INSERT INTO test (a) VALUES', data
@@ -33,7 +33,7 @@ def test_insert_block_size(self):
             self.assertEqual(inserted, data)
 
     def test_columnar_insert_block_size(self):
-        with self.create_table('a UInt8'):
+        with self.create_stream('a uint8'):
             data = [(0, 1, 2, 3)]
             self.client.execute(
                 'INSERT INTO test (a) VALUES', data, columnar=True