Accepting request 1237539 from science

- Update to 2.1.0:
- add remove-six.patch to not require deprecated python-six
- update project url, upstream migrated to ligo.org
- migrate to setuptools and pyproject macros

OBS-URL: https://build.opensuse.org/request/show/1237539
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-dqsegdb?expand=0&rev=3

dqsegdb-2.0.0.tar.gz

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

dqsegdb-2.1.0.tar.gz

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

python-dqsegdb.changes

@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Fri Jan 10 13:33:47 UTC 2025 - Nico Krapp <nico.krapp@suse.com>
+
+- Update to 2.1.0:
+  * migrates the CI from Github Actions to GitLab CI.
+  * removes user-env scripts
+  * adds lint job to the CI pipeline
+  * updates RPM build/install to use wheels
+  * modifies code that used glue.gpstime for GPS time conversion 
+    to use gpstime package instead (some specific routines will 
+    produce times that are 4 seconds different, due to updates in 
+    leap seconds, but uses of those routines shouldn't be sensitive 
+    to such changes)
+  * removes unused (and broken) function setup_files() from clientutils.py
+  * pins lscsoft-glue to version >= 3.0.1, < 4.0.0
+- add remove-six.patch to not require deprecated python-six
+- update project url, upstream migrated to ligo.org
+- migrate to setuptools and pyproject macros
+
 -------------------------------------------------------------------
 Tue Apr  5 10:37:47 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
 

python-dqsegdb.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-dqsegdb
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,26 +19,30 @@
 %define skip_python2 1
 %define modname dqsegdb
 Name:           python-dqsegdb
-Version:        2.0.0
+Version:        2.1.0
 Release:        0
 Summary:        Client library for DQSegDB
 License:        GPL-3.0-only
 Group:          Development/Languages/Python
-URL:            https://github.com/ligovirgo/dqsegdb
+URL:            https://git.ligo.org/computing/dqsegdb/client
 Source:         https://files.pythonhosted.org/packages/source/d/dqsegdb/dqsegdb-%{version}.tar.gz
+# PATCH-FIX-OPENSUSE remove-six.patch to remove dependency on python-six
+Patch0:         remove-six.patch
 BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module setuptools >= 8.0}
-BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module wheel}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
+Requires:       python-gpstime
 Requires:       python-gwdatafind
 Requires:       python-lal
-Requires:       python-lscsoft-glue >= 1.55.0
-Requires:       python-numpy
+Requires:       python-ligo-segments
+Requires:       python-lscsoft-glue >= 3.0.1
 Requires:       python-pyOpenSSL
 Requires:       python-pyRXP
 Requires(post): update-alternatives
-Requires(postun):update-alternatives
+Requires(postun): update-alternatives
 BuildArch:      noarch
 # SECTION For tests
 BuildRequires:  %{python_module lal}
@@ -54,13 +58,13 @@ python-dqsegdb provides the python bindings and the client tools to
 connect to LIGO/VIRGO DQSEGDB server instances.
 
 %prep
-%setup -q -n dqsegdb-%{version}
+%autosetup -p1 -n dqsegdb-%{version}
 
 %build
-%python_build
+%pyproject_wheel
 
 %install
-%python_install
+%pyproject_install
 for exe in ligolw_dq_query_dqsegdb ligolw_publish_threaded_dqxml_dqsegdb ligolw_segment_insert_dqsegdb ligolw_segment_query_dqsegdb ligolw_segments_from_cats_dqsegdb
 do
 %python_clone -a %{buildroot}%{_bindir}/${exe}
@@ -68,8 +72,6 @@ done
 
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
-rm %{buildroot}%{_prefix}%{_sysconfdir}/dqsegdb-user-env.*
-
 %check
 %pytest
 
@@ -86,7 +88,7 @@ rm %{buildroot}%{_prefix}%{_sysconfdir}/dqsegdb-user-env.*
 %python_alternative %{_bindir}/ligolw_segment_insert_dqsegdb
 %python_alternative %{_bindir}/ligolw_segment_query_dqsegdb
 %python_alternative %{_bindir}/ligolw_segments_from_cats_dqsegdb
-%{python_sitelib}/%{modname}/
-%{python_sitelib}/%{modname}-%{version}-py%{python_version}.egg-info/
+%{python_sitelib}/%{modname}
+%{python_sitelib}/%{modname}-%{version}.dist-info
 
 %changelog

remove-six.patch

@@ -0,0 +1,55 @@
+Index: dqsegdb-2.1.0/dqsegdb/apicalls.py
+===================================================================
+--- dqsegdb-2.1.0.orig/dqsegdb/apicalls.py
++++ dqsegdb-2.1.0/dqsegdb/apicalls.py
+@@ -19,7 +19,7 @@ import sys
+ import time
+ from datetime import datetime, time as time2
+ 
+-from six.moves.urllib.error import HTTPError
++from urllib.error import HTTPError
+ 
+ try:
+     import pyRXPU as pyRXP
+Index: dqsegdb-2.1.0/dqsegdb/clientutils.py
+===================================================================
+--- dqsegdb-2.1.0.orig/dqsegdb/clientutils.py
++++ dqsegdb-2.1.0/dqsegdb/clientutils.py
+@@ -21,7 +21,7 @@ import os
+ import operator
+ import tempfile
+ 
+-from six.moves import reduce
++from functools import reduce
+ 
+ from ligo import segments
+ 
+Index: dqsegdb-2.1.0/dqsegdb/urifunctions.py
+===================================================================
+--- dqsegdb-2.1.0.orig/dqsegdb/urifunctions.py
++++ dqsegdb-2.1.0/dqsegdb/urifunctions.py
+@@ -23,9 +23,9 @@ import time
+ import os
+ from OpenSSL import crypto
+ 
+-from six.moves.urllib.parse import urlparse
+-from six.moves import http_client
+-from six.moves.urllib import (request as urllib_request,
++from urllib.parse import urlparse
++import http.client as http_client
++from urllib import (request as urllib_request,
+                               error as urllib_error)
+ 
+ 
+Index: dqsegdb-2.1.0/setup.py
+===================================================================
+--- dqsegdb-2.1.0.orig/setup.py
++++ dqsegdb-2.1.0/setup.py
+@@ -45,7 +45,6 @@ setup(name=PACKAGENAME,
+           'lscsoft-glue>=3.0.1,<4.0.0',
+           'pyOpenSSL>=0.14',
+           'pyRXP',
+-          'six',
+       ],
+       provides=[PACKAGENAME],
+       author=AUTHOR,