From 4baadf12bd0ebf5a7319c6372f33718ff0bce515 Mon Sep 17 00:00:00 2001 From: Daniele Varrazzo Date: Fri, 20 Aug 2021 01:15:20 +0200 Subject: [PATCH] Build the pool package and include it testing other packages --- .github/workflows/packages.yml | 18 ++++++++++++++---- psycopg_pool/.gitignore | 2 ++ 2 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 psycopg_pool/.gitignore diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml index b1ba335c6..8672fa78a 100644 --- a/.github/workflows/packages.yml +++ b/.github/workflows/packages.yml @@ -14,6 +14,7 @@ jobs: include: - {package: psycopg, impl: python} - {package: psycopg_c, impl: c} + - {package: psycopg_pool, impl: python} steps: - uses: actions/checkout@v2 @@ -27,15 +28,24 @@ jobs: python ${{ matrix.package }}/setup.py sdist -d `pwd`/dist/ - name: Install the Python package and test requirements - run: pip install `ls dist/psycopg-*.tar.gz`[test] + run: |- + pip install `ls dist/psycopg-*.tar.gz`[test] + pip install -e ./psycopg_pool --no-deps if: ${{ matrix.package == 'psycopg' }} - name: Install the C package and test requirements run: |- pip install dist/psycopg-c-*.tar.gz pip install -e ./psycopg[test] + pip install -e ./psycopg_pool --no-deps if: ${{ matrix.package == 'psycopg_c' }} + - name: Install the Python pool package and test requirements + run: |- + pip install `ls dist/psycopg-pool-*.tar.gz` --no-deps + pip install -e ./psycopg[test] + if: ${{ matrix.package == 'psycopg_pool' }} + - name: Test the sdist package run: pytest -m 'not slow' --color yes env: @@ -92,7 +102,7 @@ jobs: CIBW_BUILD: ${{matrix.pyver}}-manylinux_${{matrix.arch}} CIBW_ARCHS_LINUX: auto aarch64 ppc64le CIBW_BEFORE_ALL_LINUX: ./tools/build/wheel_linux_before_all.sh - CIBW_TEST_REQUIRES: ./psycopg[test] + CIBW_TEST_REQUIRES: ./psycopg[test] ./psycopg_pool CIBW_TEST_COMMAND: pytest {project}/tests -m 'not slow' --color yes CIBW_ENVIRONMENT: >- PSYCOPG_IMPL=binary @@ -142,7 +152,7 @@ jobs: CIBW_BUILD: ${{matrix.pyver}}-macosx_${{matrix.arch}} CIBW_ARCHS_MACOS: x86_64 arm64 universal2 CIBW_BEFORE_ALL_MACOS: ./tools/build/wheel_macos_before_all.sh - CIBW_TEST_REQUIRES: ./psycopg[test] + CIBW_TEST_REQUIRES: ./psycopg[test] ./psycopg_pool CIBW_TEST_COMMAND: pytest {project}/tests -m 'not slow' --color yes CIBW_ENVIRONMENT: >- PSYCOPG_IMPL=binary @@ -185,7 +195,7 @@ jobs: CIBW_BEFORE_BUILD_WINDOWS: pip install delvewheel CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: >- delvewheel repair -w {dest_dir} --no-mangle libiconv-2.dll {wheel} - CIBW_TEST_REQUIRES: ./psycopg[test] + CIBW_TEST_REQUIRES: ./psycopg[test] ./psycopg_pool CIBW_TEST_COMMAND: pytest {project}/tests -m "not slow" --color yes CIBW_ENVIRONMENT_WINDOWS: >- PSYCOPG_IMPL=binary diff --git a/psycopg_pool/.gitignore b/psycopg_pool/.gitignore new file mode 100644 index 000000000..2247d5f95 --- /dev/null +++ b/psycopg_pool/.gitignore @@ -0,0 +1,2 @@ +/build +/dist -- 2.47.3