commit python-sherpa for openSUSE:Factory
Hello community,
here is the log from the commit of package python-sherpa for openSUSE:Factory
checked in at 2020-10-15 13:51:17
Comparing /work/SRC/openSUSE:Factory/python-sherpa (Old)
and /work/SRC/openSUSE:Factory/.python-sherpa.new.3486 (New)
Package is "python-sherpa"
Thu Oct 15 13:51:17 2020 rev:6 rq:841871 version:4.12.1
Changes:
--- /work/SRC/openSUSE:Factory/python-sherpa/python-sherpa.changes
2020-09-15 16:28:02.618582627 +0200
+++ /work/SRC/openSUSE:Factory/.python-sherpa.new.3486/python-sherpa.changes
2020-10-15 13:51:33.637328488 +0200
@@ -1,0 +2,6 @@
+Wed Oct 14 13:39:10 UTC 2020 - Guillaume GARDET
+
+- Fix aarch64 build and test:
+ * sherpa-fix-aarch64.patch
+
+---
New:
sherpa-fix-aarch64.patch
Other differences:
--
++ python-sherpa.spec ++
--- /var/tmp/diff_new_pack.owM8su/_old 2020-10-15 13:51:38.325330449 +0200
+++ /var/tmp/diff_new_pack.owM8su/_new 2020-10-15 13:51:38.329330451 +0200
@@ -26,6 +26,8 @@
URL:https://github.com/sherpa/sherpa/
Source:
https://github.com/sherpa/sherpa/archive/%{version}.tar.gz#/sherpa-%{version}.tar.gz
Patch1: reproducible.patch
+# PATCH-FIX-UPSTREAM - https://github.com/sherpa/sherpa/issues/970
+Patch2: sherpa-fix-aarch64.patch
BuildRequires: %{python_module devel}
BuildRequires: %{python_module numpy-devel}
BuildRequires: %{python_module setuptools}
++ sherpa-fix-aarch64.patch ++
diff -purN sherpa-4.12.1.orig/sherpa/utils/src/cephes/mconf.h
sherpa-4.12.1/sherpa/utils/src/cephes/mconf.h
--- sherpa-4.12.1.orig/sherpa/utils/src/cephes/mconf.h 2020-06-26
20:27:19.0 +0200
+++ sherpa-4.12.1/sherpa/utils/src/cephes/mconf.h 2020-10-14
14:44:53.565068804 +0200
@@ -173,6 +173,10 @@ typedef struct
/* Define to support tiny denormal numbers, else undefine. */
#define DENORMAL 1
+/* https://github.com/sherpa/sherpa/issues/970 */
+#define NOINFINITIES
+#define NONANS
+
/* Define to ask for infinity support, else undefine. */
#define INFINITIES 1
#ifdef NOINFINITIES
--- sherpa-4.12.1.orig/sherpa/tests/test_fit_unit.py2020-06-26
20:27:19.0 +0200
+++ sherpa-4.12.1/sherpa/tests/test_fit_unit.py 2020-10-14 15:08:34.798995079
+0200
@@ -1867,7 +1867,7 @@ def test_fit_single(stat, usestat, usesy
assert fit.method.name == 'levmar'
fr = fit.fit()
assert fr.succeeded
-assert_almost_equal(fr.statval, finalstat)
+assert fr.statval == pytest.approx(finalstat, rel=7e-5)
@pytest.mark.parametrize("stat,usestat,usesys,finalstat", [
commit python-sherpa for openSUSE:Factory
Hello community,
here is the log from the commit of package python-sherpa for openSUSE:Factory
checked in at 2020-09-15 16:27:53
Comparing /work/SRC/openSUSE:Factory/python-sherpa (Old)
and /work/SRC/openSUSE:Factory/.python-sherpa.new.4249 (New)
Package is "python-sherpa"
Tue Sep 15 16:27:53 2020 rev:5 rq:834270 version:4.12.1
Changes:
--- /work/SRC/openSUSE:Factory/python-sherpa/python-sherpa.changes
2020-05-19 14:59:22.469519135 +0200
+++ /work/SRC/openSUSE:Factory/.python-sherpa.new.4249/python-sherpa.changes
2020-09-15 16:28:02.618582627 +0200
@@ -1,0 +2,30 @@
+Mon Sep 14 09:33:07 UTC 2020 - Atri Bhattacharya
+
+- Update to version 4.12.1:
+ - [gh#sherpa/sherpa#832] Support building with NumPy 1.19.
+ - [gh#sherpa/sherpa#781] Docs: fix typo in docstring for
+calc_kcor.
+ - [gh#sherpa/sherpa#759] Revert the ARF cache added in #444, as
+well as some of the related code changes, as they caused
+problems with Analysis in wavelength space (e.g.
+gh#sherpa/sherpa#746).
+ - [gh#sherpa/sherpa#756]
+calculate_photon_flux/calculate_energy_flux fix and
+improvement.
+ - [gh#sherpa/sherpa#747] reworked regrid to eval usr grid, but 0
+every where else.
+ - [gh#sherpa/sherpa#745] ensure that min/max limits are applied
+to linked parameters before use.
+ - [gh#sherpa/sherpa#735] Remove ChIPS support.
+ - [gh#sherpa/sherpa#734] Change datastack
+query_by_header_keyword to not error if keyword is missing.
+ - [gh#sherpa/sherpa#733] fix a bug with fit(cache=False) passing
+the runtime option while fitting.
+ - [gh#sherpa/sherpa#732] Remove unused Python 2.7 compatibility
+code.
+ - [gh#sherpa/sherpa#696] Support python 3.8.
+- Drop already incorporated patches:
+ * python-sherpa-python3.8.patch.
+ * config_with_build.patch.
+
+---
Old:
config_with_build.patch
python-sherpa-python3.8.patch
sherpa-4.12.0.tar.gz
New:
sherpa-4.12.1.tar.gz
Other differences:
--
++ python-sherpa.spec ++
--- /var/tmp/diff_new_pack.TD4k8k/_old 2020-09-15 16:28:05.378585269 +0200
+++ /var/tmp/diff_new_pack.TD4k8k/_new 2020-09-15 16:28:05.382585273 +0200
@@ -19,17 +19,13 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define skip_python2 1
Name: python-sherpa
-Version:4.12.0
+Version:4.12.1
Release:0
Summary:Modeling and fitting package for scientific data analysis
License:GPL-3.0-only
URL:https://github.com/sherpa/sherpa/
Source:
https://github.com/sherpa/sherpa/archive/%{version}.tar.gz#/sherpa-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM config_with_build.patch --
https://github.com/sherpa/sherpa/pull/714
-Patch0: config_with_build.patch
Patch1: reproducible.patch
-# PATCH-FIX-UPSTREAM python-sherpa-python3.8.patch gh#sherpa/sherpa#696
[email protected] -- Fix building with python3.8; taken from upstream commit
-Patch2: python-sherpa-python3.8.patch
BuildRequires: %{python_module devel}
BuildRequires: %{python_module numpy-devel}
BuildRequires: %{python_module setuptools}
++ sherpa-4.12.0.tar.gz -> sherpa-4.12.1.tar.gz ++
/work/SRC/openSUSE:Factory/python-sherpa/sherpa-4.12.0.tar.gz
/work/SRC/openSUSE:Factory/.python-sherpa.new.4249/sherpa-4.12.1.tar.gz differ:
char 14, line 1
commit python-sherpa for openSUSE:Factory
Hello community,
here is the log from the commit of package python-sherpa for openSUSE:Factory
checked in at 2020-05-19 14:59:12
Comparing /work/SRC/openSUSE:Factory/python-sherpa (Old)
and /work/SRC/openSUSE:Factory/.python-sherpa.new.2738 (New)
Package is "python-sherpa"
Tue May 19 14:59:12 2020 rev:4 rq:807290 version:4.12.0
Changes:
--- /work/SRC/openSUSE:Factory/python-sherpa/python-sherpa.changes
2020-03-12 23:12:41.735333145 +0100
+++ /work/SRC/openSUSE:Factory/.python-sherpa.new.2738/python-sherpa.changes
2020-05-19 14:59:22.469519135 +0200
@@ -1,0 +2,5 @@
+Tue May 19 09:28:01 UTC 2020 - Petr Gajdos
+
+- %python3_only -> %python_alternative
+
+---
Other differences:
--
++ python-sherpa.spec ++
--- /var/tmp/diff_new_pack.tAuLO6/_old 2020-05-19 14:59:25.401525637 +0200
+++ /var/tmp/diff_new_pack.tAuLO6/_new 2020-05-19 14:59:25.405525646 +0200
@@ -41,6 +41,8 @@
BuildRequires: python-rpm-macros
Requires: python-numpy
Requires: python-six
+Requires(post): update-alternatives
+Requires(postun): update-alternatives
ExcludeArch:%{ix86}
# SECTION test requirements
BuildRequires: %{python_module mock}
@@ -74,6 +76,8 @@
sed -i
's|group-location=.*|group-location=build/%{_lib}/python%{$python_version}/site-packages/group.so|'
setup.cfg
%{$python_install}
}
+%python_clone -a %{buildroot}%{_bindir}/sherpa_test
+%python_clone -a %{buildroot}%{_bindir}/sherpa_smoke
%python_expand %fdupes %{buildroot}%{$python_sitearch}
# REMOVE HASHBANGS FROM NON-EXEC FILES
@@ -90,11 +94,19 @@
%pytest_arch %{buildroot}%{$python_sitearch}/sherpa/
mv sherpa_temp sherpa
+%post
+%python_install_alternative sherpa_smoke
+%python_install_alternative sherpa_test
+
+%postun
+%python_uninstall_alternative sherpa_smoke
+%python_uninstall_alternative sherpa_test
+
%files %{python_files}
%doc README.md
%license LICENSE
-%python3_only %{_bindir}/sherpa_test
-%python3_only %{_bindir}/sherpa_smoke
+%python_alternative %{_bindir}/sherpa_test
+%python_alternative %{_bindir}/sherpa_smoke
%{python_sitearch}/*
%changelog
commit python-sherpa for openSUSE:Factory
Hello community, here is the log from the commit of package python-sherpa for openSUSE:Factory checked in at 2020-03-12 23:09:24 Comparing /work/SRC/openSUSE:Factory/python-sherpa (Old) and /work/SRC/openSUSE:Factory/.python-sherpa.new.3160 (New) Package is "python-sherpa" Thu Mar 12 23:09:24 2020 rev:3 rq:784359 version:4.12.0 Changes: --- /work/SRC/openSUSE:Factory/python-sherpa/python-sherpa.changes 2020-01-05 15:22:09.317591020 +0100 +++ /work/SRC/openSUSE:Factory/.python-sherpa.new.3160/python-sherpa.changes 2020-03-12 23:12:41.735333145 +0100 @@ -1,0 +2,8 @@ +Thu Mar 12 12:56:22 UTC 2020 - Atri Bhattacharya + +- Add python-sherpa-python3.8.patch: Fix building with python3.8; + taken from upstream commit [gh#sherpa/sherpa#696]. +- Disbale bytecode generation when running tests. +- Remove hashbangs from non executable files. + +--- New: python-sherpa-python3.8.patch Other differences: -- ++ python-sherpa.spec ++ --- /var/tmp/diff_new_pack.zqLWTL/_old 2020-03-12 23:12:42.431333420 +0100 +++ /var/tmp/diff_new_pack.zqLWTL/_new 2020-03-12 23:12:42.431333420 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-sherpa # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,6 +28,8 @@ # PATCH-FIX-UPSTREAM config_with_build.patch -- https://github.com/sherpa/sherpa/pull/714 Patch0: config_with_build.patch Patch1: reproducible.patch +# PATCH-FIX-UPSTREAM python-sherpa-python3.8.patch gh#sherpa/sherpa#696 [email protected] -- Fix building with python3.8; taken from upstream commit +Patch2: python-sherpa-python3.8.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module numpy-devel} BuildRequires: %{python_module setuptools} @@ -74,7 +76,14 @@ } %python_expand %fdupes %{buildroot}%{$python_sitearch} +# REMOVE HASHBANGS FROM NON-EXEC FILES +%{python_expand sed -i "1{/\\/usr\\/bin\\/env python/d}" %{buildroot}%{$python_sitearch}/sherpa/optmethods/ncoresde.py +sed -i "1{/\\/usr\\/bin\\/env python/d}" %{buildroot}%{$python_sitearch}/sherpa/optmethods/ncoresnm.py +sed -i "1{/\\/usr\\/bin\\/env python/d}" %{buildroot}%{$python_sitearch}/sherpa/optmethods/opt.py +} + %check +export PYTHONDONTWRITEBYTECODE=x mv sherpa sherpa_temp %python_expand ls -l %{buildroot}%{$python_sitearch}/sherpa/utils/ ls -l *build*/*/*/ ++ python-sherpa-python3.8.patch ++ 1282 lines (skipped)
commit python-sherpa for openSUSE:Factory
Hello community,
here is the log from the commit of package python-sherpa for openSUSE:Factory
checked in at 2020-01-05 15:22:09
Comparing /work/SRC/openSUSE:Factory/python-sherpa (Old)
and /work/SRC/openSUSE:Factory/.python-sherpa.new.6675 (New)
Package is "python-sherpa"
Sun Jan 5 15:22:09 2020 rev:2 rq:760916 version:4.12.0
Changes:
--- /work/SRC/openSUSE:Factory/python-sherpa/python-sherpa.changes
2019-12-27 13:44:05.316263235 +0100
+++ /work/SRC/openSUSE:Factory/.python-sherpa.new.6675/python-sherpa.changes
2020-01-05 15:22:09.317591020 +0100
@@ -1,0 +2,6 @@
+Sat Jan 4 20:12:21 UTC 2020 - Bernhard Wiedemann
+
+- Add reproducible.patch to disable optimizing for build CPU
+ to make package build reproducible
+
+---
New:
reproducible.patch
Other differences:
--
++ python-sherpa.spec ++
--- /var/tmp/diff_new_pack.56LFHr/_old 2020-01-05 15:22:10.369591548 +0100
+++ /var/tmp/diff_new_pack.56LFHr/_new 2020-01-05 15:22:10.373591550 +0100
@@ -27,6 +27,7 @@
Source:
https://github.com/sherpa/sherpa/archive/%{version}.tar.gz#/sherpa-%{version}.tar.gz
# PATCH-FIX-UPSTREAM config_with_build.patch --
https://github.com/sherpa/sherpa/pull/714
Patch0: config_with_build.patch
+Patch1: reproducible.patch
BuildRequires: %{python_module devel}
BuildRequires: %{python_module numpy-devel}
BuildRequires: %{python_module setuptools}
++ reproducible.patch ++
Index: sherpa-4.12.0/extern/fftw-3.3.8/configure
===
--- sherpa-4.12.0.orig/extern/fftw-3.3.8/configure
+++ sherpa-4.12.0/extern/fftw-3.3.8/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.8/m4/ax_cc_maxopt.m4
===
--- sherpa-4.12.0.orig/extern/fftw-3.3.8/m4/ax_cc_maxopt.m4
+++ sherpa-4.12.0/extern/fftw-3.3.8/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")
