Hello community, here is the log from the commit of package lscsoft-glue for openSUSE:Factory checked in at 2020-11-04 18:26:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lscsoft-glue (Old) and /work/SRC/openSUSE:Factory/.lscsoft-glue.new.11331 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lscsoft-glue" Wed Nov 4 18:26:37 2020 rev:2 rq:845779 version:2.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/lscsoft-glue/lscsoft-glue.changes 2020-07-16 12:20:11.367070099 +0200 +++ /work/SRC/openSUSE:Factory/.lscsoft-glue.new.11331/lscsoft-glue.changes 2020-11-04 18:31:46.368230114 +0100 @@ -1,0 +2,11 @@ +Sat Oct 31 11:43:40 UTC 2020 - Atri Bhattacharya <[email protected]> + +- Update to version 2.1.0: + * Test release with deprecations. +- Run tests as part of %check section (64-bit and python3 only); + entails additional BuildRequires: python-ligo-segments, + python-matplotlib, and python-numpy. +- Add python-numpy and python-ligo-segments to Requires as they + are needed for any meaningful usage of the module. + +------------------------------------------------------------------- Old: ---- lscsoft-glue-2.0.0.tar.gz New: ---- lscsoft-glue-2.1.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lscsoft-glue.spec ++++++ --- /var/tmp/diff_new_pack.FZICEI/_old 2020-11-04 18:31:46.900228935 +0100 +++ /var/tmp/diff_new_pack.FZICEI/_new 2020-11-04 18:31:46.904228926 +0100 @@ -1,7 +1,7 @@ # -# spec file for package glue +# spec file for package lscsoft-glue # -# 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,12 +12,13 @@ # 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 modname glue Name: lscsoft-glue -Version: 2.0.0 +Version: 2.1.0 Release: 0 Summary: Grid LSC User Environment License: GPL-2.0-only @@ -25,10 +26,19 @@ Source: http://software.ligo.org/lscsoft/source/%{name}-%{version}.tar.gz BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} -BuildRequires: python-rpm-macros BuildRequires: fdupes +BuildRequires: python-rpm-macros +Requires: python-ligo-segments +Requires: python-numpy Provides: python-glue = %{version} Obsoletes: python-glue < %{version} +# SECTION Test Requirements +BuildRequires: %{python_module lal} +BuildRequires: %{python_module ligo-segments} +BuildRequires: %{python_module matplotlib} +BuildRequires: %{python_module numpy} +# /SECTION + %python_subpackages %description @@ -53,6 +63,17 @@ %python_expand %fdupes -s %{buildroot}%{$python_sitearch} +# Tests known to fail on 32 bit due to fp precision +%ifnarch %ix86 +%check +export PYTHON=%{__python3} +export PYTHONDONTWRITEBYTECODE=1 +export PYTHONPATH=%{buildroot}%{python3_sitearch} +pushd test +%make_build check +popd +%endif + %files %{python_files} %doc README.md %license LICENSE ++++++ lscsoft-glue-2.0.0.tar.gz -> lscsoft-glue-2.1.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lscsoft-glue-2.0.0/MANIFEST.in new/lscsoft-glue-2.1.0/MANIFEST.in --- old/lscsoft-glue-2.0.0/MANIFEST.in 2019-02-20 23:30:32.000000000 +0100 +++ new/lscsoft-glue-2.1.0/MANIFEST.in 2020-10-02 18:21:32.000000000 +0200 @@ -2,6 +2,7 @@ include glue/ligolw/*.c include glue/ligolw/*.h include misc/*.py +include misc/*.py.in include src/conf/db2/* include src/conf/s6_db2/*.in include src/conf/s6_db2/change_creator_db.pl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lscsoft-glue-2.0.0/PKG-INFO new/lscsoft-glue-2.1.0/PKG-INFO --- old/lscsoft-glue-2.0.0/PKG-INFO 2019-02-20 23:45:15.000000000 +0100 +++ new/lscsoft-glue-2.1.0/PKG-INFO 2020-10-02 18:36:48.000000000 +0200 @@ -1,10 +1,10 @@ Metadata-Version: 1.1 Name: lscsoft-glue -Version: 2.0.0 +Version: 2.1.0 Summary: Grid LSC User Engine -Home-page: http://www.lsc-group.phys.uwm.edu/daswg/ +Home-page: https://docs.ligo.org/lscsoft/glue/ Author: Duncan Brown -Author-email: [email protected] +Author-email: [email protected] License: GPLv2+ Description: # GLUE: Grid LSC User Environment diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lscsoft-glue-2.0.0/debian/changelog new/lscsoft-glue-2.1.0/debian/changelog --- old/lscsoft-glue-2.0.0/debian/changelog 2019-02-20 23:42:26.000000000 +0100 +++ new/lscsoft-glue-2.1.0/debian/changelog 2020-10-02 18:21:32.000000000 +0200 @@ -1,3 +1,9 @@ +lscsoft-glue (2.1.0-1) unstable; urgency=low + + * 2.1.0 deprecation update + + -- ryan fisher <[email protected]> Fri, 11 Sep 2020 14:47:00 -0500 + lscsoft-glue (2.0.0-1) unstable; urgency=low * 2.0.0 version update with many changes and removal of segments subpackage diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lscsoft-glue-2.0.0/etc/glue.spec new/lscsoft-glue-2.1.0/etc/glue.spec --- old/lscsoft-glue-2.0.0/etc/glue.spec 2019-02-20 23:38:18.000000000 +0100 +++ new/lscsoft-glue-2.1.0/etc/glue.spec 2020-10-02 18:21:32.000000000 +0200 @@ -1,94 +1,118 @@ -Name: glue -Summary: The Grid LSC User Environment -Version: 2.0.0 -Release: 1%{?dist} -License: GPLv2+ -Group: Development/Libraries -Source: lscsoft-%{name}-%{version}.tar.gz -Url: http://www.lsc-group.phys.uwm.edu/daswg/projects/glue.html -BuildRoot: %{_tmppath}/%{name}-%{version}-root -Requires: python-cjson pyOpenSSL numpy python-six glue-common python >= 2.7 +Name: glue +Summary: The Grid LSC User Environment +Version: 2.1.0 +Release: 3%{?dist} +Packager: Duncan Macleod <[email protected]> + +License: GPLv2+ +Prefix: %{_prefix} +Source0: http://software.ligo.org/lscsoft/source/lscsoft-%{name}-%{version}.tar.gz +Url: https://lscsoft.docs.ligo.org/glue/ # build requirements BuildRequires: gcc BuildRequires: python-rpm-macros BuildRequires: python2-rpm-macros BuildRequires: python3-rpm-macros +BuildRequires: epel-rpm-macros BuildRequires: python-devel BuildRequires: python-setuptools -BuildRequires: python%{python3_version_nodots}-devel -BuildRequires: python%{python3_version_nodots}-setuptools +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-setuptools # testing requirements BuildRequires: make -BuildRequires: python-matplotlib BuildRequires: numpy -BuildRequires: python-six BuildRequires: python2-ligo-segments -BuildRequires: python%{python3_version_nodots}-numpy -BuildRequires: python%{python3_version_nodots}-six -BuildRequires: python%{python3_version_nodots}-ligo-segments +BuildRequires: python2-matplotlib +BuildRequires: python2-six +BuildRequires: python%{python3_pkgversion}-matplotlib +BuildRequires: python%{python3_pkgversion}-numpy +BuildRequires: python%{python3_pkgversion}-six +BuildRequires: python%{python3_pkgversion}-ligo-segments -Prefix: %{_exec_prefix} %description Glue (Grid LSC User Environment) is a suite of python modules and programs to allow users to run LSC codes on the grid. -%package -n python%{python3_version_nodots}-glue -Summary: The Grid LSC User Environment -Group: Development/Libraries -Requires: python%{python3_version_nodots} -Requires: python%{python3_version_nodots}-numpy -Requires: python%{python3_version_nodots}-six -Requires: python%{python3_version_nodots}-glue-common -%{?python_provide:%python_provide python%{python3_version_nodots}-glue} -%description -n python%{python3_version_nodots}-glue +# -- python2 ---------------- + +%package -n python2-%{name}-common +Summary: The common files needed for all glue sub-packages +Requires: numpy +Requires: python +Requires: python2-six +Provides: %{name}-common = %{version}-%{release} +%{?python_provide:%python_provide python2-%{name}} +%description -n python2-%{name}-common Glue (Grid LSC User Environment) is a suite of python modules and programs to allow users to run LSC codes on the grid. +This packages provides the modules that are common across the glue subpackages, +namely git_version, iterutils and __init__.py, for Python %{python2_version}. -%package common -Summary: The common files needed for all sub-packages -Group: Development/Libraries -Requires: python numpy python-six -%description common -This is for the files that are common across the glue subpackages, namely -git_version, iterutils and __init__.py +%package -n python2-%{name} +Summary: The Grid LSC User Environment +Requires: python +Requires: numpy +Requires: python2-%{name}-common +Requires: python2-ligo-segments +Requires: python2-six +Provides: %{name} = %{version}-%{release} +%{?python_provide:%python_provide python2-%{name}} +%description -n python2-%{name} +Glue (Grid LSC User Environment) is a suite of python modules and programs to +allow users to run LSC codes on the grid. +This package provides the full Python %{python2_version} library. + +# -- python3 ---------------- + +%package -n python%{python3_pkgversion}-%{name} +Summary: The Grid LSC User Environment +Requires: python%{python3_pkgversion} +Requires: python%{python3_pkgversion}-numpy +Requires: python%{python3_pkgversion}-six +Requires: python%{python3_pkgversion}-%{name}-common +%{?python_provide:%python_provide python%{python3_pkgversion}-%{name}} +%description -n python%{python3_pkgversion}-%{name} +Glue (Grid LSC User Environment) is a suite of python modules and programs to +allow users to run LSC codes on the grid. +This package provides the full Python %{python3_version} library. -%package -n python%{python3_version_nodots}-glue-common -Summary: The common files needed for all sub-packages -Group: Development/Libraries -Requires: python%{python3_version_nodots} -Requires: python%{python3_version_nodots}-numpy -Requires: python%{python3_version_nodots}-six -%description -n python%{python3_version_nodots}-glue-common +%package -n python%{python3_pkgversion}-%{name}-common +Summary: The common files needed for all glue sub-packages +Requires: python%{python3_pkgversion} +Requires: python%{python3_pkgversion}-numpy +Requires: python%{python3_pkgversion}-six +%description -n python%{python3_pkgversion}-%{name}-common This is for the files that are common across the glue subpackages, namely git_version, iterutils and __init__.py +# -- build ------------------ + %prep -%setup -n lscsoft-%{name}-%{version} +%autosetup -n lscsoft-%{name}-%{version} %build -%py3_build %py2_build +%py3_build %install -%py2_install %py3_install +%py2_install %check -PYTHONPATH="${RPM_BUILD_ROOT}%{python2_sitearch}" \ +PYTHONPATH="%{buildroot}%{python2_sitearch}" \ PYTHON=%{__python2} \ -PATH=${RPM_BUILD_ROOT}%{_bindir}:${PATH} \ +PATH=%{buildroot}%{_bindir}:${PATH} \ make -C test \ -o lal_verify \ -o ligolw_test01 \ -o test_ligolw_lsctables \ -o test_ligolw_table \ -o test_ligolw_utils_segments -PYTHONPATH="${RPM_BUILD_ROOT}%{python3_sitearch}" \ +PYTHONPATH="%{buildroot}%{python3_sitearch}" \ PYTHON=%{__python3} \ make -C test \ - -o iterutils_verify \ -o lal_verify \ -o ligolw_test01 \ -o test_ligolw_lsctables \ @@ -98,55 +122,54 @@ %clean rm -rf $RPM_BUILD_ROOT -%files -%defattr(-,root,root) +# -- files ------------------ + +%files -n python2-%{name}-common +%license LICENSE +%{python2_sitearch}/glue/__init__.py* +%{python2_sitearch}/glue/iterutils.py* +%{python2_sitearch}/glue/git_version.py* + +%files -n python2-%{name} %license LICENSE +%{_bindir}/* %{python2_sitearch}/lscsoft_glue-*.egg-info/ %{python2_sitearch}/glue/ -%{_bindir}/* %exclude %{_exec_prefix}/etc/ %exclude %{_exec_prefix}/var/ %exclude %{python2_sitearch}/glue/__init__.py* %exclude %{python2_sitearch}/glue/iterutils.py* %exclude %{python2_sitearch}/glue/git_version.py* -#%exclude %{_exec_prefix}/test/verifyutils.py -%files -n python%{python3_version_nodots}-glue -%defattr(-,root,root) +%files -n python%{python3_pkgversion}-%{name}-common +%license LICENSE +%{python3_sitearch}/glue/__init__.py +%{python3_sitearch}/glue/__pycache__/__init__.* +%{python3_sitearch}/glue/iterutils.py +%{python3_sitearch}/glue/__pycache__/iterutils.* +%{python3_sitearch}/glue/git_version.py +%{python3_sitearch}/glue/__pycache__/git_version.* + +%files -n python%{python3_pkgversion}-%{name} %license LICENSE %{python3_sitearch}/lscsoft_glue-*.egg-info/ %{python3_sitearch}/glue/ -%exclude %{_bindir}/ -%exclude %{_exec_prefix}/etc/ -%exclude %{_exec_prefix}/var/ %exclude %{python3_sitearch}/glue/__init__.py -%exclude %{python3_sitearch}/glue/__pycache__/__init__.cpython-%{python3_version_nodots}.py? -%exclude %{python3_sitearch}/glue/__pycache__/segments.cpython-%{python3_version_nodots}.py? +%exclude %{python3_sitearch}/glue/__pycache__/__init__.* %exclude %{python3_sitearch}/glue/iterutils.py -%exclude %{python3_sitearch}/glue/__pycache__/iterutils.cpython-%{python3_version_nodots}.py? +%exclude %{python3_sitearch}/glue/__pycache__/iterutils.* %exclude %{python3_sitearch}/glue/git_version.py -%exclude %{python3_sitearch}/glue/__pycache__/git_version.cpython-%{python3_version_nodots}.py? -#%exclude %{_exec_prefix}/test/verifyutils.py +%exclude %{python3_sitearch}/glue/__pycache__/git_version.* -%files common -%license LICENSE -%{python2_sitearch}/glue/__init__.py -%{python2_sitearch}/glue/__init__.pyc -%{python2_sitearch}/glue/iterutils.pyc -%{python2_sitearch}/glue/iterutils.py -%{python2_sitearch}/glue/git_version.py -%{python2_sitearch}/glue/git_version.pyc - -%files -n python%{python3_version_nodots}-glue-common -%license LICENSE -%{python3_sitearch}/glue/__init__.py -%{python3_sitearch}/glue/__pycache__/__init__.cpython-%{python3_version_nodots}.pyc -%{python3_sitearch}/glue/iterutils.py -%{python3_sitearch}/glue/__pycache__/iterutils.cpython-%{python3_version_nodots}.pyc -%{python3_sitearch}/glue/git_version.py -%{python3_sitearch}/glue/__pycache__/git_version.cpython-%{python3_version_nodots}.pyc +# -- changelog -------------- %changelog +* Fri Sep 11 2020 Ryan Fisher <[email protected]> 2.1.0-1 +- Test release with deprecations. + +* Fri Dec 6 2019 Duncan Macleod <[email protected]> 2.0.0-3 +- Rename packages according to EPEL naming conventions + * Wed Feb 20 2019 Ryan Fisher <[email protected]> - Major version update with many changes and removal of segments subpackage. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lscsoft-glue-2.0.0/glue/git_version.py new/lscsoft-glue-2.1.0/glue/git_version.py --- old/lscsoft-glue-2.0.0/glue/git_version.py 2019-02-20 23:45:12.000000000 +0100 +++ new/lscsoft-glue-2.1.0/glue/git_version.py 2020-10-02 18:36:48.000000000 +0200 @@ -13,23 +13,23 @@ # You should have received a copy of the GNU General Public License along with # this program. If not, see <http://www.gnu.org/licenses/>. -version = '2.0.0' +version = '2.1.0' # git information -id = 'a1e5109f4893fd04cab4237827f62382ec61d50f' -date = '2019-02-20 22:43:17 +0000' +id = 'dfd36d5e845ed196154b7027f4e9a0e445c6cd34' +date = '2020-09-11 18:52:01 +0000' branch = 'master' -tag = 'glue-release-2.0.0' +tag = 'glue-release-2.1.0' author = 'Ryan Fisher <[email protected]>' -builder = 'Ryan Fisher <[email protected]>' +builder = 'Robert Bruntz <[email protected]>' committer = 'Ryan Fisher <[email protected]>' status = 'CLEAN: All modifications committed' verbose_msg = """Branch: master -Tag: glue-release-2.0.0 -Id: a1e5109f4893fd04cab4237827f62382ec61d50f +Tag: glue-release-2.1.0 +Id: dfd36d5e845ed196154b7027f4e9a0e445c6cd34 -Builder: Ryan Fisher <[email protected]> -Build date: 2019-02-20 22:45:12 +0000 +Builder: Robert Bruntz <[email protected]> +Build date: 2020-10-02 16:36:48 +0000 Repository status: CLEAN: All modifications committed""" import warnings @@ -48,9 +48,9 @@ """ if onmismatch not in ("raise", "warn"): raise ValueError(onmismatch + " is an unrecognized value of onmismatch") - if foreign_id == 'a1e5109f4893fd04cab4237827f62382ec61d50f': + if foreign_id == 'dfd36d5e845ed196154b7027f4e9a0e445c6cd34': return - msg = "Program id (a1e5109f4893fd04cab4237827f62382ec61d50f does not match given id (%s)." % foreign_id + msg = "Program id (dfd36d5e845ed196154b7027f4e9a0e445c6cd34 does not match given id (%s)." % foreign_id if onmismatch == "raise": raise VersionMismatchError(msg) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lscsoft-glue-2.0.0/glue/ligolw/__init__.py new/lscsoft-glue-2.1.0/glue/ligolw/__init__.py --- old/lscsoft-glue-2.0.0/glue/ligolw/__init__.py 2018-02-20 20:12:04.000000000 +0100 +++ new/lscsoft-glue-2.1.0/glue/ligolw/__init__.py 2020-10-02 18:21:32.000000000 +0200 @@ -76,6 +76,8 @@ >>> ligolw_utils.write_filename(xmldoc, filename, gz = >>> filename.endswith(".gz"), verbose = True) """ +import warnings + from glue import git_version @@ -95,3 +97,11 @@ "lsctables", "utils" ] + + +warnings.warn( + "glue.ligolw has been deprecated and is not being updated, please migrate " + "your workflow to use the updated LIGO_LW XML format and interface " + "supported by python-ligo-lw", + DeprecationWarning, +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lscsoft-glue-2.0.0/misc/git_version.py.in new/lscsoft-glue-2.1.0/misc/git_version.py.in --- old/lscsoft-glue-2.0.0/misc/git_version.py.in 1970-01-01 01:00:00.000000000 +0100 +++ new/lscsoft-glue-2.1.0/misc/git_version.py.in 2020-10-02 18:21:32.000000000 +0200 @@ -0,0 +1,59 @@ +# This file is part of the Grid LSC User Environment (GLUE) +# +# GLUE is free software: you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation, either version 3 of the License, or (at your option) any later +# version. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +# details. +# +# You should have received a copy of the GNU General Public License along with +# this program. If not, see <http://www.gnu.org/licenses/>. + +version = {version!r} + +# git information +id = {0.id!r} +date = {0.date!r} +branch = {0.branch!r} +tag = {0.tag!r} +author = {0.author!r} +builder = {0.builder!r} +committer = {0.committer!r} +status = {0.status!r} +verbose_msg = """Branch: {0.branch} +Tag: {0.tag} +Id: {0.id} + +Builder: {0.builder} +Build date: {0.build_date} +Repository status: {0.status}""" + +import warnings + +class VersionMismatchError(ValueError): + pass + +def check_match(foreign_id, onmismatch="raise"): + """ + If foreign_id != id, perform an action specified by the onmismatch + kwarg. This can be useful for validating input files. + + onmismatch actions: + "raise": raise a VersionMismatchError, stating both versions involved + "warn": emit a warning, stating both versions involved + """ + if onmismatch not in ("raise", "warn"): + raise ValueError(onmismatch + " is an unrecognized value of onmismatch") + if foreign_id == {0.id!r}: + return + msg = "Program id ({0.id} does not match given id (%s)." % foreign_id + if onmismatch == "raise": + raise VersionMismatchError(msg) + + # in the backtrace, show calling code + warnings.warn(msg, UserWarning) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lscsoft-glue-2.0.0/setup.py new/lscsoft-glue-2.1.0/setup.py --- old/lscsoft-glue-2.0.0/setup.py 2019-02-20 23:35:31.000000000 +0100 +++ new/lscsoft-glue-2.1.0/setup.py 2020-10-02 18:21:32.000000000 +0200 @@ -15,7 +15,7 @@ from misc import generate_vcs_info as gvcsi -ver = "2.0.0" +ver = "2.1.0" # get long description from README with open('README.md', 'rb') as f: @@ -110,11 +110,11 @@ name = "lscsoft-glue", version = ver, author = "Duncan Brown", - author_email = "[email protected]", + author_email = "[email protected]", description = "Grid LSC User Engine", long_description = longdesc, long_description_content_type = 'text/markdown', - url = "http://www.lsc-group.phys.uwm.edu/daswg/";, + url = "https://docs.ligo.org/lscsoft/glue/";, license = 'GPLv2+', packages = [ 'glue', 'glue.ligolw', 'glue.ligolw.utils', 'glue.segmentdb', 'glue.auth'], install_requires=install_requires,
