Accepting request 1288540 from devel:languages:python

- Convert to libalternatives

OBS-URL: https://build.opensuse.org/request/show/1288540
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-vobject?expand=0&rev=11

no-six.patch

@@ -0,0 +1,142 @@
+Index: vobject-0.9.9/vobject/base.py
+===================================================================
+--- vobject-0.9.9.orig/vobject/base.py
++++ vobject-0.9.9/vobject/base.py
+@@ -6,7 +6,7 @@ import copy
+ import codecs
+ import logging
+ import re
+-import six
++import io
+ import sys
+ 
+ # Package version
+@@ -858,7 +858,7 @@ def getLogicalLines(fp, allowQP=True):
+     Quoted-printable data will be decoded in the Behavior decoding phase.
+ 
+     # We're leaving this test in for awhile, because the unittest was ugly and dumb.
+-    >>> from six import StringIO
++    >>> from io import StringIO
+     >>> f=StringIO(testLines)
+     >>> for n, l in enumerate(getLogicalLines(f)):
+     ...     print("Line %s: %s" % (n, l[0]))
+@@ -881,7 +881,7 @@ def getLogicalLines(fp, allowQP=True):
+ 
+     else:
+         quotedPrintable = False
+-        newbuffer = six.StringIO
++        newbuffer = io.StringIO
+         logicalLine = newbuffer()
+         lineNumber = 0
+         lineStartNumber = 0
+@@ -996,7 +996,7 @@ def defaultSerialize(obj, buf, lineLengt
+     """
+     Encode and fold obj and its children, write to buf or return a string.
+     """
+-    outbuf = buf or six.StringIO()
++    outbuf = buf or io.StringIO()
+ 
+     if isinstance(obj, Component):
+         if obj.group is None:
+@@ -1018,7 +1018,7 @@ def defaultSerialize(obj, buf, lineLengt
+         if obj.behavior and not startedEncoded:
+             obj.behavior.encode(obj)
+ 
+-        s = six.StringIO()
++        s = io.StringIO()
+ 
+         if obj.group is not None:
+             s.write(obj.group + '.')
+@@ -1082,7 +1082,7 @@ def readComponents(streamOrString, valid
+     Generate one Component at a time from a stream.
+     """
+     if isinstance(streamOrString, basestring):
+-        stream = six.StringIO(streamOrString)
++        stream = io.StringIO(streamOrString)
+     else:
+         stream = streamOrString
+ 
+Index: vobject-0.9.9/vobject/hcalendar.py
+===================================================================
+--- vobject-0.9.9.orig/vobject/hcalendar.py
++++ vobject-0.9.9/vobject/hcalendar.py
+@@ -28,7 +28,7 @@ and an equivalent event in hCalendar for
+ </span>
+ """
+ 
+-import six
++import io
+ 
+ from datetime import date, datetime, timedelta
+ 
+@@ -45,7 +45,7 @@ class HCalendar(VCalendar2_0):
+         Serialize iCalendar to HTML using the hCalendar microformat (http://microformats.org/wiki/hcalendar)
+         """
+ 
+-        outbuf = buf or six.StringIO()
++        outbuf = buf or io.StringIO()
+         level = 0  # holds current indentation level
+         tabwidth = 3
+ 
+Index: vobject-0.9.9/vobject/icalendar.py
+===================================================================
+--- vobject-0.9.9.orig/vobject/icalendar.py
++++ vobject-0.9.9/vobject/icalendar.py
+@@ -10,7 +10,7 @@ import string
+ import base64
+ 
+ from dateutil import rrule, tz
+-import six
++import io
+ 
+ try:
+     import pytz
+@@ -56,7 +56,7 @@ def toUnicode(s):
+     """
+     Take a string or unicode, turn it into unicode, decoding as utf-8
+     """
+-    if isinstance(s, six.binary_type):
++    if isinstance(s, bytes):
+         s = s.decode('utf-8')
+     return s
+ 
+@@ -135,7 +135,7 @@ class TimezoneComponent(Component):
+         good_lines = ('rdate', 'rrule', 'dtstart', 'tzname', 'tzoffsetfrom',
+                       'tzoffsetto', 'tzid')
+         # serialize encodes as utf-8, cStringIO will leave utf-8 alone
+-        buffer = six.StringIO()
++        buffer = io.StringIO()
+         # allow empty VTIMEZONEs
+         if len(self.contents) == 0:
+             return None
+@@ -569,7 +569,7 @@ class RecurringComponent(Component):
+                     self.add(name).value = setlist
+             elif name in RULENAMES:
+                 for rule in setlist:
+-                    buf = six.StringIO()
++                    buf = io.StringIO()
+                     buf.write('FREQ=')
+                     buf.write(FREQUENCIES[rule._freq])
+ 
+@@ -1010,7 +1010,7 @@ class VCalendar2_0(VCalendarComponentBeh
+             transformed = obj
+             undoTransform = False
+         out = None
+-        outbuf = buf or six.StringIO()
++        outbuf = buf or io.StringIO()
+         if obj.group is None:
+             groupString = ''
+         else:
+Index: vobject-0.9.9/setup.py
+===================================================================
+--- vobject-0.9.9.orig/setup.py
++++ vobject-0.9.9/setup.py
+@@ -49,7 +49,7 @@ setup(name = "vobject",
+       include_package_data = True,
+       install_requires=["python-dateutil >= 2.5.0; python_version < '3.10'",
+                         "python-dateutil >= 2.7.0; python_version >= '3.10'",
+-                        "pytz", 'six'],
++                        "pytz"],
+       platforms = ["any"],
+       packages = find_packages(),
+       description = "A full-featured Python package for parsing and creating "

python-vobject.changes

@@ -1,3 +1,41 @@
+-------------------------------------------------------------------
+Wed Jun 25 12:51:21 UTC 2025 - Markéta Machová <mmachova@suse.com>
+
+- Convert to libalternatives
+
+-------------------------------------------------------------------
+Tue Jun 24 02:58:12 UTC 2025 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Switch to pyproject macros.
+- Refresh no-six.patch.
+
+-------------------------------------------------------------------
+Thu May  8 09:04:57 UTC 2025 - Axel Braun <axel.braun@gmx.de>
+
+- verion 0.9.9
+  * Added product version to PRODID tag in iCalendar headers
+  * Added support for GEO tags in vCards
+  * radicale-1587.vcf added (missing in release tarball)
+
+-------------------------------------------------------------------
+Thu Dec 19 09:35:46 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
+
+- Use regular %%pynittest macro instead of running the test
+  script directly.
+
+-------------------------------------------------------------------
+Wed Dec 18 13:50:35 UTC 2024 - Markéta Machová <mmachova@suse.com>
+
+- add patch no-six.patch to get rid of six
+
+-------------------------------------------------------------------
+Tue Nov  5 15:07:32 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
+
+- Update to 0.9.8
+  * Accumulated bug fixes
+- Move %python_uninstall_alternative from %preun to %postun
+- Update BuildRequires and Requires from setup.py
+
 -------------------------------------------------------------------
 Thu May  2 22:20:21 UTC 2024 - Dirk Müller <dmueller@suse.com>
 

python-vobject.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-vobject
 #
-# Copyright (c) 2024 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
@@ -17,25 +17,32 @@
 
 
 %global modname vobject
+%bcond_without libalternatives
 %{?sle15_python_module_pythons}
 Name:           python-vobject
-Version:        0.9.7
+Version:        0.9.9
 Release:        0
 Summary:        Python package for parsing and creating iCalendar and vCard files
 License:        Apache-2.0
-Group:          Development/Languages/Python
 URL:            https://github.com/py-vobject/vobject/
 Source:         https://files.pythonhosted.org/packages/source/v/vobject/%{modname}-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM https://github.com/py-vobject/vobject/pull/87 remove six
+# file missiing in release
+Source1:        radicale-1587.vcf
+Patch0:         no-six.patch
 BuildRequires:  %{python_module PyICU}
 BuildRequires:  %{python_module devel >= 2.7}
-BuildRequires:  %{python_module python-dateutil >= 2.4.0}
+BuildRequires:  %{python_module pip}
+BuildRequires:  %{python_module python-dateutil >= 2.7.0}
+BuildRequires:  %{python_module pytz}
 BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module wheel}
+BuildRequires:  alts
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
-Requires:       python-python-dateutil >= 2.4.0
+Requires:       alts
-Requires:       python-six
+Requires:       python-python-dateutil >= 2.7.0
-Requires(post): update-alternatives
+Requires:       python-pytz
-Requires(preun): update-alternatives
 Recommends:     python-PyICU
 Provides:       %{modname} = %{version}
 Obsoletes:      %{modname} < 0.9.2
@@ -49,30 +56,28 @@ structures to iCalendar, vCard, or (experimentally) hCalendar
 unicode strings.
 
 %prep
-%setup -q -n %{modname}-%{version}
+%autosetup -p1 -n %{modname}-%{version}
 # Fix wrong-file-end-of-line-encoding
 sed -i 's/\r$//' ACKNOWLEDGEMENTS.txt
 
+cp %{SOURCE1} test_files/.
+
 %build
-%python_build
+%pyproject_wheel
 
 %install
-%python_install
+%pyproject_install
 for p in change_tz ics_diff ; do
     %python_clone -a %{buildroot}%{_bindir}/$p
 done
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
 %check
-%python_exec tests.py
+%pyunittest -v tests.py
 
-%post
+%pre
-%python_install_alternative change_tz
+%python_libalternatives_reset_alternative change_tz
-%python_install_alternative ics_diff
+%python_libalternatives_reset_alternative ics_diff
-
-%preun
-%python_uninstall_alternative change_tz
-%python_uninstall_alternative ics_diff
 
 %files %{python_files}
 %license LICENSE-2.0.txt
@@ -80,6 +85,6 @@ done
 %python_alternative %{_bindir}/change_tz
 %python_alternative %{_bindir}/ics_diff
 %{python_sitelib}/%{modname}/
-%{python_sitelib}/%{modname}-%{version}-py*.egg-info
+%{python_sitelib}/%{modname}-%{version}.dist-info
 
 %changelog

radicale-1587.vcf

@@ -0,0 +1,6 @@
+BEGIN:VCARD
+VERSION:3.0
+FN:Given Family
+N:Family;Given;Additional;Prefix;Suffix
+GEO:37.386013;-122.082932
+END:VCARD

vobject-0.9.7.tar.gz

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

vobject-0.9.9.tar.gz

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