diff --git a/.python-sqlalchemy.metadata b/.python-sqlalchemy.metadata index f031733..7d27e2f 100644 --- a/.python-sqlalchemy.metadata +++ b/.python-sqlalchemy.metadata @@ -1 +1 @@ -343aa9ade5fc6b01933f5d2d8fc97c75005ac9fa SOURCES/SQLAlchemy-1.2.7.tar.gz +752518d26adaf9207c2f808c2fc22a8309a4decb SOURCES/SQLAlchemy-1.3.24.tar.gz diff --git a/SPECS/python-sqlalchemy.spec b/SPECS/python-sqlalchemy.spec index 941064c..831083a 100644 --- a/SPECS/python-sqlalchemy.spec +++ b/SPECS/python-sqlalchemy.spec @@ -1,47 +1,53 @@ -%if 0%{?fedora} || 0%{?rhel} > 7 -%global with_python3 1 +# Don't build Python 3 package on all EL <= 7 +%if !0%{?rhel} || 0%{?rhel} > 7 +%bcond_without python3 +%else +%bcond_with python3 %endif -%if 0%{?rhel} > 7 -# Disable python2 build by default +# Build Python 2 package on all Fedora < 32, EL < 9 +%if !0%{?fedora}%{?rhel} || 0%{?fedora} >= 32 || 0%{?rhel} >= 9 %bcond_with python2 %else %bcond_without python2 %endif +# when bootstrapping Python, pytest-xdist is not yet available +%bcond_without xdist + %global srcname SQLAlchemy Name: python-sqlalchemy -Version: 1.2.7 -Release: 3%{?dist} +Version: 1.3.24 +# 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 +%endif -%if 0%{?with_python3} +%if %{with python3} BuildRequires: python3-devel BuildRequires: python3-setuptools +BuildRequires: python3-mock BuildRequires: python3-pytest +%if %{with xdist} +BuildRequires: python3-pytest-xdist +%endif %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 +55,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 @@ -59,11 +67,10 @@ 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, +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 @@ -72,16 +79,19 @@ 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 +%endif +# with python2 -%if 0%{?with_python3} +%if %{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} +%if ! %{with python2} +Obsoletes: python2-sqlalchemy < 1.3.10-2 +%endif %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,31 +100,32 @@ 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 +%endif +# with python3 -# Filter unnecessary dependencies -%global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch})/.*\\.so$ %prep -%setup -q -n %{srcname}-%{version} +%setup -q -n %{srcname}-%{srcversion} -%patch1 -p1 -b .sqlite-3.24 +# Remove flag for pytest-xdist. (python2-pytest-xdist is a removed dependency.) +# (--max-worker-restart=5 would end the test run after 5 crashing tests.) +sed -i -e's/\(addopts = .*\) --max-worker-restart=5/\1/' setup.cfg %build %if %{with python2} %py2_build -%endif # with python2 +%endif -%if 0%{?with_python3} +%if %{with python3} %py3_build %endif %install %if %{with python2} %py2_install -%endif # with python2 +%endif -%if 0%{?with_python3} +%if %{with python3} %py3_install %endif @@ -124,10 +135,13 @@ rm -rf doc/build %check %if %{with python2} PYTHONPATH=. %{__python2} -m pytest test -%endif # with python2 +%endif -%if 0%{?with_python3} -PYTHONPATH=. %{__python3} -m pytest test +%if %{with python3} +PYTHONPATH=. %{__python3} -m pytest test \ +%if %{with xdist} +--numprocesses=auto +%endif %endif @@ -139,21 +153,150 @@ PYTHONPATH=. %{__python3} -m pytest test %license LICENSE %doc README.rst %{python2_sitearch}/* -%endif # with python2 +%endif +# with python2 -%if 0%{?with_python3} +%if %{with python3} %files -n python3-sqlalchemy %license LICENSE %doc README.rst %{python3_sitearch}/* -%endif # with_python3 +%endif +# with python3 %changelog -* Wed Aug 01 2018 Petr Viktorin - 1.2.7-3 -- Fix tests with SQLite 3.24+ +* Fri May 14 2021 Nils Philippsen - 1.3.24-1 +- version 1.3.24 + +* 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