.gitignore

@@ -1 +1 @@
-SOURCES/SQLAlchemy-1.4.45.tar.gz
+SOURCES/SQLAlchemy-2.0.26.tar.gz

.python-sqlalchemy.metadata

@@ -1 +1 @@
-eb2f1528723b728dd2ee764fe0d52434f4e9e792 SOURCES/SQLAlchemy-1.4.45.tar.gz
+31ac6f5e6ee14d8c96dcfd2771eac0c963ace7b1 SOURCES/SQLAlchemy-2.0.26.tar.gz

SPECS/python-sqlalchemy.spec

@@ -1,36 +1,66 @@
-# when bootstrapping Python, pytest-xdist is not yet available (also not yet in EPEL9)
+## START: Set by rpmautospec
-%if ! 0%{?rhel} || 0%{?rhel} > 9
+## (rpmautospec version 0.6.1)
-%bcond_without xdist
+## RPMAUTOSPEC: autorelease, autochangelog
+%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
+    release_number = 5;
+    base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
+    print(release_number + base_release_number - 1);
+}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
+## END: Set by rpmautospec
+
+# Mypy plugin is deprecated in 2.0. mypy is not in RHEL.
+%bcond mypy %{undefined rhel}
+
+# The asyncmy Python package isn’t available in x86 (32bit)
+%ifnarch %ix86
+%bcond asyncmy %{undefined rhel}
 %else
-%bcond_with xdist
+%bcond asyncmy 0
 %endif
 
+# Tests crash when being run by pytest-xdist
+%bcond xdist 0
+
 %global srcname SQLAlchemy
+%global canonicalname %{py_dist_name %{srcname}}
 
+%if %{undefined rhel}
 %global python_pkg_extras \
     asyncio \
+    mssql_pymssql \
     mssql_pyodbc \
+    mysql \
+    mysql_connector \
+    %{?with_mypy:mypy} \
     postgresql \
-    pymysql
+    postgresql_pg8000 \
+    postgresql_asyncpg \
+    pymysql \
+    aiomysql \
+    aioodbc \
+    aiosqlite \
+    %{?with_asyncmy:asyncmy}
+%endif
 
-Name:           python-sqlalchemy
+Name:           python-%{canonicalname}
-Version:        1.4.45
+Version:        2.0.26
 # cope with pre-release versions containing tildes
 %global srcversion %{lua: srcversion, num = rpm.expand("%{version}"):gsub("~", ""); print(srcversion);}
-Release:        3%{?dist}
+Release:        %autorelease
 Summary:        Modular and flexible ORM library for Python
 
 License:        MIT
 URL:            https://www.sqlalchemy.org/
 Source0:        %{pypi_source %{srcname} %{srcversion}}
 
+BuildRequires:  coreutils
+BuildRequires:  findutils
 BuildRequires:  gcc
-BuildRequires:  python3-devel >= 3.6
+BuildRequires:  python3-devel >= 3.7
-BuildRequires:  python3-greenlet >= 1.0
+# The dependencies needed for testing don’t get auto-generated.
-BuildRequires:  python3-setuptools
+BuildRequires:  python3dist(pytest)
-BuildRequires:  python3-pytest
 %if %{with xdist}
-BuildRequires:  python3-pytest-xdist
+BuildRequires:  python3dist(pytest-xdist)
 %endif
 
 %description
@@ -44,6 +74,9 @@ domain.
 
 %package -n python3-sqlalchemy
 Summary:        %{summary}
+%if %{without asyncmy}
+Obsoletes:      python3-sqlalchemy+asyncmy < %{version}-%{release}
+%endif
 
 %description -n python3-sqlalchemy
 SQLAlchemy is an Object Relational Mapper (ORM) that provides a flexible,
@@ -54,8 +87,10 @@ as you choose, determining relationships based on foreign keys or letting you
 define the join conditions explicitly, to bridge the gap between database and
 domain.
 
+%if %{undefined rhel}
 # Subpackages to ensure dependencies enabling extra functionality
-%{?python_extras_subpkg:%python_extras_subpkg -n python3-sqlalchemy -i %{python3_sitearch}/*.egg-info %python_pkg_extras}
+%pyproject_extras_subpkg -n python3-sqlalchemy %python_pkg_extras
+%endif
 
 %package doc
 Summary:        Documentation for SQLAlchemy
@@ -65,47 +100,170 @@ BuildArch:      noarch
 Documentation for SQLAlchemy.
 
 
+%generate_buildrequires
+%pyproject_buildrequires %{!?rhel:-x %{gsub %{quote:%python_pkg_extras} %%s+ ,}}
+
+
 %prep
-%setup -q -n %{srcname}-%{srcversion}
+%autosetup -n %{srcname}-%{version} -p1
 
 %build
-%py3_build
+%pyproject_wheel
 
 %install
-%py3_install
+%pyproject_install
+%pyproject_save_files %{canonicalname}
+# Work around poetry not listing license files as such in package metadata.
+sed -i -e 's|^\(.*/LICENSE\)|%%license \1|g' %{pyproject_files}
 
+install -d %{buildroot}%{_pkgdocdir}
+cp -a doc examples %{buildroot}%{_pkgdocdir}/
 # remove unnecessary scripts for building documentation
-rm -rf doc/build
+rm -rf %{buildroot}%{_pkgdocdir}/doc/build
+find %{buildroot}%{_pkgdocdir} | while read long; do
+    short="${long#%{buildroot}}"
+    if [ -d "$long" ]; then
+        echo "%%doc %%dir $short"
+    else
+        if [ "$short" != "${short/copyright/}" ]; then
+            echo "%%license $short"
+        else
+            echo "%%doc $short"
+        fi
+    fi
+done > doc-files.txt
+
 
 %check
 %pytest test \
+%if %{without mypy}
+  -k 'not Mypy' \
+%endif
 %if %{with xdist}
 --numprocesses=auto
 %endif
 
 
-%files doc
+%files doc -f doc-files.txt
-%doc doc examples
 
-%files -n python3-sqlalchemy
+%files -n python3-sqlalchemy -f %{pyproject_files}
-%license LICENSE
 %doc README.rst
-%{python3_sitearch}/SQLAlchemy-*.egg-info/
-%{python3_sitearch}/sqlalchemy/
 
 %changelog
-* Tue Dec 13 2022 Sergio Correia <scorreia@redhat.com> - 1.4.45-3
+## START: Generated by rpmautospec
-- Update to current version - 1.4.45
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.0.26-5
-  Resolves: rhbz#2152649
+- Bump release for June 2024 mass rebuild
+
+* Wed May 29 2024 Karel Srot <ksrot@redhat.com> - 2.0.26-4
+- [ci] Configure CI tests and gating.yaml
+
+* Mon Feb 12 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 2.0.26-3
+- Disable all extras in RHEL builds
+
+* Sun Feb 11 2024 Nils Philippsen <nils@tiptoe.de> - 2.0.26-2
+- Don’t build asyncmy extra package on x86 (32bit)
+
+* Sun Feb 11 2024 Nils Philippsen <nils@tiptoe.de> - 2.0.26-1
+- Update to 2.0.26
+
+* Sun Feb 11 2024 Nils Philippsen <nils@tiptoe.de> - 2.0.25-3
+- Generate build requirements for extra packages
+
+* Sun Feb 04 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 2.0.25-2
+- Avoid mypy dependency in RHEL builds
+
+* Thu Feb 01 2024 Nils Philippsen <nils@tiptoe.de> - 2.0.25-1
+- Upgrade to 2.0.25
+
+* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.51-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Nils Philippsen <nils@tiptoe.de> - 1.4.51-1
+- Update to 1.4.51
+
+* Thu Jan 18 2024 Nils Philippsen <nils@tiptoe.de> - 1.4.50-3
+- Reintroduce aiomysql version requirement
+
+* Thu Nov 16 2023 Nils Philippsen <nils@tiptoe.de> - 1.4.50-2
+- Patch to accept “too low” aiomysql version
+
+* Thu Nov 02 2023 Nils Philippsen <nils@tiptoe.de> - 1.4.50-1
+- Version 1.4.50
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.49-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jul 06 2023 Nils Philippsen <nils@tiptoe.de> - 1.4.49-1
+- Version 1.4.49
 
-* Sat Jun 18 2022 Sergio Correia <scorreia@redhat.com> - 1.4.37-3
+* Mon Jul 03 2023 Miro Hrončok <miro@hroncok.cz> - 1.4.49~~20230703cd56e87-1
+- Update to a git snapshot (future 1.4.49) for Python 3.12 support
+
+* Thu Jun 15 2023 Python Maint <python-maint@redhat.com> - 1.4.48-2
+- Rebuilt for Python 3.12
+
+* Sun May 21 2023 Nils Philippsen <nils@tiptoe.de> - 1.4.48-1
+- Version 1.4.48
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.46-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Jan 04 2023 Nils Philippsen <nils@tiptoe.de> - 1.4.46-1
+- Version 1.4.46
+
+* Mon Dec 12 2022 Nils Philippsen <nils@tiptoe.de> - 1.4.45-3
+- Disable xdist across the board
+
+* Mon Dec 12 2022 Nils Philippsen <nils@tiptoe.de> - 1.4.45-2
+- Remove obsolete patch
+
+* Mon Dec 12 2022 Nils Philippsen <nils@tiptoe.de> - 1.4.45-1
+- Version 1.4.45
+
+* Wed Dec 07 2022 Troy Dawson <tdawson@redhat.com> - 1.4.44-4
+- Fix typo
+
+* Tue Dec 06 2022 Yaakov Selkowitz <yselkowitz@fedoraproject.org>
+- Disable xdist in ELN builds
+
+* Mon Nov 14 2022 Nils Philippsen <nils@tiptoe.de> - 1.4.44-2
+- Fix test failing on 32bit
+
+* Mon Nov 14 2022 Nils Philippsen <nils@tiptoe.de> - 1.4.44-1
+- Version 1.4.44
+
+* Wed Nov 09 2022 Nils Philippsen <nils@tiptoe.de> - 1.4.43-2
+- Test without pytest-xdist on Fedora 38
+
+* Mon Nov 07 2022 Nils Philippsen <nils@tiptoe.de> - 1.4.43-1
+- Version 1.4.43
+
+* Wed Oct 26 2022 Nils Philippsen <nils@tiptoe.de> - 1.4.42-1
+- Version 1.4.42
+
+* Wed Sep 07 2022 Nils Philippsen <nils@tiptoe.de> - 1.4.41-1
+- Version 1.4.41
+
+* Tue Aug 09 2022 Nils Philippsen <nils@tiptoe.de> - 1.4.40-1
+- Version 1.4.40
+
+* Mon Jul 25 2022 Miro Hrončok <miro@hroncok.cz>
 - Remove obsolete cruft from the specfile, follow the packaging guidelines
-- Remove also extra packages we have no runtime dependencies for
-  Related: rhbz#2084556
 
-* Fri Jun 17 2022 Sergio Correia <scorreia@redhat.com> - 1.4.37-2
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.39-2
-- Add python-sqlalchemy to RHEL-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-  Resolves: rhbz#2084556
+
+* Fri Jun 24 2022 Nils Philippsen <nils@tiptoe.de> - 1.4.39-1
+- version 1.4.39
+
+* Fri Jun 24 2022 Nils Philippsen <nils@tiptoe.de> - 1.4.38-1
+- version 1.4.38
+
+* Tue Jun 14 2022 Python Maint <python-maint@redhat.com> - 1.4.37-2
+- Rebuilt for Python 3.11
+
+* Wed Jun 08 2022 Nils Philippsen <nils@tiptoe.de>
+- Generally BR: python3-pytest-xdist, also on EL9
 
 * Wed Jun 01 2022 Nils Philippsen <nils@tiptoe.de> - 1.4.37-1
 - version 1.4.37
@@ -717,3 +875,5 @@ rm -rf doc/build
 
 * Wed May 31 2006 Shahms E. King <shahms@shahms.com> 0.2.1-1
 - Update to new upstream version
+
+## END: Generated by rpmautospec