diff --git a/.gitignore b/.gitignore index 5fa314f..df91bc0 100644 --- a/.gitignore +++ b/.gitignore @@ -17,16 +17,3 @@ /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/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/python-geopandas.spec b/python-geopandas.spec index 47100b5..896c739 100644 --- a/python-geopandas.spec +++ b/python-geopandas.spec @@ -3,17 +3,16 @@ # There is a build dependency loop when built with tests. # It involves libpysal, mapclassify, networkx. # This bcond allows to bootstrap it. -%bcond bootstrap 0 +%bcond_without tests Name: python-%{srcname} -Version: 1.1.4 +Version: 0.12.2 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 BuildArch: noarch @@ -33,17 +32,15 @@ otherwise require a spatial database such as PostGIS. 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 +%if %{with tests} +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) >= 2.0.1 +BuildRequires: python3dist(mapclassify) # See: # Depend on pandas[test] for testing # https://github.com/geopandas/geopandas/pull/2438 @@ -56,7 +53,7 @@ BuildRequires: python3dist(pandas[test]) %autosetup -n %{srcname}-%{version} -p1 %generate_buildrequires -%pyproject_buildrequires +%pyproject_buildrequires -r %build %pyproject_wheel @@ -66,10 +63,11 @@ BuildRequires: python3dist(pandas[test]) %pyproject_save_files %{srcname} %check -%if %{without bootstrap} +%if %{with tests} %{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} diff --git a/sources b/sources index b798a00..63f8cc2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geopandas-1.1.4.tar.gz) = 70e30407e50acee8ff8d081d3db097ab188a078467bffe2e9765c5d64d9e1d88be76c4f37747a5c107cb96d75c9fa53a7f779e0b406b784386be7d5fef899878 +SHA512 (geopandas-0.12.2.tar.gz) = 6470bf45360bb6486607870ee643f295a8823ce3109b777ec9d1eb576bc11c717d3dc40777481748ffe8d17a6d9869245efff5298bea274ec108ca9d0b1502ba