#8 Revert "version 1.4.3"
Merged 3 years ago by churchyard. Opened 3 years ago by thrnciar.
rpms/ thrnciar/python-sqlalchemy revert-update  into  rawhide

file modified
-1
@@ -86,4 +86,3 @@ 

  /SQLAlchemy-1.3.19.tar.gz

  /SQLAlchemy-1.3.20.tar.gz

  /SQLAlchemy-1.3.22.tar.gz

- /SQLAlchemy-1.4.3.tar.gz

file modified
+11 -8
@@ -5,8 +5,8 @@ 

  %bcond_with python3

  %endif

  

- # Build Python 2 package on all EL < 9

- %if !0%{?rhel} || 0%{?rhel} >= 9

+ # 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
@@ -18,10 +18,10 @@ 

  %global srcname SQLAlchemy

  

  Name:           python-sqlalchemy

- Version:        1.4.3

+ Version:        1.3.22

  # cope with pre-release versions containing tildes

  %global srcversion %{lua: srcversion, num = rpm.expand("%{version}"):gsub("~", ""); print(srcversion);}

- Release:        1%{?dist}

+ Release:        3%{?dist}

  Summary:        Modular and flexible ORM library for python

  

  License:        MIT
@@ -37,7 +37,7 @@ 

  %endif

  

  %if %{with python3}

- BuildRequires:  python3-devel >= 3.6

+ BuildRequires:  python3-devel

  BuildRequires:  python3-setuptools

  BuildRequires:  python3-mock

  BuildRequires:  python3-pytest
@@ -138,7 +138,10 @@ 

  %endif

  

  %if %{with python3}

- PYTHONPATH=. %{__python3} -m pytest test \

+ # Package is FTBFS because of failing test_pyodbc_extra_connect_azure.

+ # Since there is old version of sqlalchemy in rawhide, there is no point

+ # to fix it and we are just skipping it.

+ PYTHONPATH=. %{__python3} -m pytest -k "not test_pyodbc_extra_connect_azure" test \

  %if %{with xdist}

  --numprocesses=auto

  %endif
@@ -165,8 +168,8 @@ 

  # with python3

  

  %changelog

- * Fri Mar 26 2021 Nils Philippsen <nils@tiptoe.de> - 1.4.3-1

- - version 1.4.3

+ * Fri Apr 30 2021 Tomas Hrnciar <thrnciar@redhat.com> - 1.3.22-3

+ - Disabled failing test test_pyodbc_extra_connect_azure

  

  * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.22-2

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

file modified
+1 -1
@@ -1,1 +1,1 @@ 

- SHA512 (SQLAlchemy-1.4.3.tar.gz) = cdb133b2feb480aa9d10f7e38d5c8342ceca327013a9cfea814887cc28eb544f79afc50a08d735195ad0130961429145ef0e641b17584ccb7aec6461cb9e7b15

+ SHA512 (SQLAlchemy-1.3.22.tar.gz) = 5e43af97dd93af8174f14575c8238a72153afa4dbe56503cf934de9f783ea15ad27b25523c147191bd2ec89e25baafab5f5d9c34a29f71eaf4e2de49af5bb887

This reverts commit 11418b4.
python-sqlalchemy v1.4.3 does not work with python-greenlet v0.4.17 which is in rawhide. We cannot update python-sqlalchemy until it is this fixed in the upstream.

rebased onto 7af0450

3 years ago

I'd bump the release in "Disable failing test..." so we can actually build it in rawhide and make Koschei take it.

Looks good otherwise, assuming it also builds on s390x (the scratchbuild has not yet finished at this moment).

2 new commits added

  • Disable failing test so package starts to build again
  • Revert "version 1.4.3"
3 years ago

I'd bump the release in "Disable failing test..." so we can actually build it in rawhide and make Koschei take it.

Looks good otherwise, assuming it also builds on s390x (the scratchbuild has not yet finished at this moment).

Done, in the mean time s390x build succeeded as well.

Looks ok to me. Let me know if you would like me to merge/build it or you will.

Either works fine, I'll do it.

Pull-Request has been merged by churchyard

3 years ago