Hello community, here is the log from the commit of package YODA for openSUSE:Leap:15.2 checked in at 2020-02-21 23:51:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/YODA (Old) and /work/SRC/openSUSE:Leap:15.2/.YODA.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "YODA" Fri Feb 21 23:51:09 2020 rev:11 rq:775738 version:1.8.0 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/YODA/YODA.changes 2020-01-15 14:46:16.429245817 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.YODA.new.26092/YODA.changes 2020-02-21 23:51:10.480783837 +0100 @@ -1,0 +2,85 @@ +Sat Jan 18 13:47:23 UTC 2020 - Atri Bhattacharya <[email protected]> + +- Add YODA-py3-compatibility-for-IO_pyx.patch -- Py3 compatibilty + for IO.pyx; patch taken from upstream commit and modified to fix + further similar errors + (https://gitlab.com/hepcedar/yoda/issues/4). +- Change hashbangs referring to python or `env python` to use + `/usr/bin/python3` consistently in source dir, rather than + from buildroot after installation. This allows to run the tests + correctly in the %check section. +- Move binaries using the python module to python3-%{name} + package. +- Run make check. + +------------------------------------------------------------------- +Wed Jan 8 20:51:46 UTC 2020 - Atri Bhattacharya <[email protected]> + +- Switch to python3: + * Requires and BuildRequires switched to python3 versions + * Rename python package to python3-%{name} and provide + python-%{name} from it; this makes the py3 switch clear to + users. + * Explicitly pass PYTHON_VERSION as py3 version to make it build + against python3 + * Drop an unecessary hashbang from a file in non-exec location. +- Remove an sed hack for buildroot in *.pyc file(s); no longer + needed. + +------------------------------------------------------------------- +Sat Jan 4 16:41:21 UTC 2020 - Atri Bhattacharya <[email protected]> + +- Update to version 1.8.0: + * Add extra optional bool arguments to the mkScatter converter + functions for Histo1D and Histo2D types. + * Force rebuild of the Python interface if a sufficient Cython + is found, even if the generated .cpp file is present at + configure-time. + * Final conversion to use ast module not just in autotype but as + first choice in AO.annotation. + * Remove ALL uses of @property in the Python interfaces: all + methods must have call-parentheses now. + * Improve Python annotation parsing to preferentially use ast + rather than yaml. + * Add x/yErrs and x/yErrAvgs functions to Scatter2D Python. +- Rebase so numbering patch for updated version. + +------------------------------------------------------------------- +Wed Aug 21 08:14:14 UTC 2019 - Atri Bhattacharya <[email protected]> + +- Update to version 1.7.7: + * Fix printing of YAML annotations. + * Fix Python 3 / Unicode compatibility for Point.pyx. +- Changes from version 1.7.6: + * Add xEdges and yEdges methods to the 2D Histo and Profile + classes, in C++ and Python. + * Remove @property attributes from Python xEdges methods. + * Fix Python3/argparse attribute access bug in yodamerge. +- Changes from version 1.7.5: + * Convert bin/* scripts to use Python3-compatible argparse + rather than old optparse. + * Fix Histo1D::integralRange to include the second-argument bin + content as described in the docstring. + * Fix Python3 StringIO import compatibility + * Add -m/-M filtering to yodadiff. + * Fix HistoBin2D printing in Python interface. + * Protect yodamerge against zero-valued (?!) ScaledBy + attributes. +- Drop conditional for boost BuildRequires pertaining to outdated + versions of openSUSE. + +------------------------------------------------------------------- +Wed May 1 11:31:10 UTC 2019 - Atri Bhattacharya <[email protected]> + +- Update to version 1.7.4: + * Roll out sameBinning methods for Profile1D and Profile2D. + * Add sameBinning methods for Histo1D and Histo2D. + * Remove debug couts from single-AO Writer::write() function. + * Add --ignore-missing and --ignore-new flags to yodadiff. + * Tidy up point-comparison output of yodadiff. + * Fix additional weighting in yodamerge +- See %{_docdir}/YODA-devel/ChangeLog for changes between version + 1.7.1 through 1.7.3. +- Rebase sover.diff to apply cleanly. + +------------------------------------------------------------------- Old: ---- YODA-1.7.0.tar.bz2 New: ---- YODA-1.8.0.tar.bz2 YODA-py3-compatibility-for-IO_pyx.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ YODA.spec ++++++ --- /var/tmp/diff_new_pack.1bduJ3/_old 2020-02-21 23:51:10.860784593 +0100 +++ /var/tmp/diff_new_pack.1bduJ3/_new 2020-02-21 23:51:10.864784601 +0100 @@ -1,7 +1,7 @@ # # spec file for package YODA # -# Copyright (c) 2018 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 @@ -12,31 +12,32 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define so_name lib%{name}-1_7_0 +%define so_name lib%{name}-1_8_0 Name: YODA -Version: 1.7.0 +Version: 1.8.0 Release: 0 Summary: A small set of data analysis classes for MC event generator validation analyses License: GPL-2.0-only Group: Development/Libraries/C and C++ -Url: http://yoda.hepforge.org/ +URL: http://yoda.hepforge.org/ Source: http://www.hepforge.org/archive/yoda/%{name}-%{version}.tar.bz2 Patch1: sover.diff -%if 0%{?suse_version} > 1325 -BuildRequires: libboost_headers-devel -%else -BuildRequires: boost-devel -%endif +# PATCH-FIX-UPSTREAM YODA-py3-compatibility-for-IO_pyx.patch [email protected] -- Py3 compatibilty for IO.pyx; patch taken from upstream commit +Patch2: YODA-py3-compatibility-for-IO_pyx.patch BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: pkg-config -BuildRequires: python-Cython -BuildRequires: python-devel +BuildRequires: python3-Cython +BuildRequires: python3-devel +# SECTION For running python tests in make check +BuildRequires: python3-matplotlib +BuildRequires: python3-numpy +# /SECTION BuildRequires: pkgconfig(zlib) BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -91,13 +92,13 @@ This package provides the source files for development with %{name}. -%package -n python-%{name} +%package -n python3-%{name} Summary: A small set of data analysis classes for MC event generator validation analyses Group: Development/Libraries/Python Requires: %{so_name} = %{version} -Requires: python = %{py_ver} +Provides: python-%{name} = %{version} -%description -n python-%{name} +%description -n python3-%{name} YODA is a small set of data analysis (specifically histogramming) classes being developed by MCnet members as a lightweight common system for MC event generator validation analyses. @@ -107,8 +108,21 @@ %prep %setup -q %patch -P 1 -p1 +%patch2 -p1 + +# USE PYTHON3 FOR HASHBANGS +sed -Ei "1{s|/usr/bin/python|/usr/bin/python3|}" bin/* +sed -Ei "1{s|/usr/bin/env python|/usr/bin/python3|}" bin/* +sed -Ei "1{s|/usr/bin/env python|/usr/bin/python3|}" tests/pytest-* + +# FIX env BASED HASHBANGS +sed -E -i "s|^#! /usr/bin/env bash|#! /bin/bash|" bin/yoda-config* + +# REMOVE AN UNNECESSARY ONE +sed -E -i "1{s|^#! /usr/bin/env python||}" pyext/yoda/search.py %build +export PYTHON_VERSION=%{py3_ver} autoreconf -fi %configure make %{?_smp_mflags} @@ -118,15 +132,8 @@ find %{buildroot}%{_libdir}/ -name "*.la" -delete -# Remove traces of BUILDROOT from files -sed -i "s|%{buildroot}||g" %{buildroot}%{python_sitearch}/yoda/*.pyc - -# FIX env BASED HASHBANGS -for exe in %{buildroot}%{_bindir}/* -do - sed -E -i "s|^#! /usr/bin/env python|#! /usr/bin/python|" ${exe} -done -sed -E -i "s|^#! /usr/bin/env bash|#! /bin/bash|" %{buildroot}%{_bindir}/yoda-config +%check +make %{?_smp_mflags} check %post -n %{so_name} -p /sbin/ldconfig %postun -n %{so_name} -p /sbin/ldconfig @@ -137,14 +144,25 @@ %files devel %defattr(-,root,root) -%doc AUTHORS ChangeLog COPYING +%doc AUTHORS ChangeLog +%license COPYING +%{_bindir}/yoda-config +%{_libdir}/libYODA.so +%{_libdir}/pkgconfig/yoda.pc +%{_includedir}/%{name}/ +%{_datadir}/%{name}/ + +%files -n python3-%{name} +%defattr(-,root,root) +%{python3_sitearch}/yoda/ +%{python3_sitearch}/yoda1/ +%{python3_sitearch}/yoda*.egg-info %{_bindir}/aida2flat %{_bindir}/aida2yoda %{_bindir}/flat2yoda %{_bindir}/yoda2aida %{_bindir}/yoda2flat %{_bindir}/yoda2yoda -%{_bindir}/yoda-config %{_bindir}/yodamerge %{_bindir}/yodacmp %{_bindir}/yodacnv @@ -153,15 +171,5 @@ %{_bindir}/yodals %{_bindir}/yodaplot %{_bindir}/yodascale -%{_libdir}/libYODA.so -%{_libdir}/pkgconfig/yoda.pc -%{_includedir}/%{name}/ -%{_datadir}/%{name}/ - -%files -n python-%{name} -%defattr(-,root,root) -%{python_sitearch}/yoda/ -%{python_sitearch}/yoda1/ -%{python_sitearch}/yoda*.egg-info %changelog ++++++ YODA-1.7.0.tar.bz2 -> YODA-1.8.0.tar.bz2 ++++++ ++++ 163761 lines of diff (skipped) ++++++ YODA-py3-compatibility-for-IO_pyx.patch ++++++ >From c4ef6691606b33868b226fdd504bb081d0fcf11f Mon Sep 17 00:00:00 2001 From: Christian Gutschow <[email protected]> Date: Sat, 21 Dec 2019 23:31:32 +0100 Subject: [PATCH] patch Py3 compatibilty for IO.pyx --- pyext/yoda/include/IO.pyx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: YODA-1.8.0/pyext/yoda/include/IO.pyx =================================================================== --- YODA-1.8.0.orig/pyext/yoda/include/IO.pyx +++ YODA-1.8.0/pyext/yoda/include/IO.pyx @@ -215,7 +215,7 @@ def writeYODA(ana_objs, file_or_filename for a in aolist: vec.push_back(a._AnalysisObject()) if type(file_or_filename) is str: - c.WriterYODA_create().write_to_file(file_or_filename, vec) + c.WriterYODA_create().write_to_file(file_or_filename.encode('utf-8'), vec) else: c.WriterYODA_create().write(oss, vec) _str_to_file(oss.str(), file_or_filename) @@ -233,7 +233,7 @@ def writeFLAT(ana_objs, file_or_filename for a in aolist: vec.push_back(a._AnalysisObject()) if type(file_or_filename) is str: - c.WriterFLAT_create().write_to_file(file_or_filename, vec) + c.WriterFLAT_create().write_to_file(file_or_filename.encode('utf-8'), vec) else: c.WriterFLAT_create().write(oss, vec) _str_to_file(oss.str(), file_or_filename) @@ -251,7 +251,7 @@ def writeAIDA(ana_objs, file_or_filename for a in aolist: vec.push_back(a._AnalysisObject()) if type(file_or_filename) is str: - c.WriterAIDA_create().write_to_file(file_or_filename, vec) + c.WriterAIDA_create().write_to_file(file_or_filename.encode('utf-8'), vec) else: c.WriterAIDA_create().write(oss, vec) _str_to_file(oss.str(), file_or_filename) ++++++ sover.diff ++++++ --- /var/tmp/diff_new_pack.1bduJ3/_old 2020-02-21 23:51:13.156789155 +0100 +++ /var/tmp/diff_new_pack.1bduJ3/_new 2020-02-21 23:51:13.160789163 +0100 @@ -2,16 +2,16 @@ src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: YODA-1.7.0/src/Makefile.am +Index: YODA-1.8.0/src/Makefile.am =================================================================== ---- YODA-1.7.0.orig/src/Makefile.am -+++ YODA-1.7.0/src/Makefile.am -@@ -23,7 +23,7 @@ libYODA_la_SOURCES = \ - Scatter2D.cc \ - Scatter3D.cc +--- YODA-1.8.0.orig/src/Makefile.am ++++ YODA-1.8.0/src/Makefile.am +@@ -26,7 +26,7 @@ libYODA_la_SOURCES = \ + Point2D.cc \ + Point3D.cc -libYODA_la_LDFLAGS = -avoid-version +libYODA_la_LDFLAGS = -release ${PACKAGE_VERSION} libYODA_la_LIBADD = $(builddir)/tinyxml/libyoda-tinyxml.la $(builddir)/yamlcpp/libyoda-yaml-cpp.la - libYODA_la_CPPFLAGS = $(AM_CPPFLAGS) -DTIXML_USE_STL -I$(srcdir)/yamlcpp -I$(srcdir) -DYAMLCPP_API=3 -DYAML_NAMESPACE=YODA_YAML + libYODA_la_CPPFLAGS = $(AM_CPPFLAGS) -DTIXML_USE_STL -I$(srcdir)/yamlcpp -I$(srcdir) -DYAML_NAMESPACE=YODA_YAML
