v11 is a quick rebase over the recent Cirrus changes, and I've dropped 0006 now that psycopg2 can build against BSD/Meson setups (thanks Daniele!).
--Jacob
1: 0278c7ba90 = 1: 36409a76ce common/jsonapi: support FRONTEND clients
2: bb3ce4b6a9 = 2: 1356b729db libpq: add OAUTHBEARER SASL mechanism
3: 20b7522228 ! 3: 863a49f863 backend: add OAUTHBEARER SASL mechanism
@@ src/backend/utils/misc/guc_tables.c
#include "nodes/queryjumble.h"
#include "optimizer/cost.h"
@@ src/backend/utils/misc/guc_tables.c: struct config_string
ConfigureNamesString[] =
- check_io_direct, assign_io_direct, NULL
+ check_debug_io_direct, assign_debug_io_direct, NULL
},
+ {
4: f3cec068f9 = 4: 348554e5f4 Add pytest suite for OAuth
5: da1933ac1d ! 5: 16d3984a45 squash! Add pytest suite for OAuth
@@ Commit message
- The with_oauth test skip logic should probably be integrated into the
Makefile side as well...
- ## .cirrus.yml ##
-@@ .cirrus.yml: env:
+ ## .cirrus.tasks.yml ##
+@@ .cirrus.tasks.yml: env:
MTEST_ARGS: --print-errorlogs --no-rebuild -C build
PGCTLTIMEOUT: 120 # avoids spurious failures during parallel tests
TEMP_CONFIG: ${CIRRUS_WORKING_DIR}/src/tools/ci/pg_ci_base.conf
@@ .cirrus.yml: env:
# What files to preserve in case tests fail
-@@ .cirrus.yml: task:
+@@ .cirrus.tasks.yml: task:
chown root:postgres /tmp/cores
sysctl kern.corefile='/tmp/cores/%N.%P.core'
setup_additional_packages_script: |
@@ .cirrus.yml: task:
# NB: Intentionally build without -Dllvm. The freebsd image size is
already
# large enough to make VM startup slow, and even without llvm freebsd
-@@ .cirrus.yml: task:
+@@ .cirrus.tasks.yml: task:
--buildtype=debug \
-Dcassert=true -Duuid=bsd -Dtcl_version=tcl86 -Ddtrace=auto \
-DPG_TEST_EXTRA="$PG_TEST_EXTRA" \
@@ .cirrus.yml: task:
-Dextra_lib_dirs=/usr/local/lib
-Dextra_include_dirs=/usr/local/include/ \
build
EOF
-@@ .cirrus.yml: LINUX_CONFIGURE_FEATURES: &LINUX_CONFIGURE_FEATURES >-
+@@ .cirrus.tasks.yml: LINUX_CONFIGURE_FEATURES: &LINUX_CONFIGURE_FEATURES
>-
--with-libxslt
--with-llvm
--with-lz4
@@ .cirrus.yml: LINUX_CONFIGURE_FEATURES: &LINUX_CONFIGURE_FEATURES >-
--with-pam
--with-perl
--with-python
-@@ .cirrus.yml: LINUX_CONFIGURE_FEATURES: &LINUX_CONFIGURE_FEATURES >-
+@@ .cirrus.tasks.yml: LINUX_CONFIGURE_FEATURES: &LINUX_CONFIGURE_FEATURES
>-
LINUX_MESON_FEATURES: &LINUX_MESON_FEATURES >-
-Dllvm=enabled
@@ .cirrus.yml: LINUX_CONFIGURE_FEATURES: &LINUX_CONFIGURE_FEATURES >-
-Duuid=e2fs
-@@ .cirrus.yml: task:
+@@ .cirrus.tasks.yml: task:
EOF
setup_additional_packages_script: |
@@ .cirrus.yml: task:
matrix:
- name: Linux - Debian Bullseye - Autoconf
-@@ .cirrus.yml: task:
+@@ .cirrus.tasks.yml: task:
folder: $CCACHE_DIR
setup_additional_packages_script: |
@@ src/test/python/requirements.txt
construct~=2.10.61
isort~=5.6
# TODO: update to psycopg[c] 3.1
+-psycopg2~=2.9.6
++psycopg2~=2.9.7
+ pytest~=7.3
+ pytest-asyncio~=0.21.0
## src/test/python/server/conftest.py ##
@@
6: 8f36b5c124 < -: ---------- XXX work around psycopg2 build failures
v11-0001-common-jsonapi-support-FRONTEND-clients.patch.gz
Description: application/gzip
v11-0002-libpq-add-OAUTHBEARER-SASL-mechanism.patch.gz
Description: application/gzip
v11-0003-backend-add-OAUTHBEARER-SASL-mechanism.patch.gz
Description: application/gzip
v11-0004-Add-pytest-suite-for-OAuth.patch.gz
Description: application/gzip
v11-0005-squash-Add-pytest-suite-for-OAuth.patch.gz
Description: application/gzip
