From 11d9aa4b55a9bd179cfc10ef38d107a26db879f4 Mon Sep 17 00:00:00 2001 From: badshah400 <> Date: Sep 16 2024 17:27:39 +0000 Subject: Update lscsoft-glue to version 4.0.0 / rev 8 via SR 1201303 https://build.opensuse.org/request/show/1201303 by user badshah400 + anag+factory - Update to version 4.0.0: - Drop lscsoft-glue-data package: no longer applicable. - Make package noarch. - Switch to %pyproject_* based builds; add BuildRequires: python-pip and python-wheel. - New Requires: python-six and python-pyOpenSSL; drop no longer needed python-pyRXP. - Add setup.cfg snippet to allow building for openSUSE Leap 15.x. --- diff --git a/.files b/.files index d6bbcc7..c487952 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index 97d4716..f2f105a 100644 --- a/.rev +++ b/.rev @@ -68,4 +68,20 @@ 1139726 + + e0e26885b96a5b14b262ccef1ba97f3a + 4.0.0 + + anag+factory + - Update to version 4.0.0: +- Drop lscsoft-glue-data package: no longer applicable. +- Make package noarch. +- Switch to %pyproject_* based builds; add BuildRequires: + python-pip and python-wheel. +- New Requires: python-six and python-pyOpenSSL; drop no longer + needed python-pyRXP. +- Add setup.cfg snippet to allow building for openSUSE Leap 15.x. + + 1201303 + diff --git a/lscsoft-glue-3.0.2.tar.gz b/lscsoft-glue-3.0.2.tar.gz deleted file mode 120000 index 0489cf1..0000000 --- a/lscsoft-glue-3.0.2.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeidtrejfecyzsemfv346ddillpzs7qrvfk74a3sefefcf5eko2iv7u \ No newline at end of file diff --git a/lscsoft-glue-4.0.0.tar.gz b/lscsoft-glue-4.0.0.tar.gz new file mode 120000 index 0000000..4aaef4e --- /dev/null +++ b/lscsoft-glue-4.0.0.tar.gz @@ -0,0 +1 @@ +/ipfs/bafkreigheufwsxnb3nwg7qbulggcudsgcazhhitz5ilq2ygci4txb3oi6u \ No newline at end of file diff --git a/lscsoft-glue.changes b/lscsoft-glue.changes index 032beee..03f5f04 100644 --- a/lscsoft-glue.changes +++ b/lscsoft-glue.changes @@ -1,4 +1,19 @@ ------------------------------------------------------------------- +Tue Aug 13 05:49:09 UTC 2024 - Atri Bhattacharya + +- Update to version 4.0.0: + * lots of library content, and all scripts, has been removed + * removed lscsoft-glue-utils package + * use pybuild-plugin-pyproject for building +- Drop lscsoft-glue-data package: no longer applicable. +- Make package noarch. +- Switch to %pyproject_* based builds; add BuildRequires: + python-pip and python-wheel. +- New Requires: python-six and python-pyOpenSSL; drop no longer + needed python-pyRXP. +- Add setup.cfg snippet to allow building for openSUSE Leap 15.x. + +------------------------------------------------------------------- Mon Jan 15 08:32:36 UTC 2024 - Atri Bhattacharya - Update for version 3.0.2: diff --git a/lscsoft-glue.spec b/lscsoft-glue.spec index bb8d846..90c9135 100644 --- a/lscsoft-glue.spec +++ b/lscsoft-glue.spec @@ -31,26 +31,29 @@ ExcludeArch: %{ix86} # Support dropped for python2 by upstream %define skip_python2 1 -%define ligocommands ligolw_combine_segments ligolw_diff ligolw_dq_active ligolw_dq_active_cats ligolw_inspiral2mon ligolw_print_tables - %define modname glue Name: lscsoft-glue%{psuffix} -Version: 3.0.2 +Version: 4.0.0 Release: 0 Summary: Grid LSC User Environment License: GPL-2.0-only URL: http://software.ligo.org/lscsoft Source: https://files.pythonhosted.org/packages/source/l/lscsoft-glue/%{pname}-%{version}.tar.gz BuildRequires: %{python_module devel} +BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: %{pname}-data = %{version} Requires: python-ligo-segments Requires: python-numpy -Requires: python-pyRXP +Requires: python-pyOpenSSL +Requires: python-six +Provides: lscsoft-glue-data = %{version} +Obsoletes: lscsoft-glue-data < %{version} Provides: python-glue = %{version}-%{release} Obsoletes: python-glue < %{version}-%{release} +BuildArch: noarch %define oldpython python Provides: %{oldpython}-glue = %{version}-%{release} Obsoletes: %{oldpython}-glue < %{version}-%{release} @@ -60,7 +63,6 @@ BuildRequires: %{python_module ligo-segments} BuildRequires: %{python_module lscsoft-glue = %{version}} BuildRequires: %{python_module matplotlib} BuildRequires: %{python_module numpy} -BuildRequires: %{python_module pyRXP} BuildRequires: %{python_module pytest} %endif Requires(post): update-alternatives @@ -86,53 +88,55 @@ This package provides a common set of data files for %{name}. %prep %autosetup -p1 -n %{pname}-%{version} +# Taken from bundled specfile template +%if 0%{?suse_version} < 1650 +cat > setup.cfg <=3.6 +install_requires = + ligo-segments + pyOpenSSL + six +EOF +%endif %build %if ! %{with test} -%python_build +%pyproject_wheel %endif %install %if ! %{with test} -%python_install +%pyproject_install # SECTION Remove non-library config/php files rm -fr %{buildroot}%{_prefix}%{_sysconfdir} rm -fr %{buildroot}%{_prefix}%{_localstatedir} # /SECTION -%{lua: for c in string.gmatch(rpm.expand("%ligocommands"), "%S+") do - print(rpm.expand("%python_clone -a %{buildroot}%{_bindir}/" .. c .. "\n")) -end} - -%python_expand %fdupes -s %{buildroot}%{$python_sitearch} +%python_expand %fdupes -s %{buildroot}%{$python_sitelib} %endif %if %{with test} %check # test_ldbd.py requires network; disable -%pytest_arch -k 'not test_ldbd' +%pytest -k 'not test_ldbd' %endif %if ! %{with test} -%post -%python_install_alternative %ligocommands - -%postun -# arguments after the master item are ignored -%python_uninstall_alternative %ligocommands - -%files -n %{pname}-data -%{_datadir}/%{name}/ - %files %{python_files} %doc README.md %license LICENSE -%{lua: for c in string.gmatch(rpm.expand("%ligocommands"), "%S+") do - print(rpm.expand("%python_alternative %{_bindir}/" .. c .. "\n")) -end} -%{python_sitearch}/glue -%{python_sitearch}/lscsoft_glue-%{version}*-info +%{python_sitelib}/glue/ +%{python_sitelib}/lscsoft_glue-%{version}*-info %endif %changelog