diff --git a/.python-sqlalchemy.metadata b/.python-sqlalchemy.metadata index f031733..bfbf493 100644 --- a/.python-sqlalchemy.metadata +++ b/.python-sqlalchemy.metadata @@ -1 +1 @@ -343aa9ade5fc6b01933f5d2d8fc97c75005ac9fa SOURCES/SQLAlchemy-1.2.7.tar.gz +62e7e94e758b1a0f7d1bc447651bb19d7891c81f SOURCES/SQLAlchemy-1.4.36.tar.gz diff --git a/SPECS/python-sqlalchemy.spec b/SPECS/python-sqlalchemy.spec index 941064c..42049ed 100644 --- a/SPECS/python-sqlalchemy.spec +++ b/SPECS/python-sqlalchemy.spec @@ -1,47 +1,46 @@ -%if 0%{?fedora} || 0%{?rhel} > 7 -%global with_python3 1 -%endif - -%if 0%{?rhel} > 7 -# Disable python2 build by default -%bcond_with python2 +# when bootstrapping Python, pytest-xdist is not yet available (also not yet in EPEL9) +%if ! 0%{?rhel} || 0%{?rhel} > 9 +%bcond_without xdist %else -%bcond_without python2 +%bcond_with xdist %endif %global srcname SQLAlchemy +%global python_pkg_extras \ + asyncio \ + mssql_pymssql \ + mssql_pyodbc \ + mysql \ + postgresql \ + postgresql_pg8000 \ + postgresql_asyncpg \ + pymysql \ + aiomysql \ + aiosqlite + Name: python-sqlalchemy -Version: 1.2.7 -Release: 3%{?dist} +Version: 1.4.36 +# cope with pre-release versions containing tildes +%global srcversion %{lua: srcversion, num = rpm.expand("%{version}"):gsub("~", ""); print(srcversion);} +Release: 1%{?dist} Summary: Modular and flexible ORM library for python -Group: Development/Libraries License: MIT URL: http://www.sqlalchemy.org/ -Source0: https://files.pythonhosted.org/packages/source/S/%{srcname}/%{srcname}-%{version}.tar.gz - -# Fix tests for sqlite 3.24 -# https://github.com/zzzeek/sqlalchemy/pull/452 -Patch1: python-sqlalchemy-1.2.8-sqlite-3.24.patch +Source0: https://files.pythonhosted.org/packages/source/S/%{srcname}/%{srcname}-%{srcversion}.tar.gz BuildRequires: gcc - -%if %{with python2} -BuildRequires: python2-devel >= 2.6 -BuildRequires: python2-setuptools -BuildRequires: python2-mock -BuildRequires: python2-pytest -%endif # with python2 - -%if 0%{?with_python3} -BuildRequires: python3-devel +BuildRequires: python3-devel >= 3.6 +BuildRequires: python3-greenlet >= 1.0 BuildRequires: python3-setuptools BuildRequires: python3-pytest +%if %{with xdist} +BuildRequires: python3-pytest-xdist %endif %description -SQLAlchemy is an Object Relational Mappper (ORM) that provides a flexible, +SQLAlchemy is an Object Relational Mapper (ORM) that provides a flexible, high-level interface to SQL databases. Database and domain concepts are decoupled, allowing both sides maximum flexibility and power. SQLAlchemy provides a powerful mapping layer that can work as automatically or as manually @@ -49,6 +48,8 @@ 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. +This package includes the python 2 version of the module. + %package doc Summary: Documentation for SQLAlchemy BuildArch: noarch @@ -56,32 +57,13 @@ BuildArch: noarch %description doc Documentation for SQLAlchemy -%if %{with python2} -%package -n python2-sqlalchemy -Summary: Modular and flexible ORM library for python -Group: Development/Libraries -%{?python_provide:%python_provide python2-sqlalchemy} - -%description -n python2-sqlalchemy -SQLAlchemy is an Object Relational Mappper (ORM) that provides a flexible, -high-level interface to SQL databases. Database and domain concepts are -decoupled, allowing both sides maximum flexibility and power. SQLAlchemy -provides a powerful mapping layer that can work as automatically or as manually -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. - -This package includes the python 2 version of the module. -%endif # with python2 - -%if 0%{?with_python3} %package -n python3-sqlalchemy Summary: Modular and flexible ORM library for python -Group: Development/Libraries %{?python_provide:%python_provide python%{python3_pkgversion}-sqlalchemy} +Obsoletes: python2-sqlalchemy < 1.3.10-2 %description -n python3-sqlalchemy -SQLAlchemy is an Object Relational Mappper (ORM) that provides a flexible, +SQLAlchemy is an Object Relational Mapper (ORM) that provides a flexible, high-level interface to SQL databases. Database and domain concepts are decoupled, allowing both sides maximum flexibility and power. SQLAlchemy provides a powerful mapping layer that can work as automatically or as manually @@ -90,70 +72,227 @@ define the join conditions explicitly, to bridge the gap between database and domain. This package includes the python 3 version of the module. -%endif # with_python3 -# Filter unnecessary dependencies -%global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch})/.*\\.so$ +# Subpackages to ensure dependencies enabling extra functionality +%{?python_extras_subpkg:%python_extras_subpkg -n python3-sqlalchemy -i %{python3_sitearch}/*.egg-info %python_pkg_extras} -%prep -%setup -q -n %{srcname}-%{version} -%patch1 -p1 -b .sqlite-3.24 +%prep +%setup -q -n %{srcname}-%{srcversion} %build -%if %{with python2} -%py2_build -%endif # with python2 - -%if 0%{?with_python3} %py3_build -%endif %install -%if %{with python2} -%py2_install -%endif # with python2 - -%if 0%{?with_python3} %py3_install -%endif # remove unnecessary scripts for building documentation rm -rf doc/build %check -%if %{with python2} -PYTHONPATH=. %{__python2} -m pytest test -%endif # with python2 - -%if 0%{?with_python3} -PYTHONPATH=. %{__python3} -m pytest test +PYTHONPATH=. %{__python3} -m pytest test \ +%if %{with xdist} +--numprocesses=auto %endif %files doc %doc doc examples -%if %{with python2} -%files -n python2-sqlalchemy -%license LICENSE -%doc README.rst -%{python2_sitearch}/* -%endif # with python2 - -%if 0%{?with_python3} %files -n python3-sqlalchemy %license LICENSE %doc README.rst %{python3_sitearch}/* -%endif # with_python3 %changelog -* Wed Aug 01 2018 Petr Viktorin - 1.2.7-3 -- Fix tests with SQLite 3.24+ +* Wed Apr 27 2022 Nils Philippsen - 1.4.36-1 +- version 1.4.36 + +* Thu Apr 07 2022 Nils Philippsen - 1.4.35-1 +- version 1.4.35 + +* Fri Apr 01 2022 Nils Philippsen - 1.4.34-1 +- version 1.4.34 + +* Tue Mar 08 2022 Nils Philippsen - 1.4.32-1 +- version 1.4.32 +- don't BR: python3-pytest-xdist on EL9 +- remove obsolete (no-op) tweak of setup.cfg + +* Fri Jan 21 2022 Nils Philippsen - 1.4.31-1 +- version 1.4.31 + +* Thu Dec 23 2021 Nils Philippsen - 1.4.29-1 +- version 1.4.29 + +* Wed Dec 15 2021 Nils Philippsen - 1.4.28-1 +- version 1.4.28 +- remove build dependency on python3-mock + +* Fri Nov 12 2021 Nils Philippsen - 1.4.27-1 +- version 1.4.27 + +* Tue Oct 26 2021 Joel Capitao - 1.4.26-1 +- Update to 1.4.26. Fixes rhbz#2015705 + +* Sun Sep 26 2021 Kevin Fenzi - 1.4.25-1 +- Update to 1.4.25. Fixes rhbz#1995262 + +* Wed Aug 25 2021 Nils Philippsen - 1.4.23-1 +- version 1.4.23 + +* Sun Aug 08 2021 Kevin Fenzi - 1.4.22-1 +- Update to 1.4.22. Fixes rhbz#1975029 + +* Fri Jul 23 2021 Fedora Release Engineering - 1.4.18-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Sun Jun 13 2021 Nils Philippsen - 1.4.18-1 +- version 1.4.18 + +* Thu Jun 03 2021 Python Maint - 1.4.15-2 +- Rebuilt for Python 3.10 + +* Fri May 14 2021 Nils Philippsen - 1.4.15-1 +- version 1.4.15 + +* Mon May 10 2021 Nils Philippsen - 1.4.14-1 +- version 1.4.14 +- drop Python 2.x support +- define extras subpackages + +* Fri Apr 30 2021 Tomas Hrnciar - 1.3.22-3 +- Disabled failing test test_pyodbc_extra_connect_azure + +* Wed Jan 27 2021 Fedora Release Engineering - 1.3.22-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Dec 21 2020 Nils Philippsen - 1.3.22-1 +- version 1.3.22 + +* Sun Nov 01 2020 Nils Philippsen - 1.3.20-1 +- version 1.3.20 + +* Tue Aug 18 2020 Nils Philippsen - 1.3.19-1 +- version 1.3.19 + +* Wed Jul 29 2020 Fedora Release Engineering - 1.3.18-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Nils Philippsen - 1.3.18-1 +- version 1.3.18 + +* Sun May 24 2020 Miro Hrončok - 1.3.17-3 +- Rebuilt for Python 3.9 + +* Fri May 22 2020 Miro Hrončok - 1.3.17-2 +- Bootstrap for Python 3.9 + +* Sat May 16 2020 Nils Philippsen - 1.3.17-1 +- version 1.3.17 + +* Thu Mar 26 2020 Nils Philippsen - 1.3.15-1 +- version 1.3.15 +- quieten %%setup + +* Thu Jan 30 2020 Fedora Release Engineering - 1.3.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sun Jan 26 2020 Nils Philippsen - 1.3.13-1 +- version 1.3.13 + +* Wed Dec 18 2019 Nils Philippsen - 1.3.12-1 +- version 1.3.12 + +* Tue Nov 19 2019 Randy Barlow - 1.3.11-1 +- Update to 1.3.11 (#1771196). +- https://docs.sqlalchemy.org/en/13/changelog/changelog_13.html#change-1.3.11 + +* Wed Nov 13 2019 Nils Philippsen - 1.3.10-2 +- drop python2-sqlalchemy from F32 on + +* Fri Oct 18 2019 Nils Philippsen - 1.3.10-1 +- fix/skip tests that are broken on SQLite 3.30 + +* Wed Oct 16 2019 Nils Philippsen - 1.3.10-1 +- version 1.3.10 + +* Tue Sep 17 2019 Randy Barlow - 1.3.8-1 +- Update to 1.3.8 (#1747080). +- https://docs.sqlalchemy.org/en/13/changelog/changelog_13.html#change-1.3.8 + +* Sun Aug 25 2019 Nils Philippsen - 1.3.7-1 +- version 1.3.7 +- require python3-mock for building + +* Thu Aug 15 2019 Miro Hrončok - 1.3.6-2 +- Rebuilt for Python 3.8 + +* Sat Jul 27 2019 Nils Philippsen - 1.3.6-1 +- version 1.3.6 + +* Fri Jul 26 2019 Fedora Release Engineering - 1.3.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Mon Jul 22 2019 Petr Viktorin - 1.3.5-2 +- Remove dependency on python2-xdist +- Enable multi-process testing using python3-xdist + +* Tue Jun 18 2019 Randy Barlow - 1.3.5-1 +- Update to 1.3.5 (#1721271). +- https://docs.sqlalchemy.org/en/13/changelog/changelog_13.html#change-1.3.5 + +* Mon Jun 03 2019 Nils Philippsen - 1.3.4-1 +- version 1.3.4 + +* Thu Apr 18 2019 Nils Philippsen - 1.3.3-1 +- version 1.3.3 + +* Wed Apr 10 2019 Nils Philippsen - 1.3.2-1 +- version 1.3.2 + +* Wed Mar 13 2019 Nils Philippsen - 1.3.1-1 +- version 1.3.1 + +* Tue Mar 05 2019 Nils Philippsen - 1.3.0-1 +- version 1.3.0 + +* Fri Mar 01 2019 Nils Philippsen - 1.3.0~b3-1 +- version 1.3.0b3 + +* Wed Feb 20 2019 Nils Philippsen - 1.2.18-1 +- version 1.2.18 + +* Sat Feb 02 2019 Fedora Release Engineering - 1.2.17-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Jan 30 2019 Nils Philippsen - 1.2.17-1 +- version 1.2.17 + +* Sat Jan 12 2019 Nils Philippsen - 1.2.16-1 +- version 1.2.16 + +* Tue Oct 30 2018 Nils Philippsen - 1.2.12-1 +- version 1.2.12 + +* Tue Aug 21 2018 Nils Philippsen - 1.2.11-1 +- version 1.2.11 + +* Sun Jul 22 2018 Nils Philippsen - 1.2.10-1 +- version 1.2.10 + +* Sat Jul 14 2018 Fedora Release Engineering - 1.2.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Sun Jun 17 2018 Nils Philippsen - 1.2.8-3 +- rename patch, apply with backups +- fix failing test for sqlite 3.24 instead of skipping it + +* Thu Jun 14 2018 Miro Hrončok - 1.2.8-2 +- Rebuilt for Python 3.7 -* Thu Jun 14 2018 Charalampos Stratakis - 1.2.7-2 -- Conditionalize the python2 subpackage +* Tue Jun 05 2018 Nils Philippsen - 1.2.8-1 +- version 1.2.8 * Sun Apr 22 2018 Nils Philippsen - 1.2.7-1 - version 1.2.7