From 00235161cadec65e250819d83d30cb2d3fcf52335552f3849e013bf6c5fbe069 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 3 Jun 2020 07:43:14 +0000 Subject: [PATCH] - Switch to multibuild to avoid cycle with python-asdf package OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-astropy?expand=0&rev=26 --- _multibuild | 3 +++ python-astropy.changes | 5 +++++ python-astropy.spec | 18 ++++++++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 _multibuild diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..fcc7b97 --- /dev/null +++ b/_multibuild @@ -0,0 +1,3 @@ + + test + diff --git a/python-astropy.changes b/python-astropy.changes index ce37c1f..2fa29fe 100644 --- a/python-astropy.changes +++ b/python-astropy.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 3 07:42:45 UTC 2020 - Tomáš Chvátal + +- Switch to multibuild to avoid cycle with python-asdf package + ------------------------------------------------------------------- Wed May 27 09:36:06 UTC 2020 - Petr Gajdos diff --git a/python-astropy.spec b/python-astropy.spec index 2360502..e4d3b13 100644 --- a/python-astropy.spec +++ b/python-astropy.spec @@ -17,6 +17,14 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "test" +%define psuffix -test +%bcond_without test +%else +%define psuffix %{nil} +%bcond_with test +%endif %define binaries fitsdiff fitsheader fitscheck fitsinfo fits2bitmap samp_hub showtable volint wcslint %define skip_python2 1 Name: python-astropy @@ -66,6 +74,7 @@ Recommends: python-pandas Recommends: python-scikit-image Recommends: python-scipy >= 0.18 Conflicts: perl-Data-ShowTable +%if %{with test} # SECTION Optional requirements BuildRequires: %{python_module Bottleneck} BuildRequires: %{python_module Jinja2} @@ -89,6 +98,7 @@ BuildRequires: %{python_module pytest-astropy} BuildRequires: %{python_module pytest-doctestplus} BuildRequires: %{python_module pytest-mpl} # /SECTION +%endif %python_subpackages %description @@ -110,9 +120,12 @@ echo "[build]" >> setup.cfg echo "use_system_libraries=1" >> setup.cfg %build +%if !%{with test} %python_build --use-system-libraries --offline +%endif %install +%if !%{with test} %python_install --use-system-libraries --offline for b in %{binaries}; do %python_clone -a %{buildroot}%{_bindir}/$b @@ -136,8 +149,10 @@ $python -m compileall -d %{$python_sitearch} %{buildroot}%{$python_sitearch}/ $python -O -m compileall -d %{$python_sitearch} %{buildroot}%{$python_sitearch}/astropy/wcs/tests/ %fdupes %{buildroot}%{$python_sitearch} } +%endif %check +%if %{with test} export PYTHONDONTWRITEBYTECODE=1 # http://docs.astropy.org/en/latest/development/testguide.html#running-tests %python_exec setup.py build_ext --inplace --offline @@ -149,7 +164,9 @@ export PYTHONDONTWRITEBYTECODE=1 -W "ignore:Unknown pytest.mark.openfiles_ignore:pytest.PytestUnknownMarkWarning" \ --ignore "docs/whatsnew" %{?skippytest} } +%endif +%if !%{with test} %post for b in %{binaries}; do %python_install_alternative $b @@ -174,5 +191,6 @@ done %python_alternative %{_bindir}/wcslint %{python_sitearch}/astropy/ %{python_sitearch}/astropy-%{version}-py*.egg-info +%endif %changelog