#5 Drop dependency on pandas for i686
Merged 2 months ago by jdekloe. Opened 2 months ago by gui1ty.
rpms/ gui1ty/pyproj pandas  into  rawhide

file modified
+16 -4
@@ -4,7 +4,7 @@ 

  

  Name:           pyproj

  Version:        3.6.1

- Release:        3%{?dist}

+ Release:        4%{?dist}

  Summary:        Cython wrapper to provide python interfaces to Proj

  # this software uses the "MIT:Modern Style with sublicense" license

  License:        MIT
@@ -24,9 +24,13 @@ 

  

  # needed to run the tests

  BuildRequires:  python3-pytest

+ # Pandas will drop i686 (xarray depends on pandas)

+ # https://bugzilla.redhat.com/show_bug.cgi?id=2263999 

+ %ifnarch %{ix86}

  BuildRequires:  python3-pandas

- BuildRequires:  python3-shapely

  BuildRequires:  python3-xarray

+ %endif

+ BuildRequires:  python3-shapely

  

  # needed to remove the hardcoded rpath '/usr/lib' from the _proj.so file

  BuildRequires:  chrpath
@@ -157,9 +161,14 @@ 

  cp -r ../pyproj-%{version}/test .

  cp -r ../pyproj-%{version}/pytest.ini .

  

- PATH="%{buildroot}%{_bindir}:$PATH" \

- PYTHONPATH="%{buildroot}%{python3_sitearch}" \

+ export PATH="%{buildroot}%{_bindir}:$PATH"

+ export PYTHONPATH="%{buildroot}%{python3_sitearch}"

+ # Test without pandas on i686

+ %ifnarch %{ix86}

  py.test-3 -m "not network"

+ %else

+ py.test-3 -m "not network and not pandas"

+ %endif

  

  # some notes on the test suite:

  # not network ==> deselects 24 tests
@@ -176,6 +185,9 @@ 

  

  

  %changelog

+ * Tue Mar 05 2024 Sandro <devel@penguinpee.nl>

+ - Drop dependency on pandas for i686

+ 

  * Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-3

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

  

In the next major update pandas will drop support for i686. This
package build requires pandas. Ensure pandas is no longer required
when building for i686.

More information is available in Bugzilla:
https://bugzilla.redhat.com/show_bug.cgi?id=2263999

Thanks for your contribution. Merging it now.

Pull-Request has been merged by jdekloe

2 months ago

Thanks for the quick merge. I'm also running test builds on i686 in Copr to make sure I'm not missing anything, introducing regressions, etc.

For the pyproj test build on i686, I noticed one of the tests fails with AssertionError. That's not related to dropping pandas afaict. But I wanted to let you know for awareness.

Metadata