diff --git a/.gitignore b/.gitignore index 5fa314f..1378eec 100644 --- a/.gitignore +++ b/.gitignore @@ -2,31 +2,3 @@ /geopandas-0.4.0.tar.gz /geopandas-0.4.1.tar.gz /geopandas-0.5.0.tar.gz -/geopandas-0.5.1.tar.gz -/geopandas-0.6.0rc1.tar.gz -/geopandas-0.6.0.tar.gz -/geopandas-0.6.3.tar.gz -/geopandas-0.7.0.tar.gz -/geopandas-0.8.0.tar.gz -/geopandas-0.8.1.tar.gz -/geopandas-0.8.2.tar.gz -/geopandas-0.9.0.tar.gz -/geopandas-0.10.0.tar.gz -/geopandas-0.10.1.tar.gz -/geopandas-0.10.2.tar.gz -/geopandas-0.11.1.tar.gz -/geopandas-0.12.1.tar.gz -/geopandas-0.12.2.tar.gz -/geopandas-0.13.0.tar.gz -/geopandas-0.13.2.tar.gz -/geopandas-0.14.0.tar.gz -/geopandas-0.14.1.tar.gz -/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 diff --git a/.packit.yaml b/.packit.yaml deleted file mode 100644 index d11d5ba..0000000 --- a/.packit.yaml +++ /dev/null @@ -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 diff --git a/0001-Skip-test_overlay_nybb-on-broken-platforms.patch b/0001-Skip-test_overlay_nybb-on-broken-platforms.patch new file mode 100644 index 0000000..700e788 --- /dev/null +++ b/0001-Skip-test_overlay_nybb-on-broken-platforms.patch @@ -0,0 +1,35 @@ +From edc1e70f15da652dc2468e21d5dbb6b58f9ddeec Mon Sep 17 00:00:00 2001 +From: Elliott Sales de Andrade +Date: Sun, 29 Jul 2018 19:34:39 -0400 +Subject: [PATCH] Skip test_overlay_nybb on broken platforms. + +Signed-off-by: Elliott Sales de Andrade +--- + geopandas/tests/test_overlay.py | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/geopandas/tests/test_overlay.py b/geopandas/tests/test_overlay.py +index a5ab76d..bfd7641 100644 +--- a/geopandas/tests/test_overlay.py ++++ b/geopandas/tests/test_overlay.py +@@ -1,6 +1,7 @@ + from __future__ import absolute_import + + import os ++import platform + from distutils.version import LooseVersion + + import pandas as pd +@@ -99,6 +100,9 @@ def test_overlay(dfs_index, how, use_sindex): + assert_geodataframe_equal(result, expected, check_column_type=False) + + ++@pytest.mark.xfail( ++ platform.machine() in ('aarch64', 'ppc64', 'ppc64le', 's390x'), ++ reason='platform-specific problems') + def test_overlay_nybb(how): + polydf = read_file(geopandas.datasets.get_path('nybb')) + +-- +2.20.1 + diff --git a/README.packit b/README.packit deleted file mode 100644 index dd0af79..0000000 --- a/README.packit +++ /dev/null @@ -1,3 +0,0 @@ -This repository is maintained by packit. -https://packit.dev/ -The file was generated using packit 1.16.1. diff --git a/changelog b/changelog deleted file mode 100644 index 3b0a351..0000000 --- a/changelog +++ /dev/null @@ -1,113 +0,0 @@ -* Mon Sep 13 2021 Elliott Sales de Andrade - 0.9.0-4 -- Backport patches for GDAL 3.3 (#1981675) - -* Fri Jul 23 2021 Fedora Release Engineering - 0.9.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Jun 17 2021 Elliott Sales de Andrade - 0.9.0-2 -- Update & correct dependencies -- Backport patch to fix tests with Proj 8.0.1 -- Skip tests broken on GDAL 3.3.0 - -* Fri Jun 04 2021 Python Maint - 0.9.0-2 -- Rebuilt for Python 3.10 - -* Sun Feb 28 2021 Elliott Sales de Andrade - 0.9.0-1 -- Update to latest version (#1933514) - -* Sat Feb 06 2021 Elliott Sales de Andrade - 0.8.2-1 -- Update to latest version (#1920235) - -* Wed Jan 27 2021 Fedora Release Engineering - 0.8.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 0.8.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 17 2020 Elliott Sales de Andrade - 0.8.1-2 -- Fix alternate architecture patch. - -* Thu Jul 16 2020 Elliott Sales de Andrade - 0.8.1-1 -- Update to latest version - -* Thu Jul 02 2020 Elliott Sales de Andrade - 0.8.0-1 -- Update to latest version - -* Tue May 26 2020 Miro Hrončok - 0.7.0-2 -- Rebuilt for Python 3.9 - -* Tue Feb 18 2020 Elliott Sales de Andrade - 0.7.0-1 -- Update to latest version - -* Sat Feb 08 2020 Elliott Sales de Andrade - 0.6.3-1 -- Update to latest version - -* Thu Jan 30 2020 Fedora Release Engineering - 0.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sun Sep 29 2019 Elliott Sales de Andrade - 0.6.0-1 -- Update to latest version - -* Sat Aug 24 2019 Elliott Sales de Andrade - 0.6.0-0.1.rc1 -- Update to latest release candidate - -* Sat Aug 24 2019 Elliott Sales de Andrade - 0.5.1-1 -- Update to latest version - -* Mon Aug 19 2019 Miro Hrončok - 0.5.0-3 -- Rebuilt for Python 3.8 - -* Fri Jul 26 2019 Fedora Release Engineering - 0.5.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Apr 27 2019 Elliott Sales de Andrade - 0.5.0-1 -- Update to latest version - -* Sat Mar 09 2019 Elliott Sales de Andrade - 0.4.1-1 -- Update to latest version - -* Sat Feb 02 2019 Fedora Release Engineering - 0.4.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Sep 21 2018 Miro Hrončok - 0.4.0-2 -- Drop Python 2 subpackage - -* Wed Jul 18 2018 Elliott Sales de Andrade - 0.4.0-1 -- Update to latest version - -* Sat Jul 14 2018 Fedora Release Engineering - 0.3.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Jul 11 2018 Elliott Sales de Andrade - 0.3.0-6 -- Add patch to build against Pandas 0.23.0 - -* Tue Jun 19 2018 Miro Hrončok - 0.3.0-6 -- Rebuilt for Python 3.7 - -* Wed Feb 14 2018 Elliott Sales de Andrade - 0.3.0-5 -- rebuilt - -* Fri Feb 09 2018 Fedora Release Engineering - 0.3.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sat Dec 09 2017 Elliott Sales de Andrade - 0.3.0-3 -- Add patch for non-x86 systems. -- Use python2-* BR. - -* Fri Dec 01 2017 Elliott Sales de Andrade - 0.3.0-2 -- Add patch for non-x86 systems. - -* Tue Sep 19 2017 Elliott Sales de Andrade - 0.3.0-1 -- Update to latest version. -- Use lowercase rtree dependency. -- Fix inconsistent capitalization. - -* Sat Aug 12 2017 Elliott Sales de Andrade - 0.2.1-3 -- Simplify spec with more macros. - -* Sun Jul 09 2017 Elliott Sales de Andrade - 0.2.1-2 -- Simplify spec a bit. -- Add patch for new Pandas compatibility. - -* Sun Mar 05 2017 Elliott Sales de Andrade - 0.2.1-1 -- Initial package release. diff --git a/python-geopandas.spec b/python-geopandas.spec index 47100b5..bbf533e 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -1,22 +1,9 @@ %global srcname geopandas -# There is a build dependency loop when built with tests. -# It involves libpysal, mapclassify, networkx. -# This bcond allows to bootstrap it. -%bcond bootstrap 0 - Name: python-%{srcname} -Version: 1.1.4 -Release: %autorelease +Version: 0.5.0 +Release: 1%{?dist} 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 - -BuildArch: noarch - %global _description \ GeoPandas is a project to add support for geographic data to Pandas objects. \ \ @@ -26,55 +13,151 @@ operations in Pandas and a high-level interface to multiple geometries to \ Shapely. GeoPandas enables you to easily do operations in Python that would \ otherwise require a spatial database such as PostGIS. +License: BSD +URL: https://pypi.python.org/pypi/%{srcname} +Source0: https://github.com/%{srcname}/%{srcname}/archive/v%{version}/%{srcname}-%{version}.tar.gz +Patch0001: 0001-Skip-test_overlay_nybb-on-broken-platforms.patch + +BuildArch: noarch + %description %{_description} +%package -n python2-%{srcname} +Summary: %{summary} +%{?python_provide:%python_provide python2-%{srcname}} + +BuildRequires: python2-devel +BuildRequires: python2-six >= 1.3.0 +BuildRequires: python2-descartes >= 1.0 +BuildRequires: python2-fiona >= 1.0.1 +BuildRequires: python2-pandas +BuildRequires: python2-pyproj >= 1.9.3 +BuildRequires: python2-shapely >= 1.2.18 + +BuildRequires: python2-pytest +BuildRequires: python2-rtree >= 0.8 +BuildRequires: python2-mock >= 1.0.1 +BuildRequires: python2-matplotlib >= 1.2.1 +# Still needed in this release of Matplotlib. +BuildRequires: python2-nose python3-nose + +Requires: python2-six >= 1.3.0 +Requires: python2-descartes >= 1.0 +Requires: python2-fiona >= 1.0.1 +Requires: python2-pandas +Requires: python2-pyproj >= 1.9.3 +Requires: python2-shapely >= 1.2.18 + +%description -n python2-%{srcname} %{_description} + + %package -n python3-%{srcname} Summary: %{summary} -BuildRequires: python3-devel +%{?python_provide:%python_provide python3-%{srcname}} -%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(pytest) -BuildRequires: python3dist(sqlalchemy) >= 2 -BuildRequires: python3dist(xyzservices) -# See: -# Depend on pandas[test] for testing -# https://github.com/geopandas/geopandas/pull/2438 -BuildRequires: python3dist(pandas[test]) -%endif +BuildRequires: python3-devel +BuildRequires: python3-six >= 1.3.0 +BuildRequires: python3-descartes +BuildRequires: python3-fiona >= 1.0.1 +BuildRequires: python3-pandas +BuildRequires: python3-pyproj >= 1.9.3 +BuildRequires: python3-shapely >= 1.2.18 + +BuildRequires: python3-pytest +BuildRequires: python3-rtree >= 0.8 +BuildRequires: python3-matplotlib >= 1.2.1 +# Still needed in this release of Matplotlib. +BuildRequires: python3-nose + +Requires: python3-six >= 1.3.0 +Requires: python3-descartes +Requires: python3-fiona >= 1.0.1 +Requires: python3-pandas +Requires: python3-pyproj >= 1.9.3 +Requires: python3-shapely >= 1.2.18 %description -n python3-%{srcname} %{_description} + %prep %autosetup -n %{srcname}-%{version} -p1 -%generate_buildrequires -%pyproject_buildrequires %build -%pyproject_wheel +%py2_build +%py3_build + %install -%pyproject_install -%pyproject_save_files %{srcname} +%py2_install +%py3_install + %check -%if %{without bootstrap} -%{pytest} -ra geopandas -m 'not web' -%else -%pyproject_check_import -e 'geopandas.*test*' -%endif +PYTHONPATH="%{buildroot}%{python3_sitelib}" \ + py.test-%{python3_version} -ra geopandas -m 'not web' +PYTHONPATH="%{buildroot}%{python2_sitelib}" \ + py.test-%{python2_version} -ra geopandas -m 'not web' -%files -n python3-%{srcname} -f %{pyproject_files} + +%files -n python2-%{srcname} %license LICENSE.txt %doc README.md CHANGELOG.md +%{python2_sitelib}/%{srcname} +%{python2_sitelib}/%{srcname}-%{version}-py?.?.egg-info + + +%files -n python3-%{srcname} +%license LICENSE.txt +%doc README.md CHANGELOG.md +%{python3_sitelib}/%{srcname} +%{python3_sitelib}/%{srcname}-%{version}-py?.?.egg-info + %changelog -%autochangelog +* Sat Apr 27 2019 Elliott Sales de Andrade - 0.5.0-1 +- Update to latest version + +* Sat Mar 09 2019 Elliott Sales de Andrade - 0.4.1-1 +- Update to latest version + +* Wed Jul 18 2018 Elliott Sales de Andrade - 0.4.0-1 +- Update to latest version + +* Sat Jul 14 2018 Fedora Release Engineering - 0.3.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Jul 11 2018 Elliott Sales de Andrade - 0.3.0-6 +- Add patch to build against Pandas 0.23.0 + +* Tue Jun 19 2018 Miro Hrončok - 0.3.0-6 +- Rebuilt for Python 3.7 + +* Wed Feb 14 2018 Elliott Sales de Andrade - 0.3.0-5 +- rebuilt + +* Fri Feb 09 2018 Fedora Release Engineering - 0.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sat Dec 09 2017 Elliott Sales de Andrade - 0.3.0-3 +- Add patch for non-x86 systems. +- Use python2-* BR. + +* Fri Dec 01 2017 Elliott Sales de Andrade - 0.3.0-2 +- Add patch for non-x86 systems. + +* Tue Sep 19 2017 Elliott Sales de Andrade - 0.3.0-1 +- Update to latest version. +- Use lowercase rtree dependency. +- Fix inconsistent capitalization. + +* Sat Aug 12 2017 Elliott Sales de Andrade - 0.2.1-3 +- Simplify spec with more macros. + +* Sun Jul 09 2017 Elliott Sales de Andrade - 0.2.1-2 +- Simplify spec a bit. +- Add patch for new Pandas compatibility. + +* Sun Mar 05 2017 Elliott Sales de Andrade - 0.2.1-1 +- Initial package release. diff --git a/sources b/sources index b798a00..214c1b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geopandas-1.1.4.tar.gz) = 70e30407e50acee8ff8d081d3db097ab188a078467bffe2e9765c5d64d9e1d88be76c4f37747a5c107cb96d75c9fa53a7f779e0b406b784386be7d5fef899878 +SHA512 (geopandas-0.5.0.tar.gz) = ea006c1966b1dcc6b5bbe77273e3ea6233d9a53935ddcf43349e53ca4d930f44d9da3d2ba5ce98564a79311aa3cdc37ab761408f60ba76230baf0807be483325