Accepting request 1060053 from devel:languages:python:numeric

OBS-URL: https://build.opensuse.org/request/show/1060053
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-sherpa?expand=0&rev=15

python-sherpa.changes

@@ -1,3 +1,47 @@
+-------------------------------------------------------------------
+Fri Jan 20 10:59:30 UTC 2023 - Ben Greiner <code@bnavigator.de>
+
+- Update to 4.15.0
+  * This release of Sherpa includes various enhancements,
+    documentation updates,  bug fixes, and infrastructure changes.
+  ## Enhancements:
+  * Improved validation of arguments when creating Data objects:
+    - arrays sent to Data objects are now converted to ndarrays
+    - the independent axis is now made read-only
+    - the size of a data object is now fixed.
+  * Filter setting with notice/ignore are reported to the screen
+    for the users of the UI layer.
+  * Increased test coverage for plotting
+  ## Documentation changes:
+  * updated readthedocs to use pip and pytest instead of setup.py
+  * several updates to documentation, including updates to
+    fake_pha, calc_ftest, calc_mlr
+  ## Infrastructure changes:
+  * Drop support for Python 3.7
+  * Updates to start creating Python 3.10 Conda packages.
+  * Use Numpy 1.20 for Python 3.8/3.9 and Numpy 1.21 for Python
+    3.10.
+  * Moves toward PEP-517 with some distutils cleanup and more
+    configuration moved from setup.py to setup.cfg
+  * Various improvements to the GitHub Actions and GitLab workflows
+  ## Bug fixes:
+  * Ensure chi2xspecvar errors match XSPEC when 0 counts are
+    present during background subtraction
+  * Remove model instances from the global symbol table when clean
+    is called
+  * Addresses new warnings in the tests for Matplotlib 3.6.0 and
+    AstroPy 5.1
+  * Minor copy and paste error in fake_pha docstring
+  * Test issues in test_fake_pha.py due to randomness
+  ## Caveats
+  * There are known issues (#1602, #1605, #1606) in the
+    histogram1d/histogram2d functions leading to failures which
+    were not fully addressed in this release (see the failed case
+    in the second histogram1d example). This is not the Sherpa core
+    functionality and numpy.histogram can be used if needed.
+- Drop reproducible.patch: the patched fftw sources are not used in
+  this build.
+
 -------------------------------------------------------------------
 Mon Aug  8 15:24:05 UTC 2022 - Ben Greiner <code@bnavigator.de>
 

python-sherpa.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-sherpa
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,17 +18,15 @@
 
 # python311 does not bundle setuptools < 60
 %define skip_python311 1
-%define         test_data_commit 57cae742c7642494b51c26ba3f27935bbcc0116b
 Name:           python-sherpa
-Version:        4.14.1
+Version:        4.15.0
 Release:        0
 Summary:        Modeling and fitting package for scientific data analysis
 License:        GPL-3.0-only
 URL:            https://github.com/sherpa/sherpa/
 Source0:        https://github.com/sherpa/sherpa/archive/%{version}.tar.gz#/sherpa-%{version}.tar.gz
-Source1:        https://github.com/sherpa/sherpa-test-data/archive/%{test_data_commit}.tar.gz#/sherpa-test-data-%{test_data_commit}.tar.gz
+Source1:        https://github.com/sherpa/sherpa-test-data/archive/refs/tags/%{version}.tar.gz#/sherpa-test-data-%{version}.tar.gz
-Patch1:         reproducible.patch
+BuildRequires:  %{python_module devel >= 3.8}
-BuildRequires:  %{python_module devel >= 3.7}
 BuildRequires:  %{python_module numpy-devel >= 1.19}
 BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module wheel}
@@ -37,14 +35,13 @@ BuildRequires:  fdupes
 BuildRequires:  fftw3-devel
 BuildRequires:  flex
 BuildRequires:  gcc-c++
-BuildRequires:  gcc-fortran
 BuildRequires:  python-rpm-macros
 Requires:       python-numpy >= 1.19
 Requires(post): update-alternatives
 Requires(postun):update-alternatives
 ExcludeArch:    %{ix86} %{arm}
 # SECTION test requirements
-BuildRequires:  %{python_module pytest >= 3.3}
+BuildRequires:  %{python_module pytest >= 5}
 BuildRequires:  %{python_module pytest-xvfb}
 # Highly recommended by upstream when building from source
 BuildRequires:  %{python_module astropy}
@@ -59,14 +56,14 @@ data, using a variety of statistics and optimization methods.
 
 %prep
 %setup -q -n sherpa-%{version} -a1
-%autopatch -p1
 # uncomment system libs https://sherpa.readthedocs.io/en/latest/install.html#fftw
 sed -i "s|#fftw=local|fftw=local|" setup.cfg
 sed -i "s|#fftw-include[-_]dirs.*$|fftw-include-dirs=%{_includedir}|" setup.cfg
 sed -i "s|#fftw-lib-dirs.*$|fftw-lib-dirs=%{_libdir}|" setup.cfg
 sed -i "s|#fftw-libraries|fftw-libraries|" setup.cfg
-
+rm -r extern/fftw-*
-sed -i "s|/lib/|/%{_lib}/|" helpers/sherpa_config.py
+# adjust the "install path" for stk.so and group.so for the build phase
+sed -i "/pydir =/ s/libdir,/self.install_dir, '%{_lib}',/" helpers/sherpa_config.py
 
 %build
 cp -r extern extern0
@@ -97,7 +94,7 @@ sed -i "1{/\\/usr\\/bin\\/env python/d}" %{buildroot}%{$python_sitearch}/sherpa/
 %check
 # avoid conftest import mismatch
 mv sherpa sherpa_temp
-export PYTHONPATH=$PWD/sherpa-test-data-%{test_data_commit}
+export PYTHONPATH=$PWD/sherpa-test-data-%{version}
 # unclosed resource warnings by pytest although the tests use Path.to_text which should have closed it.
 donttest="test_save"
 # precision issues

reproducible.patch

@@ -1,26 +0,0 @@
-Index: sherpa-4.12.0/extern/fftw-3.3.9/configure
-===================================================================
---- sherpa-4.12.0.orig/extern/fftw-3.3.9/configure
-+++ sherpa-4.12.0/extern/fftw-3.3.9/configure
-@@ -14506,7 +14506,7 @@ main ()
- }
- _ACEOF
- if ac_fn_c_try_compile "$LINENO"; then :
--  ax_cv_c_flags__mtune_native=yes
-+  ax_cv_c_flags__mtune_native=no
- else
-   ax_cv_c_flags__mtune_native=no
- fi
-Index: sherpa-4.12.0/extern/fftw-3.3.9/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.9/m4/ax_cc_maxopt.m4
-@@ -73,7 +73,7 @@ if test "$ac_test_CFLAGS" != "set"; then
-      CFLAGS="-O3 -fomit-frame-pointer"
- 
-      # tune for the host by default
--     AX_CHECK_COMPILER_FLAGS(-mtune=native, CFLAGS="$CFLAGS -mtune=native")
-+     #AX_CHECK_COMPILER_FLAGS(-mtune=native, CFLAGS="$CFLAGS -mtune=native")
- 
-      # -malign-double for x86 systems
-      AX_CHECK_COMPILER_FLAGS(-malign-double, CFLAGS="$CFLAGS -malign-double")

sherpa-4.14.1.tar.gz

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

sherpa-4.15.0.tar.gz

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

sherpa-test-data-4.15.0.tar.gz

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

sherpa-test-data-57cae742c7642494b51c26ba3f27935bbcc0116b.tar.gz

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