From fed88b38c3bbf1cebe7688c72e8f6aba10426b86 Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Mon, 15 May 2023 20:07:23 +0200 Subject: [PATCH] Replace whole repo with latest content from branch stream-2.7.4-rhel-8.8.0 Content corresponds with RHEL dist-git commit 0134352 --- .gitignore | 2 +- ...t_external_close-as-expected-failure.patch | 28 ------------------- gating.yaml | 6 ---- python-psycopg2.spec | 1 - 4 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 0001-Mark-_test_external_close-as-expected-failure.patch delete mode 100644 gating.yaml diff --git a/.gitignore b/.gitignore index 88ce767..01ef08a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/psycopg2-2.7.5.tar.gz +/psycopg2-2.7.5.tar.gz diff --git a/0001-Mark-_test_external_close-as-expected-failure.patch b/0001-Mark-_test_external_close-as-expected-failure.patch deleted file mode 100644 index 6acc3ff..0000000 --- a/0001-Mark-_test_external_close-as-expected-failure.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b8f5ea5308adafe92b072d61fcbca939f9944359 Mon Sep 17 00:00:00 2001 -From: Carl George -Date: Thu, 4 Jun 2020 14:13:47 -0500 -Subject: [PATCH] Mark _test_external_close as expected failure - -This is a known upstream issue that is resolved in 2.8. The "fix" is a -bigger divergence than is appropriate for CentOS. - -https://github.com/psycopg/psycopg2/issues/927 ---- - tests/test_cursor.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tests/test_cursor.py b/tests/test_cursor.py -index d9dea0c5..21ade863 100755 ---- a/tests/test_cursor.py -+++ b/tests/test_cursor.py -@@ -576,6 +576,7 @@ class CursorTests(ConnectingTestCase): - wait_func = psycopg2.extras.wait_select - self._test_external_close(control_conn, connect_func, wait_func) - -+ @unittest.expectedFailure - def _test_external_close(self, control_conn, connect_func, wait_func): - # The short sleep before using victim_conn the second time makes it - # much more likely to lose the race and see the bug. Repeating the --- -2.26.2 - diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index c190bde..0000000 --- a/gating.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- !Policy -product_versions: - - rhel-9 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} diff --git a/python-psycopg2.spec b/python-psycopg2.spec index c0614af..59282de 100644 --- a/python-psycopg2.spec +++ b/python-psycopg2.spec @@ -40,7 +40,6 @@ Group: Applications/Databases Url: http://www.psycopg.org/psycopg/ Source0: http://www.psycopg.org/psycopg/tarballs/PSYCOPG-2-7/psycopg2-%{version}.tar.gz -Patch0: 0001-Mark-_test_external_close-as-expected-failure.patch %{?with_python2:BuildRequires: python2-debug python2-devel} %if %{with python36_module}