Added specific tests to skip (test_pipeline) as it fails on s390x (rhbz#2301198)

Disable tests on non-Fedora builds due to missing dependencies

Signed-off-by: Michel Lind <salimma@fedoraproject.org>

.gitignore

@@ -9,3 +9,6 @@
 /3.1.17.tar.gz
 /3.1.18.tar.gz
 /pool-3.2.1.tar.gz
+/3.1.19.tar.gz
+/pool-3.2.2.tar.gz
+/3.2.1.tar.gz

python-psycopg3.spec

@@ -1,13 +1,25 @@
 %global package_name	psycopg
 %global src_name		%{package_name}3
 
-%global pool_version	3.2.1
+%global pool_version	3.2.2
 %global pool_name		pool-%{pool_version}
 
+%if 0%{?fedora}
+%bcond_without			cython
+%bcond_without			pypy
 %bcond_without			tests
+%else
+# EL9 does not have pypy, and cython build failed
+%bcond_with			cython
+%bcond_with			pypy
+# postgresql-test-rpm-macros built but not published in CRB
+# https://kojihub.stream.centos.org/koji/buildinfo?buildID=59955
+# requested in https://issues.redhat.com/browse/RHEL-32610
+%bcond_with			tests
+%endif
 
 Name:		python-%{src_name}
-Version:	3.1.18
+Version:	3.2.1
 Release:	3%{?dist}
 Summary:	Psycopg 3 is a modern implementation of a PostgreSQL adapter for Python
 
@@ -16,20 +28,31 @@ URL:		https://www.psycopg.org/%{src_name}/
 Source0:	https://github.com/%{package_name}/%{package_name}/archive/refs/tags/%{version}.tar.gz
 Source1:	https://github.com/%{package_name}/%{package_name}/archive/refs/tags/%{pool_name}.tar.gz
 
+%if %{without cython}
+BuildArch:		noarch
+%endif
+
 # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
 ExcludeArch:	%{ix86}
 
 BuildRequires:	python3-devel
 BuildRequires:	libpq openssl
 BuildRequires:	postgresql-static postgresql-server-devel
-BuildRequires:	python3-pip python3-wheel pypy python3-tomli
+BuildRequires:	python3-pip python3-wheel python3-tomli
+%if %{with pypy}
+BuildRequires:	pypy
+%endif
 
+%if %{with tests}
 # Required for running tests
 BuildRequires:	postgresql-test-rpm-macros
 BuildRequires:	python3-anyio python3-mypy pytest python3-pytest-cov python3-pytest-randomly
+%endif
 
+%if %{with cython}
 # Required for Cython
 BuildRequires:	cython gcc
+%endif
 
 # Runtime dependency
 # https://github.com/psycopg/psycopg/blob/master/README.rst
@@ -45,6 +68,7 @@ and Python features.
 
 Summary:		%{Summary}
 BuildArch:		noarch
+Requires:		libpq
 
 %description -n python3-%{src_name}
 %{description}
@@ -53,15 +77,19 @@ BuildArch:		noarch
 Summary:		Connection pooling for Psycopg 3
 Requires:		python-%{src_name}
 BuildArch:		noarch
+Requires:		libpq
 
 %description -n python3-%{src_name}_pool
 This package contains the pooling functionality for Psycopg 3.
 
+%if %{with cython}
 %package -n python3-%{src_name}_c
 Summary:		C extensions for Psycopg 3
+Requires:		libpq
 
 %description -n python3-%{src_name}_c
 This package contains the C extensions for enhanced performance in Psycopg 3.
+%endif
 
 %prep
 %autosetup -p1 -n %{package_name}-%{version}
@@ -81,9 +109,11 @@ pushd psycopg_pool
 %pyproject_wheel
 popd
 
+%if %{with cython}
 pushd psycopg_c
 %pyproject_wheel
 popd
+%endif
 
 %install
 pushd psycopg
@@ -94,10 +124,13 @@ pushd psycopg_pool
 %pyproject_install
 popd
 
+%if %{with cython}
 pushd psycopg_c
 %pyproject_install
 popd
+%endif
 
+%if %{with tests}
 %check
 export PGTESTS_LOCALE=C.UTF-8
 %postgresql_tests_run
@@ -121,8 +154,15 @@ export PSYCOPG_TEST_DSN="host=$PGHOST port=$PGPORT dbname=${PGTESTS_DATABASES##*
 		sched_async or \
 		test_pipeline_async or \
 		test_copy_async or \
-		test_pipeline\
+		test_pipeline or \
+		test_multirange or \
+		test_datetime or \
+		test_range or \
+		test_string or \
+		test_notify or \
+		test_waiting\
 )"
+%endif
 
 
 %files -n python3-%{src_name}
@@ -137,14 +177,42 @@ export PSYCOPG_TEST_DSN="host=$PGHOST port=$PGPORT dbname=${PGTESTS_DATABASES##*
 %license psycopg_pool/LICENSE.txt
 %doc psycopg_pool/README.rst
 
+%if %{with cython}
 %files -n python3-%{src_name}_c
 %{python3_sitearch}/psycopg_c/
 %{python3_sitearch}/psycopg_c-%{version}.dist-info/
 %license psycopg_c/LICENSE.txt
 %doc psycopg_c/README.rst
+%endif
 
 %changelog
-* Wed Apr 3 2024 Ondrej Sloup <osloup@redhat.com> -  3.1.18-3
+* Tue Jul 30 2024 Ondrej Sloup <osloup@redhat.com> - 3.2.1-3
+- Added specific tests to skip (test_pipeline) as it fails on s390x (rhbz#2301198)
+
+* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Wed Jul 10 2024 Ondrej Sloup <osloup@redhat.com> - 3.2.1-1
+- Rebase to the latest upstream version (rhbz#2295550)
+- Added specific tests to skip (test_pipeline, test_multirange, test_datetime, test_range, test_string, test_notify)
+
+* Tue Jun 11 2024 Python Maint <python-maint@redhat.com> - 3.1.19-2
+- Rebuilt for Python 3.13
+
+* Mon Jun 10 2024 Ondrej Sloup <osloup@redhat.com> - 3.1.19-1
+- Rebase to the latest upstream version
+
+* Mon Jun 10 2024 Ondrej Sloup <osloup@redhat.com> - 3.1.18-6
+- Correct Requires libpq everywhere (rhbz#2266555)
+
+* Sun Jun 09 2024 Python Maint <python-maint@redhat.com> - 3.1.18-5
+- Rebuilt for Python 3.13
+
+* Wed Apr 17 2024 Michel Lind <salimma@fedoraproject.org> - 3.1.18-4
+- Make Cython and PyPy conditional, and only enable on Fedora for now
+- Disable tests on non-Fedora builds due to missing dependencies
+
+* Wed Apr 03 2024 Ondrej Sloup <osloup@redhat.com> -  3.1.18-3
 - Confirm libpq require for (rhbz#2266555)
 - Fix architectures for specific subpackages (rhbz#2268354)
 

sources

@@ -1,2 +1,2 @@
-SHA512 (3.1.18.tar.gz) = 1e27eec49f3ae99f1fec68816dff3974aa9b1f526df45ccca295c7c6703cc309ca4f8f65d7e3450b628906a938c65f8cbd1a1f3cb6a41b6e51dc5e220985af39
-SHA512 (pool-3.2.1.tar.gz) = 1a2ba80a6164f8c1b0d0d07481d4d8019c2ce047f8eb4fde0c65de38e200ee9f53f6f9e0851a73b4eb69c7d60355400af318cf30d342f5021728ca7a9ddd0c5f
+SHA512 (3.2.1.tar.gz) = ecaeee67493ce849a2d7477d0373061ab3b329d228e3c0dd482d7ee8c7eea07c59127db2e6afc0233a78f073306d4adef915aba5f3fc6378c0335c3155350294
+SHA512 (pool-3.2.2.tar.gz) = 165188a6da33266bac6277f5dfa86cf60f3de5d5173b6c45905b469ebf2835dd1a6e0f1513b156a8337f725316bcc946e8235693d3c133191b0ca6c7683b4ded