From 92ae1563d080ff83b88656c1ba07f4cf51b07f02b01cd218ff248a6ebe0d5b03 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 10 Feb 2021 06:36:50 +0000 Subject: [PATCH] Accepting request 870721 from home:bnavigator:branches:Application:Geo - Fix malformed Cython requirement - Remove (malformed) unneeded coverage requirement and mock which is imported from unittest already. - Actually install the alternative for the entrypoint - Use the pytest_arch macro for the tests OBS-URL: https://build.opensuse.org/request/show/870721 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/python-pyproj?expand=0&rev=30 --- python-pyproj.changes | 9 +++++++++ python-pyproj.spec | 20 ++++++++++++++------ 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/python-pyproj.changes b/python-pyproj.changes index 1405c38..3d0fdd1 100644 --- a/python-pyproj.changes +++ b/python-pyproj.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Feb 9 23:23:49 UTC 2021 - Benjamin Greiner + +- Fix malformed Cython requirement +- Remove (malformed) unneeded coverage requirement and mock which + is imported from unittest already. +- Actually install the alternative for the entrypoint +- Use the pytest_arch macro for the tests + ------------------------------------------------------------------- Tue Jan 19 10:18:11 UTC 2021 - Guillaume GARDET diff --git a/python-pyproj.spec b/python-pyproj.spec index e8126fc..c1f11ab 100644 --- a/python-pyproj.spec +++ b/python-pyproj.spec @@ -26,7 +26,7 @@ License: SUSE-Public-Domain AND X11 Group: Development/Languages/Python URL: https://github.com/pyproj4/pyproj Source: https://files.pythonhosted.org/packages/source/p/pyproj/pyproj-%{version}.tar.gz -BuildRequires: %{python_module Cython} >= 0.23.5 +BuildRequires: %{python_module Cython >= 0.23.5} BuildRequires: %{python_module Shapely} BuildRequires: %{python_module aenum} BuildRequires: %{python_module devel} @@ -38,11 +38,10 @@ BuildRequires: proj-devel >= 7.2.0 BuildRequires: python-rpm-macros Requires: python-aenum Requires: python-numpy +Requires(post): update-alternatives +Requires(postun): update-alternatives # SECTION test requirements BuildRequires: %{python_module certifi} -BuildRequires: %{python_module cov-core} -BuildRequires: %{python_module coverage} >= 4.0 -BuildRequires: %{python_module mock} BuildRequires: %{python_module pandas} BuildRequires: %{python_module pytest} BuildRequires: %{python_module testsuite} @@ -89,14 +88,23 @@ export PROJ_DIR=$(pkg-config --variable=libdir proj) %{python_expand # Multiline export PYTHONPATH=%{buildroot}%{$python_sitearch} $python -c "import pyproj; pyproj.Proj(init='epsg:4269')" -py.test-%{$python_bin_suffix} --ignore=_build.python2 --ignore=_build.python3 --ignore=_build.python36 --ignore=_build.python38 --ignore=_build.pypy3 -v -m "not network and not cli and not grid" } +# Reset to remove wrong flavor path from loop above +export PYTHONPATH="" +%pytest_arch -m "not network and not cli and not grid" mv pyproj_temp pyproj +%post +%python_install_alternative pyproj + +%postun +%python_uninstall_alternative pyproj + %files %{python_files} %python_alternative %{_bindir}/pyproj %license LICENSE %doc README.md -%{python_sitearch}/* +%{python_sitearch}/pyproj +%{python_sitearch}/pyproj-%{version}*-info %changelog