Compare commits

..

No commits in common. "rawhide" and "f41" have entirely different histories.

6 changed files with 49 additions and 41 deletions

6
.gitignore vendored
View file

@ -24,9 +24,3 @@
/geopandas-0.14.2.tar.gz
/geopandas-0.14.3.tar.gz
/geopandas-0.14.4.tar.gz
/geopandas-1.0.1.tar.gz
/geopandas-1.1.0.tar.gz
/geopandas-1.1.1.tar.gz
/geopandas-1.1.2.tar.gz
/geopandas-1.1.3.tar.gz
/geopandas-1.1.4.tar.gz

View file

@ -1,18 +0,0 @@
# See the documentation for more information:
# https://packit.dev/docs/configuration/
---
jobs:
- job: pull_from_upstream
trigger: release
dist_git_branches:
rawhide:
fast_forward_merge_into:
- fedora-branched
- job: koji_build
trigger: commit
dist_git_branches:
- fedora-all
- job: bodhi_update
trigger: commit
dist_git_branches:
- fedora-all

View file

@ -0,0 +1,34 @@
From e0db755cb3680977463c1c71dee600038b464216 Mon Sep 17 00:00:00 2001
From: Martin Fleischmann <martin@martinfleischmann.net>
Date: Fri, 17 May 2024 09:31:36 +0200
Subject: [PATCH] Backport fixes for GDAL 3.9
This backports two commits:
- TST: GDAL 3.9 compat for boolean array in shp (#3286)
- TST: GDAL 3.9 compat for boolean array in shp for fiona (#3303)
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
geopandas/io/tests/test_file.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/geopandas/io/tests/test_file.py b/geopandas/io/tests/test_file.py
index 4b516276..005a4c27 100644
--- a/geopandas/io/tests/test_file.py
+++ b/geopandas/io/tests/test_file.py
@@ -174,9 +174,10 @@ def test_to_file_bool(tmpdir, driver, ext, engine):
result = read_file(tempfilename, engine=engine)
if ext in (".shp", ""):
# Shapefile does not support boolean, so is read back as int
- if engine == "fiona":
+ # but since GDAL 3.9 supports boolean fields in SHP
+ if engine == "fiona" and fiona.gdal_version.minor < 9:
df["col"] = df["col"].astype("int64")
- else:
+ elif engine == "pyogrio" and pyogrio.__gdal_version__ < (3, 9):
df["col"] = df["col"].astype("int32")
assert_geodataframe_equal(result, df)
# check the expected driver
--
2.45.2

View file

@ -1,3 +0,0 @@
This repository is maintained by packit.
https://packit.dev/
The file was generated using packit 1.16.1.

View file

@ -6,14 +6,16 @@
%bcond bootstrap 0
Name: python-%{srcname}
Version: 1.1.4
Version: 0.14.4
Release: %autorelease
Summary: Geographic Pandas extensions
License: BSD-3-Clause
URL: https://pypi.python.org/pypi/%{srcname}
# PyPI source does not have test data.
Source: https://github.com/%{srcname}/%{srcname}/archive/v%{version}/%{srcname}-%{version}.tar.gz
Source0: https://github.com/%{srcname}/%{srcname}/archive/v%{version}/%{srcname}-%{version}.tar.gz
# https://github.com/geopandas/geopandas/pull/3286
# https://github.com/geopandas/geopandas/pull/3303
Patch: 0001-Backport-fixes-for-GDAL-3.9.patch
BuildArch: noarch
@ -34,16 +36,14 @@ Summary: %{summary}
BuildRequires: python3-devel
%if %{without bootstrap}
BuildRequires: python3dist(fsspec)
BuildRequires: python3dist(fiona) >= 1.8.21
BuildRequires: python3dist(geopy)
BuildRequires: python3dist(mapclassify) >= 2.5
BuildRequires: python3dist(matplotlib) >= 3.7
BuildRequires: python3dist(psycopg) >= 3.1
BuildRequires: python3dist(pyarrow) >= 8
BuildRequires: python3dist(numpy) >= 1.15
BuildRequires: python3dist(pytest)
BuildRequires: python3dist(sqlalchemy) >= 2
BuildRequires: python3dist(xyzservices)
BuildRequires: python3dist(fsspec)
BuildRequires: python3dist(psycopg2)
BuildRequires: python3dist(rtree) >= 0.8
BuildRequires: python3dist(sqlalchemy)
BuildRequires: python3dist(matplotlib) >= 3.3.4
BuildRequires: python3dist(mapclassify)
# See:
# Depend on pandas[test] for testing
# https://github.com/geopandas/geopandas/pull/2438
@ -69,7 +69,8 @@ BuildRequires: python3dist(pandas[test])
%if %{without bootstrap}
%{pytest} -ra geopandas -m 'not web'
%else
%pyproject_check_import -e 'geopandas.*test*'
# naturalearth_creation assumes zipfile from naturalearthdata was downloaded to current directory
%pyproject_check_import -e 'geopandas.*test*' -e geopandas.datasets.naturalearth_creation
%endif
%files -n python3-%{srcname} -f %{pyproject_files}

View file

@ -1 +1 @@
SHA512 (geopandas-1.1.4.tar.gz) = 70e30407e50acee8ff8d081d3db097ab188a078467bffe2e9765c5d64d9e1d88be76c4f37747a5c107cb96d75c9fa53a7f779e0b406b784386be7d5fef899878
SHA512 (geopandas-0.14.4.tar.gz) = 2e6a5075662a6b2a1c7202a1a6d7f001ad9c3c5c76794b69b2e6d5b97aa7f05e60ac59b494031227b48340d188dc243945289558fe22fd336608b75413c4b717