Merge pull request HuaweiCloudDeveloper#12 from pangpang20/master

Rebrand psycopg to gaussdb

Author: liubao68

.flake8

@@ -9,10 +9,10 @@ ignore = W503, E203, E704
 extend-exclude = .venv build
 per-file-ignores =
     # Autogenerated section
-    psycopg/psycopg/errors.py: E125, E128, E302
+    gaussdb/gaussdb/errors.py: E125, E128, E302
 
     # Allow concatenated string literals from async_to_sync
-    psycopg_pool/psycopg_pool/pool.py: E501
+    gaussdb_pool/gaussdb_pool/pool.py: E501
 
     # Pytest's importorskip() getting in the way
     tests/types/test_numpy.py: E402

.github/workflows/3rd-party-tests.yml

@@ -42,8 +42,8 @@ jobs:
             pip_sqlalchemy: sqlalchemy>=2
 
     env:
-      PSYCOPG_IMPL: ${{ matrix.impl }}
-      DEPS: ./psycopg pytest pytest-xdist greenlet
+      GAUSSDB_IMPL: ${{ matrix.impl }}
+      DEPS: ./gaussdb pytest pytest-xdist greenlet
 
     services:
       postgresql:
@@ -78,10 +78,10 @@ jobs:
           CREATE EXTENSION hstore;
           HERE
 
-      - name: Include psycopg-c to the packages to install
+      - name: Include gaussdb-c to the packages to install
         if: ${{ matrix.impl == 'c' }}
         run: |
-          echo "DEPS=$DEPS ./psycopg_c" >> $GITHUB_ENV
+          echo "DEPS=$DEPS ./gaussdb_c" >> $GITHUB_ENV
 
       - name: Install pycopg packages
         run: pip install $DEPS
@@ -108,7 +108,7 @@ jobs:
 
       - name: Run sqlalchemy tests
         env:
-          URL: postgresql+psycopg://postgres:password@127.0.0.1/test
+          URL: postgresql+gaussdb://postgres:password@127.0.0.1/test
         working-directory: sa_home/sa
         run: pytest -n 2 -q --dburi $URL --backend-only --dropfirst --color=yes --dbdriver psycopg_async
 
@@ -150,7 +150,7 @@ jobs:
             python-version: "3.12"
 
     env:
-      DEPS: ./psycopg ./psycopg_pool
+      DEPS: ./gaussdb ./gaussdb_pool
 
     services:
       postgresql:
@@ -182,10 +182,10 @@ jobs:
           SELECT version();
           HERE
 
-      - name: Include psycopg-c to the packages to install
+      - name: Include gaussdb-c to the packages to install
         if: ${{ matrix.impl == 'c' }}
         run: |
-          echo "DEPS=$DEPS ./psycopg_c" >> $GITHUB_ENV
+          echo "DEPS=$DEPS ./gaussdb_c" >> $GITHUB_ENV
 
       - name: Install pycopg packages
         run: pip install $DEPS

.github/workflows/ci.yml

@@ -22,8 +22,8 @@ jobs:
           - 5432:5432
         env:
           GS_USERNAME: root
-          GS_USER_PASSWORD: ${{ secrets.OPENGAUSS_PASSWORD }}
-          GS_PASSWORD: ${{ secrets.OPENGAUSS_PASSWORD }}
+          GS_USER_PASSWORD: Passwd@123
+          GS_PASSWORD: Passwd@123
         options: >-
           --privileged=true
           --name opengauss-custom
@@ -51,7 +51,7 @@ jobs:
           wget -O /tmp/GaussDB_driver.zip https://dbs-download.obs.cn-north-1.myhuaweicloud.com/GaussDB/1730887196055/GaussDB_driver.zip
           unzip /tmp/GaussDB_driver.zip -d /tmp/ && rm -rf /tmp/GaussDB_driver.zip
           \cp /tmp/GaussDB_driver/Centralized/Hce2_X86_64/GaussDB-Kernel*64bit_Python.tar.gz /tmp/
-          tar -zxvf /tmp/GaussDB-Kernel*64bit_Python.tar.gz -C /tmp/ && rm -rf /tmp/GaussDB-Kernel*64bit_Python.tar.gz && rm -rf /tmp/psycopg2 && rm -rf /tmp/GaussDB_driver
+          tar -zxvf /tmp/GaussDB-Kernel*64bit_Python.tar.gz -C /tmp/ && rm -rf /tmp/GaussDB-Kernel*64bit_Python.tar.gz && rm -rf /tmp/_GaussDB && rm -rf /tmp/GaussDB_driver
           echo /tmp/lib | sudo tee /etc/ld.so.conf.d/gauss-libpq.conf
           sudo sed -i '1s|^|/tmp/lib\n|' /etc/ld.so.conf
           sudo ldconfig
@@ -62,18 +62,19 @@ jobs:
           source venv/bin/activate
           python -m pip install --upgrade pip
           pip install -r requirements.txt
-          pip install -e "./psycopg[dev,test]"
-          pip install -e ./psycopg_pool
+          pip install ./tools/isort-gaussdb/
+          pip install "./gaussdb[dev,test]"
+          pip install ./gaussdb_pool
 
           
       - name: Wait for openGauss to be ready
         env:
-          GSQL_PASSWORD: ${{ secrets.OPENGAUSS_PASSWORD }}
+          GSQL_PASSWORD: Passwd@123
         run: |
           source venv/bin/activate
-          for i in {1..15}; do
+          for i in {1..30}; do
             pg_isready -h localhost -p 5432 -U root && break
-            sleep 5
+            sleep 10
           done
           if ! pg_isready -h localhost -p 5432 -U root; then
             echo "openGauss is not ready"
@@ -90,9 +91,9 @@ jobs:
 
       - name: Run tests
         env:
-          PYTHONPATH: ./psycopg:./psycopg_pool
-          PSYCOPG_IMPL: python
-          PSYCOPG_TEST_DSN: "host=127.0.0.1 port=5432 dbname=test user=root password=${{ secrets.OPENGAUSS_PASSWORD }} "
+          PYTHONPATH: ./gaussdb:./gaussdb_pool
+          GAUSSDB_IMPL: python
+          GAUSSDB_TEST_DSN: "host=127.0.0.1 port=5432 dbname=test user=root password=Passwd@123 "
         run: |
           source venv/bin/activate
           pytest -s -v

.github/workflows/docs.yml

@@ -3,9 +3,11 @@ name: Build documentation
 on:
   # push:
   #   branches:
-  #     # This should match the DOC3_BRANCH value in the psycopg-website Makefile
+  #     # This should match the DOC3_BRANCH value in the gaussdb-website Makefile
   #     - master
-  pull_request:
+  # pull_request:
+    workflow_dispatch:
+  
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref_name }}

.github/workflows/lint.yml

@@ -7,6 +7,7 @@ on:
     branches:
       - "*"
   pull_request:
+  workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref_name }}
@@ -27,7 +28,9 @@ jobs:
 
       - name: install packages to tests
         run: |
-          pip install ./psycopg[dev,test]
+          pip install ./tools/isort-gaussdb/
+          pip install ./gaussdb[dev,test]
+          pip install ./gaussdb_pool
           pip install types-polib
           pip install pre-commit
 
@@ -41,17 +44,24 @@ jobs:
 
       - name: Install packages for async_to_sync
         run: |
-            pip install ./psycopg[dev,test]
-            pip install types-polib
+          pip install ./tools/isort-gaussdb/
+          pip install ./gaussdb[dev,test]
+          pip install types-polib
+          pip install ./gaussdb_pool
 
       - name: Check for sync/async inconsistencies
-        run: ./tools/async_to_sync.py --check $(find tests -name "*_async.py" -type f ! -path "tests/pq/test_async.py")
+        run: ./tools/async_to_sync.py --check $(find tests -name "*_async.py" -type f ! -path "tests/pq/test_async.py" ! -path "tests/test_concurrency_async.py")
 
       - name: Install requirements to generate docs
         run: sudo apt-get install -y libgeos-dev
 
       - name: Install Python packages to generate docs
-        run: pip install ./psycopg[docs] ./psycopg_pool
+        run: |
+          pip install furo
+          pip install ./tools/isort-gaussdb/
+          pip install ./gaussdb[dev,test]
+          pip install ./gaussdb_pool
+          pip install types-polib
 
       - name: Check documentation
         run: sphinx-build -W -T -b html docs docs/_build/html

.github/workflows/packages-bin.yml

@@ -3,25 +3,25 @@ name: Build binary packages
 # Note: Libpq is currently built from source on most platforms and the build
 # artifacts are cached across pipeline runs.
 #
-# You can see the caches at https://github.com/psycopg/psycopg/actions/caches
+# You can see the caches at https://github.com/gaussdb/gaussdb/actions/caches
 #
 # You can delete a cache using:
 #
 #   curl -L -X DELETE
 #     -H "Accept: application/vnd.github+json"
 #     -H "Authorization: Bearer $GITHUB_TOKEN"
 #     -H "X-GitHub-Api-Version: 2022-11-28"
-#     "https://api.github.com/repos/psycopg/psycopg/actions/caches?key=libpq-manylinux-ppc64le-17.2-3.4.0"
+#     "https://api.github.com/repos/gaussdb/gaussdb/actions/caches?key=libpq-manylinux-ppc64le-17.2-3.4.0"
 #
 # ref: https://docs.github.com/en/rest/actions/cache?apiVersion=2022-11-28#delete-github-actions-caches-for-a-repository-using-a-cache-key
 
 on:
   workflow_dispatch:
-  pull_request:
-    paths:
-      - '.github/workflows/packages-bin.yml'
-  schedule:
-    - cron: '28 7 * * sun'
+  #   pull_request:
+    # paths:
+    #   - '.github/workflows/packages-bin.yml'
+  # schedule:
+  #   - cron: '28 7 * * sun'
 
 env:
   # Latest release: https://www.postgresql.org/ftp/source/
@@ -70,7 +70,7 @@ jobs:
       - name: Build wheels
         uses: pypa/cibuildwheel@v2.23.2
         with:
-          package-dir: psycopg_binary
+          package-dir: gaussdb_binary
         env:
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
           CIBW_MANYLINUX_I686_IMAGE: manylinux2014
@@ -82,19 +82,19 @@ jobs:
           CIBW_REPAIR_WHEEL_COMMAND: >-
             ./tools/ci/strip_wheel.sh {wheel}
             && auditwheel repair -w {dest_dir} {wheel}
-          CIBW_TEST_REQUIRES: ./psycopg[test] ./psycopg_pool
+          CIBW_TEST_REQUIRES: ./gaussdb[test] ./gaussdb_pool
           CIBW_TEST_COMMAND: >-
             pytest {project}/tests -m 'not slow and not flakey' --color yes
           CIBW_ENVIRONMENT_PASS_LINUX: LIBPQ_VERSION OPENSSL_VERSION
           CIBW_ENVIRONMENT: >-
-            PSYCOPG_IMPL=binary
-            PSYCOPG_TEST_DSN='host=172.17.0.1 user=postgres'
+            GAUSSDB_IMPL=binary
+            GAUSSDB_TEST_DSN='host=172.17.0.1 user=postgres'
             PGPASSWORD=password
             LIBPQ_BUILD_PREFIX=/host/tmp/libpq.build
             PATH="$LIBPQ_BUILD_PREFIX/bin:$PATH"
             LD_LIBRARY_PATH="$LIBPQ_BUILD_PREFIX/lib:$LIBPQ_BUILD_PREFIX/lib64"
-            PSYCOPG_TEST_WANT_LIBPQ_BUILD=${{ env.LIBPQ_VERSION }}
-            PSYCOPG_TEST_WANT_LIBPQ_IMPORT=${{ env.LIBPQ_VERSION }}
+            GAUSSDB_TEST_WANT_LIBPQ_BUILD=${{ env.LIBPQ_VERSION }}
+            GAUSSDB_TEST_WANT_LIBPQ_IMPORT=${{ env.LIBPQ_VERSION }}
 
       - uses: actions/upload-artifact@v4
         with:
@@ -144,23 +144,23 @@ jobs:
       - name: Build wheels
         uses: pypa/cibuildwheel@v2.23.2
         with:
-          package-dir: psycopg_binary
+          package-dir: gaussdb_binary
         env:
           CIBW_BUILD: ${{matrix.pyver}}-macosx_${{matrix.arch}}
           CIBW_ARCHS_MACOS: ${{matrix.arch}}
           MACOSX_ARCHITECTURE: ${{matrix.arch}}
           CIBW_BEFORE_ALL_MACOS: ./tools/ci/wheel_macos_before_all.sh
-          CIBW_TEST_REQUIRES: ./psycopg[test] ./psycopg_pool
+          CIBW_TEST_REQUIRES: ./gaussdb[test] ./gaussdb_pool
           CIBW_TEST_COMMAND: >-
             pytest {project}/tests -m 'not slow and not flakey' --color yes
           CIBW_ENVIRONMENT: >-
             PG_VERSION=17
-            PSYCOPG_IMPL=binary
-            PSYCOPG_TEST_DSN='dbname=postgres'
+            GAUSSDB_IMPL=binary
+            GAUSSDB_TEST_DSN='dbname=postgres'
             LIBPQ_BUILD_PREFIX=/tmp/libpq.build
             PATH="$LIBPQ_BUILD_PREFIX/bin:$PATH"
-            PSYCOPG_TEST_WANT_LIBPQ_BUILD=">= ${{env.LIBPQ_VERSION}}"
-            PSYCOPG_TEST_WANT_LIBPQ_IMPORT=">= ${{env.LIBPQ_VERSION}}"
+            GAUSSDB_TEST_WANT_LIBPQ_BUILD=">= ${{env.LIBPQ_VERSION}}"
+            GAUSSDB_TEST_WANT_LIBPQ_IMPORT=">= ${{env.LIBPQ_VERSION}}"
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
@@ -212,7 +212,7 @@ jobs:
       - name: Build wheels
         uses: pypa/cibuildwheel@v2.23.2
         with:
-          package-dir: psycopg_binary
+          package-dir: gaussdb_binary
         env:
           VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite" # cache vcpkg
           CIBW_BUILD: ${{matrix.pyver}}-${{matrix.arch}}
@@ -222,14 +222,14 @@ jobs:
             delvewheel repair -w {dest_dir}
             --add-path="${{ steps.libdir.outputs.EXTRA_LIB_DIR }}"
             --no-mangle "libiconv-2.dll;libwinpthread-1.dll" {wheel}
-          CIBW_TEST_REQUIRES: ./psycopg[test] ./psycopg_pool
+          CIBW_TEST_REQUIRES: ./gaussdb[test] ./gaussdb_pool
           CIBW_TEST_COMMAND: >-
             pytest {project}/tests -m "not slow and not flakey" --color yes
           CIBW_ENVIRONMENT_WINDOWS: >-
-            PSYCOPG_IMPL=binary
-            PSYCOPG_TEST_DSN="host=127.0.0.1 user=postgres"
-            PSYCOPG_TEST_WANT_LIBPQ_BUILD=${{env.LIBPQ_VERSION}}
-            PSYCOPG_TEST_WANT_LIBPQ_IMPORT=${{env.LIBPQ_VERSION}}
+            GAUSSDB_IMPL=binary
+            GAUSSDB_TEST_DSN="host=127.0.0.1 user=postgres"
+            GAUSSDB_TEST_WANT_LIBPQ_BUILD=${{env.LIBPQ_VERSION}}
+            GAUSSDB_TEST_WANT_LIBPQ_IMPORT=${{env.LIBPQ_VERSION}}
 
       - uses: actions/upload-artifact@v4
         with:
@@ -249,7 +249,7 @@ jobs:
       - name: Merge Artifacts
         uses: actions/upload-artifact/merge@v4
         with:
-          name: psycopg-binary-artifact
+          name: gaussdb-binary-artifact
           delete-merged: true
 
   # }}}

.github/workflows/packages-pool.yml

@@ -2,8 +2,8 @@ name: Build pool packages
 
 on:
   workflow_dispatch:
-  schedule:
-    - cron: '28 6 * * sun'
+  # schedule:
+  #   - cron: '28 6 * * sun'
 
 jobs:
 
@@ -14,8 +14,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - {package: psycopg_pool, format: sdist}
-          - {package: psycopg_pool, format: wheel}
+          - {package: gaussdb_pool, format: sdist}
+          - {package: gaussdb_pool, format: wheel}
 
     steps:
       - uses: actions/checkout@v4
@@ -31,12 +31,12 @@ jobs:
         run: python -m build -o dist --${{ matrix.format }} ${{ matrix.package }}
 
       - name: Install the Python pool package and test requirements
-        run: pip install psycopg[test] dist/*
+        run: pip install gaussdb[test] dist/*
 
       - name: Test the package
         run: pytest -m 'pool and not slow and not flakey' --color yes
         env:
-          PSYCOPG_TEST_DSN: "host=127.0.0.1 user=postgres"
+          GAUSSDB_TEST_DSN: "host=127.0.0.1 user=postgres"
           PGPASSWORD: password
 
       - uses: actions/upload-artifact@v4
@@ -66,5 +66,5 @@ jobs:
       - name: Merge Artifacts
         uses: actions/upload-artifact/merge@v4
         with:
-          name: psycopg-pool-artifact
+          name: gaussdb-pool-artifact
           delete-merged: true