From dd3713393047f1fe565e55ce8ab430b355f9fcfdc7c28f784388d058656d2b3d Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Sat, 23 Sep 2023 09:04:53 +0000 Subject: [PATCH 1/4] - Update to 0.14.0 * GeoPandas will use Shapely 2.0 by default instead of PyGEOS when both Shapely >= 2.0 and PyGEOS are installed. PyGEOS will continue to be used by default when PyGEOS is installed alongside Shapely < 2.0. Support for PyGEOS and Shapely < 2.0 will be removed in GeoPandas 1.0. (#2999) ## API changes: * seed keyword in sample_points is deprecated. Use rng instead. (#2913). ## New methods: * Added concave_hull method from shapely to GeoSeries/GeoDataframe (#2903). * Added delaunay_triangles method from shapely to GeoSeries/GeoDataframe (#2907). * Added extract_unique_points method from shapely to GeoSeries/GeoDataframe (#2915). * Added frechet_distance() method from shapely to GeoSeries/GeoDataframe (#2929). * Added hausdorff_distance method from shapely to GeoSeries/GeoDataframe (#2909). * Added minimum_rotated_rectangle method from shapely to GeoSeries/GeoDataframe (#2541). * Added offset_curve method from shapely to GeoSeries/GeoDataframe (#2902). * Added remove_repeated_points method from shapely to GeoSeries/GeoDataframe (#2940). * Added reverse method from shapely to GeoSeries/GeoDataframe (#2988). * Added segmentize method from shapely to GeoSeries/GeoDataFrame (#2910). OBS-URL: https://build.opensuse.org/package/show/Application:Geo/python-geopandas?expand=0&rev=7 --- geopandas-0.13.2.tar.gz | 3 -- geopandas-0.14.0.tar.gz | 3 ++ python-geopandas.changes | 65 ++++++++++++++++++++++++++++++++++++++++ python-geopandas.spec | 16 +++++----- 4 files changed, 76 insertions(+), 11 deletions(-) delete mode 100644 geopandas-0.13.2.tar.gz create mode 100644 geopandas-0.14.0.tar.gz diff --git a/geopandas-0.13.2.tar.gz b/geopandas-0.13.2.tar.gz deleted file mode 100644 index 37addba..0000000 --- a/geopandas-0.13.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e5b56d9c20800c77bcc0c914db3f27447a37b23b2cd892be543f5001a694a968 -size 1091231 diff --git a/geopandas-0.14.0.tar.gz b/geopandas-0.14.0.tar.gz new file mode 100644 index 0000000..b7fa81c --- /dev/null +++ b/geopandas-0.14.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea6c031889e1e1888aecaa6e182ca620d78f63551c49b3002a998bcbb280531f +size 1100371 diff --git a/python-geopandas.changes b/python-geopandas.changes index 9a051e1..aad99e2 100644 --- a/python-geopandas.changes +++ b/python-geopandas.changes @@ -1,3 +1,68 @@ +------------------------------------------------------------------- +Sat Sep 23 08:43:04 UTC 2023 - Ben Greiner + +- Update to 0.14.0 + * GeoPandas will use Shapely 2.0 by default instead of PyGEOS + when both Shapely >= 2.0 and PyGEOS are installed. PyGEOS will + continue to be used by default when PyGEOS is installed + alongside Shapely < 2.0. Support for PyGEOS and Shapely < 2.0 + will be removed in GeoPandas 1.0. (#2999) + ## API changes: + * seed keyword in sample_points is deprecated. Use rng instead. + (#2913). + ## New methods: + * Added concave_hull method from shapely to + GeoSeries/GeoDataframe (#2903). + * Added delaunay_triangles method from shapely to + GeoSeries/GeoDataframe (#2907). + * Added extract_unique_points method from shapely to + GeoSeries/GeoDataframe (#2915). + * Added frechet_distance() method from shapely to + GeoSeries/GeoDataframe (#2929). + * Added hausdorff_distance method from shapely to + GeoSeries/GeoDataframe (#2909). + * Added minimum_rotated_rectangle method from shapely to + GeoSeries/GeoDataframe (#2541). + * Added offset_curve method from shapely to + GeoSeries/GeoDataframe (#2902). + * Added remove_repeated_points method from shapely to + GeoSeries/GeoDataframe (#2940). + * Added reverse method from shapely to GeoSeries/GeoDataframe + (#2988). + * Added segmentize method from shapely to GeoSeries/GeoDataFrame + (#2910). + * Added shortest_line method from shapely to + GeoSeries/GeoDataframe (#2960). + ## New features and improvements: + * Added exclusive parameter to sjoin_nearest method for Shapely + >= 2.0 (#2877) + * The to_file() method will now automatically detect the + FlatGeoBuf driver + * for files with the .fgb extension (#2958) + ## Bug fixes: + * Fix ambiguous error when GeoDataFrame is initialized with a + column called "crs" (#2944) + * Fix a color assignment in explore when using UserDefined bins + (#2923) + * Fix bug in apply with axis=1 where the given user defined + function returns nested + * data in the geometry column (#2959) + * Properly infer schema for np.int32 and pd.Int32Dtype columns + (#2950) + * assert_geodataframe_equal now handles GeoDataFrames with no + active geometry (#2498) + ## Notes on (optional) dependencies: + * GeoPandas 0.14 drops support for Python 3.8 and pandas 1.3 and + below (the minimum + * supported pandas version is now 1.4). Further, the minimum + required versions for the + * listed dependencies have now changed to shapely 1.8.0, fiona + 1.8.21, pyproj 3.3.0 and + * matplotlib 3.5.0 (#3001) + ## Deprecations and compatibility notes: + * geom_almost_equals() methods have been deprecated and + * geom_equals_exact() should be used instead (#2604). + ------------------------------------------------------------------- Thu Jun 22 17:42:59 UTC 2023 - Ben Greiner diff --git a/python-geopandas.spec b/python-geopandas.spec index 6fe9def..9a30e89 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -25,25 +25,25 @@ %bcond_with test %endif Name: python-geopandas%{psuffix} -Version: 0.13.2 +Version: 0.14.0 Release: 0 Summary: Geographic pandas extensions License: BSD-3-Clause Group: Development/Languages/Python URL: https://geopandas.org Source: https://files.pythonhosted.org/packages/source/g/geopandas/geopandas-%{version}.tar.gz -BuildRequires: %{python_module base >= 3.8} +BuildRequires: %{python_module base >= 3.9} BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools >= 61} BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: proj -Requires: python-Fiona >= 1.8.19 +Requires: python-Fiona >= 1.8.21 Requires: python-packaging -Requires: python-pandas >= 1.1.0 -Requires: python-pyproj >= 3.0.1 -Requires: python-shapely >= 1.7.1 +Requires: python-pandas >= 1.4.0 +Requires: python-pyproj >= 3.3.0 +Requires: python-shapely >= 1.8.0 Recommends: python-geopy Recommends: python-matplotlib BuildArch: noarch @@ -53,13 +53,13 @@ BuildRequires: %{python_module folium} BuildRequires: %{python_module fsspec} BuildRequires: %{python_module geopandas = %{version}} BuildRequires: %{python_module geopy} -BuildRequires: %{python_module matplotlib} +BuildRequires: %{python_module matplotlib >= 3.5.0} BuildRequires: %{python_module psycopg2} BuildRequires: %{python_module pyarrow} -BuildRequires: %{python_module pygeos >= 0.10} BuildRequires: %{python_module pytest} BuildRequires: %{python_module scipy} BuildRequires: %{python_module sqlalchemy} +BuildConflicts: %{python_module pygeos} # mapclassify not yet available #BuildRequires: %%{python_module mapclassify} %endif From 85a9a6d83717d4380bc035727cdec7b537db6a21cf41919a9c5eb0bdb324130d Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Sat, 23 Sep 2023 09:24:05 +0000 Subject: [PATCH 2/4] . OBS-URL: https://build.opensuse.org/package/show/Application:Geo/python-geopandas?expand=0&rev=8 --- python-geopandas.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-geopandas.spec b/python-geopandas.spec index 9a30e89..28b8fcd 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -56,10 +56,10 @@ BuildRequires: %{python_module geopy} BuildRequires: %{python_module matplotlib >= 3.5.0} BuildRequires: %{python_module psycopg2} BuildRequires: %{python_module pyarrow} +BuildRequires: %{python_module pygeos} BuildRequires: %{python_module pytest} BuildRequires: %{python_module scipy} BuildRequires: %{python_module sqlalchemy} -BuildConflicts: %{python_module pygeos} # mapclassify not yet available #BuildRequires: %%{python_module mapclassify} %endif From 868805aa4ca82eb167b6bb58e83f0ab82dc79ebbfa93495dc87b93e1ce1d3c7c Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Sat, 23 Sep 2023 09:24:34 +0000 Subject: [PATCH 3/4] . OBS-URL: https://build.opensuse.org/package/show/Application:Geo/python-geopandas?expand=0&rev=9 --- python-geopandas.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-geopandas.spec b/python-geopandas.spec index 28b8fcd..c4f862b 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -56,7 +56,7 @@ BuildRequires: %{python_module geopy} BuildRequires: %{python_module matplotlib >= 3.5.0} BuildRequires: %{python_module psycopg2} BuildRequires: %{python_module pyarrow} -BuildRequires: %{python_module pygeos} +BuildRequires: %{python_module pygeos >= 0.10} BuildRequires: %{python_module pytest} BuildRequires: %{python_module scipy} BuildRequires: %{python_module sqlalchemy} From d251d91cc103e10dc1ad9179d311093c84e31aae8ed0fe8d405d697e4eeeb000 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Sat, 23 Sep 2023 09:38:25 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/Application:Geo/python-geopandas?expand=0&rev=10 --- python-geopandas.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/python-geopandas.spec b/python-geopandas.spec index c4f862b..ed9c1c0 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -95,6 +95,9 @@ donttest="$donttest or (test_arrow and (test_read_versioned_file or test_read_gd # wrong shapely type donttest="$donttest or (test_geom_methods and test_sample_points_array)" donttest="$donttest or (test_random and test_uniform and geom)" +if [ $(getconf LONG_BIT) -eq 32 ]; then + donttest="$donttest or test_explode or test_get_coordinates_parts" +fi %pytest -rsfE -k "not ($donttest)" %endif