Accepting request 935928 from devel:languages:python:numeric

OBS-URL: https://build.opensuse.org/request/show/935928
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-sherpa?expand=0&rev=11
This commit is contained in:
Dominique Leuenberger 2021-12-06 22:59:56 +00:00 committed by Git OBS Bridge
commit ab152915d1
6 changed files with 50 additions and 45 deletions

View File

@ -1,3 +1,41 @@
-------------------------------------------------------------------
Fri Dec 3 13:21:21 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Update to 4.14.0:
* enhancements:
- filtering and grouping area for binned (1D) spectral data has been improved
with changes to the default behavior and many bug fixes resulting in changes
to the statistics, degrees-of-freedom and energy flux in comparison to the
previous version for the same data with the same filter.
- updates to allow users to change the hard limits of XSPEC model parameters
- the sample_flux routine now returns correct information for the clip column
* documentation changes:
- improved PHA simulation documentation
- improved Filtering and grouping of PHA data documentation
- added sherpa.image module documentation
- added section on running tests to developer docs
* Infrastructure Changes:
- updates to support Apple ARM
- update to support Xspec version 12.12
- update fftw from version 3.3.8 to 3.3.9
- clean up of compiler and sphinx warnings
- changes to support gcc 9.3.0 in conda defaults
- updates to support python 3.9 including readline 8.1 upgrade, numpy minimum
1.19 (numpy 1.18 minimum for python 3.7/8)
- test infrastructure clean up and updates
* bug fixes:
- updates to fix several 'unable to parse region string: None' errors
- fix issue where save_all() of a loaded image with no region filter would fail
on reload
- fixed issue with plot_model() being called before notice or ignore could
lead to filters not getting applied
- fix to error out instead of crash when grouping data using an unsupported
method
- Drop upstream patch:
* sherpa-pr1227-astropy43.patch
- Refresh patch:
* reproducible.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Aug 5 19:36:45 UTC 2021 - Ben Greiner <code@bnavigator.de> Thu Aug 5 19:36:45 UTC 2021 - Ben Greiner <code@bnavigator.de>

View File

@ -20,15 +20,13 @@
%define skip_python2 1 %define skip_python2 1
%define skip_python36 1 %define skip_python36 1
Name: python-sherpa Name: python-sherpa
Version: 4.13.1 Version: 4.14.0
Release: 0 Release: 0
Summary: Modeling and fitting package for scientific data analysis Summary: Modeling and fitting package for scientific data analysis
License: GPL-3.0-only License: GPL-3.0-only
URL: https://github.com/sherpa/sherpa/ URL: https://github.com/sherpa/sherpa/
Source: https://github.com/sherpa/sherpa/archive/%{version}.tar.gz#/sherpa-%{version}.tar.gz Source: https://github.com/sherpa/sherpa/archive/%{version}.tar.gz#/sherpa-%{version}.tar.gz
Patch1: reproducible.patch Patch1: reproducible.patch
# PATCH-FIX-UPSTREAM sherpa-pr1227-astropy43.patch -- gh#sherpa/sherpa#1227
Patch2: https://github.com/sherpa/sherpa/pull/1227.patch#/sherpa-pr1227-astropy43.patch
BuildRequires: %{python_module devel} BuildRequires: %{python_module devel}
BuildRequires: %{python_module numpy-devel} BuildRequires: %{python_module numpy-devel}
BuildRequires: %{python_module setuptools} BuildRequires: %{python_module setuptools}
@ -39,7 +37,8 @@ BuildRequires: flex
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: gcc-fortran BuildRequires: gcc-fortran
BuildRequires: python-rpm-macros BuildRequires: python-rpm-macros
Requires: python-numpy # 4.14.0 requires numpy minimum 1.19 (numpy 1.18 minimum for python 3.7/8)
Requires: python-numpy >= 1.18
Requires(post): update-alternatives Requires(post): update-alternatives
Requires(postun):update-alternatives Requires(postun):update-alternatives
ExcludeArch: %{ix86} ExcludeArch: %{ix86}

View File

@ -1,7 +1,7 @@
Index: sherpa-4.12.0/extern/fftw-3.3.8/configure Index: sherpa-4.12.0/extern/fftw-3.3.9/configure
=================================================================== ===================================================================
--- sherpa-4.12.0.orig/extern/fftw-3.3.8/configure --- sherpa-4.12.0.orig/extern/fftw-3.3.9/configure
+++ sherpa-4.12.0/extern/fftw-3.3.8/configure +++ sherpa-4.12.0/extern/fftw-3.3.9/configure
@@ -14506,7 +14506,7 @@ main () @@ -14506,7 +14506,7 @@ main ()
} }
_ACEOF _ACEOF
@ -11,10 +11,10 @@ Index: sherpa-4.12.0/extern/fftw-3.3.8/configure
else else
ax_cv_c_flags__mtune_native=no ax_cv_c_flags__mtune_native=no
fi fi
Index: sherpa-4.12.0/extern/fftw-3.3.8/m4/ax_cc_maxopt.m4 Index: sherpa-4.12.0/extern/fftw-3.3.9/m4/ax_cc_maxopt.m4
=================================================================== ===================================================================
--- sherpa-4.12.0.orig/extern/fftw-3.3.8/m4/ax_cc_maxopt.m4 --- sherpa-4.12.0.orig/extern/fftw-3.3.9/m4/ax_cc_maxopt.m4
+++ sherpa-4.12.0/extern/fftw-3.3.8/m4/ax_cc_maxopt.m4 +++ sherpa-4.12.0/extern/fftw-3.3.9/m4/ax_cc_maxopt.m4
@@ -73,7 +73,7 @@ if test "$ac_test_CFLAGS" != "set"; then @@ -73,7 +73,7 @@ if test "$ac_test_CFLAGS" != "set"; then
CFLAGS="-O3 -fomit-frame-pointer" CFLAGS="-O3 -fomit-frame-pointer"

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2951d28c9012c90f9ba26ff0e989762843f574211f48f04c50f735bafa2dffed
size 12637455

3
sherpa-4.14.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dc093e66af091f3d77927e27a36f404819d224646d0e4873029a85ecc8ea334d
size 13071671

View File

@ -1,32 +0,0 @@
From 630574022f538c86265ba01c283b8ebc39ce41a0 Mon Sep 17 00:00:00 2001
From: Douglas Burke <dburke.gw@gmail.com>
Date: Mon, 26 Jul 2021 16:10:25 -0400
Subject: [PATCH] Support AstroPy 4.3 for tests
The FITS checking meant that a test that created a test FITS file
was no-longer valid for AstroPy, so tweak the output to appease
both AstroPy 4.3 and fverify (at least for the header lines, it
still claims the fil character is wrong but this is less important).
---
sherpa/astro/io/tests/test_io.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/sherpa/astro/io/tests/test_io.py b/sherpa/astro/io/tests/test_io.py
index daa52d096d..a2bf6fdc93 100644
--- a/sherpa/astro/io/tests/test_io.py
+++ b/sherpa/astro/io/tests/test_io.py
@@ -150,8 +150,12 @@ def fake_rmf(outfile):
def hdr(key, value):
if isinstance(value, str):
value = "'{}'".format(value)
- elif isinstance(value, bool):
- value = 'T' if value else 'F'
+ else:
+ if isinstance(value, bool):
+ value = 'T' if value else 'F'
+
+ # add spacing to make FVERIFY happy
+ value = f"{str(value):>20s}"
out = "{:8s}= {}".format(key, value)
return out.ljust(80)