Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libbytesize for openSUSE:Factory
checked in at 2023-11-08 22:17:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libbytesize (Old)
and /work/SRC/openSUSE:Factory/.libbytesize.new.17445 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libbytesize"
Wed Nov 8 22:17:04 2023 rev:11 rq:1124055 version:2.10
Changes:
--------
--- /work/SRC/openSUSE:Factory/libbytesize/libbytesize.changes 2023-09-25
19:59:53.851009778 +0200
+++ /work/SRC/openSUSE:Factory/.libbytesize.new.17445/libbytesize.changes
2023-11-08 22:17:19.894299593 +0100
@@ -1,0 +2,6 @@
+Wed Nov 1 20:25:24 UTC 2023 - Jan Engelhardt <jeng...@inai.de>
+
+- Update to release 2.10
+ * remove dependency on python3-six
+
+-------------------------------------------------------------------
Old:
----
libbytesize-2.9.tar.gz
New:
----
libbytesize-2.10.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libbytesize.spec ++++++
--- /var/tmp/diff_new_pack.3rRFBC/_old 2023-11-08 22:17:20.506322077 +0100
+++ /var/tmp/diff_new_pack.3rRFBC/_new 2023-11-08 22:17:20.506322077 +0100
@@ -19,7 +19,7 @@
%define soversion 1
Name: libbytesize
-Version: 2.9
+Version: 2.10
Release: 0
Summary: A library for working with sizes in bytes
License: LGPL-2.1-only
@@ -75,7 +75,6 @@
Summary: Python 3 bindings for LibBytesize
Group: Development/Libraries/Python
Requires: libbytesize%{soversion} = %{version}
-Requires: python3-six
%description -n python3-bytesize
This package contains Python 3 bindings for LibBytesize making the use of
++++++ NEWS.rst ++++++
--- /var/tmp/diff_new_pack.3rRFBC/_old 2023-11-08 22:17:20.534323105 +0100
+++ /var/tmp/diff_new_pack.3rRFBC/_new 2023-11-08 22:17:20.538323252 +0100
@@ -1,3 +1,17 @@
+Libbytesize 2.10
+----------------
+
+Alexandre Detiste (1):
+
+- remove dependency on python3-six and python2 crumbs
+
+Vojtech Trefny (4):
+
+- dist: Fix release number in spec
+- Squashed 'translation-canary/' changes from 4d4e65b..5bb8125
+- ci: Bump actions/checkout from v3 to v4
+- Rename 'master' branch to 'main'
+
Libbytesize 2.9
---------------
++++++ libbytesize-2.9.tar.gz -> libbytesize-2.10.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libbytesize-2.9/configure
new/libbytesize-2.10/configure
--- old/libbytesize-2.9/configure 2023-07-05 16:26:56.000000000 +0200
+++ new/libbytesize-2.10/configure 2023-10-18 12:43:39.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for libbytesize 2.9.
+# Generated by GNU Autoconf 2.71 for libbytesize 2.10.
#
#
# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
@@ -618,8 +618,8 @@
# Identity of this package.
PACKAGE_NAME='libbytesize'
PACKAGE_TARNAME='libbytesize'
-PACKAGE_VERSION='2.9'
-PACKAGE_STRING='libbytesize 2.9'
+PACKAGE_VERSION='2.10'
+PACKAGE_STRING='libbytesize 2.10'
PACKAGE_BUGREPORT=''
PACKAGE_URL='https://github.com/storaged-project/libbytesize'
@@ -1387,7 +1387,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libbytesize 2.9 to adapt to many kinds of systems.
+\`configure' configures libbytesize 2.10 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1458,7 +1458,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libbytesize 2.9:";;
+ short | recursive ) echo "Configuration of libbytesize 2.10:";;
esac
cat <<\_ACEOF
@@ -1587,7 +1587,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libbytesize configure 2.9
+libbytesize configure 2.10
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1805,7 +1805,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libbytesize $as_me 2.9, which was
+It was created by libbytesize $as_me 2.10, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -3110,7 +3110,7 @@
# Define the identity of the package.
PACKAGE='libbytesize'
- VERSION='2.9'
+ VERSION='2.10'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -15285,7 +15285,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libbytesize $as_me 2.9, which was
+This file was extended by libbytesize $as_me 2.10, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15345,7 +15345,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-libbytesize config.status 2.9
+libbytesize config.status 2.10
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libbytesize-2.9/configure.ac
new/libbytesize-2.10/configure.ac
--- old/libbytesize-2.9/configure.ac 2023-07-05 16:26:34.000000000 +0200
+++ new/libbytesize-2.10/configure.ac 2023-10-18 12:43:36.000000000 +0200
@@ -1,6 +1,6 @@
# configure.ac for libbytesize
-AC_INIT([libbytesize], [2.9], [], [],
[https://github.com/storaged-project/libbytesize])
+AC_INIT([libbytesize], [2.10], [], [],
[https://github.com/storaged-project/libbytesize])
# Disable building static libraries.
# This needs to be set before initializing automake
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libbytesize-2.9/dist/libbytesize.spec
new/libbytesize-2.10/dist/libbytesize.spec
--- old/libbytesize-2.9/dist/libbytesize.spec 2023-07-05 16:26:58.000000000
+0200
+++ new/libbytesize-2.10/dist/libbytesize.spec 2023-10-18 12:43:41.000000000
+0200
@@ -16,8 +16,8 @@
%define configure_opts %{?python3_opts} %{?tools_opts}
Name: libbytesize
-Version: 2.9
-Release: 21%{?dist}
+Version: 2.10
+Release: 1%{?dist}
Summary: A library for working with sizes in bytes
License: LGPL-2.1-or-later
URL: https://github.com/storaged-project/libbytesize
@@ -54,7 +54,6 @@
%package -n python3-%{realname}
Summary: Python 3 bindings for libbytesize
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: python3-six
%description -n python3-%{realname}
This package contains Python 3 bindings for libbytesize making the use of
@@ -115,6 +114,13 @@
%endif
%changelog
+* Wed Oct 18 2023 Vojtech Trefny <vtre...@redhat.com> - 2.10-1
+- Rename 'master' branch to 'main' (vtrefny)
+- remove dependency on python3-six and python2 crumbs (alexandre.detiste)
+- ci: Bump actions/checkout from v3 to v4 (vtrefny)
+- Squashed 'translation-canary/' changes from 4d4e65b..5bb8125 (vtrefny)
+- dist: Fix release number in spec (vtrefny)
+
* Wed Jul 05 2023 Vojtech Trefny <vtre...@redhat.com> - 2.9-1
- build: Exit before AC_OUTPUT on error (tbzatek)
- tests: fix locale tests on musl (triallax)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libbytesize-2.9/dist/libbytesize.spec.in
new/libbytesize-2.10/dist/libbytesize.spec.in
--- old/libbytesize-2.9/dist/libbytesize.spec.in 2023-07-05
16:26:34.000000000 +0200
+++ new/libbytesize-2.10/dist/libbytesize.spec.in 2023-10-18
12:43:36.000000000 +0200
@@ -16,8 +16,8 @@
%define configure_opts %{?python3_opts} %{?tools_opts}
Name: libbytesize
-Version: 2.9
-Release: 21%{?dist}
+Version: 2.10
+Release: 1%{?dist}
Summary: A library for working with sizes in bytes
License: LGPL-2.1-or-later
URL: https://github.com/storaged-project/libbytesize
@@ -54,7 +54,6 @@
%package -n python3-%{realname}
Summary: Python 3 bindings for libbytesize
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: python3-six
%description -n python3-%{realname}
This package contains Python 3 bindings for libbytesize making the use of
@@ -115,6 +114,13 @@
%endif
%changelog
+* Wed Oct 18 2023 Vojtech Trefny <vtre...@redhat.com> - 2.10-1
+- Rename 'master' branch to 'main' (vtrefny)
+- remove dependency on python3-six and python2 crumbs (alexandre.detiste)
+- ci: Bump actions/checkout from v3 to v4 (vtrefny)
+- Squashed 'translation-canary/' changes from 4d4e65b..5bb8125 (vtrefny)
+- dist: Fix release number in spec (vtrefny)
+
* Wed Jul 05 2023 Vojtech Trefny <vtre...@redhat.com> - 2.9-1
- build: Exit before AC_OUTPUT on error (tbzatek)
- tests: fix locale tests on musl (triallax)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libbytesize-2.9/docs/libbytesize-docs.xml
new/libbytesize-2.10/docs/libbytesize-docs.xml
--- old/libbytesize-2.9/docs/libbytesize-docs.xml 2023-07-05
16:26:58.000000000 +0200
+++ new/libbytesize-2.10/docs/libbytesize-docs.xml 2023-10-18
12:43:41.000000000 +0200
@@ -8,7 +8,7 @@
<bookinfo>
<title>libbytesize Reference Manual</title>
<releaseinfo>
- for libbytesize 2.9.
+ for libbytesize 2.10.
The latest version of this documentation can be found on-line at
<ulink role="online-location"
url="http://storaged.org/libbytesize";>http://storaged.org/libbytesize</ulink>.
</releaseinfo>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libbytesize-2.9/po/libbytesize.pot
new/libbytesize-2.10/po/libbytesize.pot
--- old/libbytesize-2.9/po/libbytesize.pot 2023-07-05 16:26:34.000000000
+0200
+++ new/libbytesize-2.10/po/libbytesize.pot 2023-10-18 12:43:41.000000000
+0200
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: libbytesize 2.9\n"
+"Project-Id-Version: libbytesize 2.10\n"
"Report-Msgid-Bugs-To: vtre...@redhat.com\n"
-"POT-Creation-Date: 2023-07-05 16:09+0200\n"
+"POT-Creation-Date: 2023-10-18 12:43+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <l...@li.org>\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libbytesize-2.9/src/python/bytesize.py
new/libbytesize-2.10/src/python/bytesize.py
--- old/libbytesize-2.9/src/python/bytesize.py 2023-03-23 13:05:02.000000000
+0100
+++ new/libbytesize-2.10/src/python/bytesize.py 2023-10-16 11:10:12.000000000
+0200
@@ -1,7 +1,6 @@
import ctypes
from ctypes import POINTER, byref
-import six
from decimal import Decimal
import locale
@@ -77,10 +76,7 @@
def get_error(err):
if not err:
return None
- if six.PY3:
- msg = str(err.contents.msg, "utf-8")
- else:
- msg = err.contents.msg
+ msg = str(err.contents.msg, "utf-8")
ex = _error_code_clss[err.contents.code](msg)
c_bytesize.bs_clear_error(byref(err))
raise ex
@@ -97,8 +93,7 @@
@classmethod
def new_from_str(cls, s):
err = POINTER(SizeErrorStruct)()
- if six.PY3:
- s = bytes(s, "utf-8")
+ s = bytes(s, "utf-8")
ret = c_bytesize.bs_size_new_from_str(s, byref(err))
get_error(err)
return ret.contents
@@ -122,10 +117,7 @@
return (ret, sgn.value)
def get_bytes_str(self):
- if six.PY3:
- return str(c_bytesize.bs_size_get_bytes_str(self), "utf-8")
- else:
- return c_bytesize.bs_size_get_bytes_str(self)
+ return str(c_bytesize.bs_size_get_bytes_str(self), "utf-8")
def add(self, sz):
return c_bytesize.bs_size_add(self, sz).contents
@@ -165,8 +157,7 @@
err = POINTER(SizeErrorStruct)()
ret = c_bytesize.bs_size_convert_to(self, unit, byref(err))
get_error(err)
- if six.PY3:
- ret = str(ret, "utf-8")
+ ret = str(ret, "utf-8")
return ret
def div(self, sz):
@@ -189,10 +180,7 @@
return self
def human_readable(self, min_unit, max_places, xlate):
- if six.PY3:
- return str(c_bytesize.bs_size_human_readable(self, min_unit,
max_places, xlate), "utf-8")
- else:
- return c_bytesize.bs_size_human_readable(self, min_unit,
max_places, xlate)
+ return str(c_bytesize.bs_size_human_readable(self, min_unit,
max_places, xlate), "utf-8")
def sgn(self):
return c_bytesize.bs_size_sgn(self)
@@ -201,16 +189,14 @@
err = POINTER(SizeErrorStruct)()
ret = c_bytesize.bs_size_true_div(self, sz, byref(err))
get_error(err)
- if six.PY3:
- ret = str(ret, "utf-8")
+ ret = str(ret, "utf-8")
return ret
def true_div_int(self, div):
err = POINTER(SizeErrorStruct)()
ret = c_bytesize.bs_size_true_div_int(self, div, byref(err))
get_error(err)
- if six.PY3:
- ret = str(ret, "utf-8")
+ ret = str(ret, "utf-8")
return ret
def mod(self, sz):
@@ -221,16 +207,14 @@
def mul_float_str(self, fl_str):
err = POINTER(SizeErrorStruct)()
- if six.PY3:
- fl_str = bytes(fl_str, "utf-8")
+ fl_str = bytes(fl_str, "utf-8")
ret = c_bytesize.bs_size_mul_float_str(self, fl_str, byref(err))
get_error(err)
return ret.contents
def grow_mul_float_str(self, fl_str):
err = POINTER(SizeErrorStruct)()
- if six.PY3:
- fl_str = bytes(fl_str, "utf-8")
+ fl_str = bytes(fl_str, "utf-8")
c_bytesize.bs_size_grow_mul_float_str(self, fl_str, byref(err))
get_error(err)
return self
@@ -347,9 +331,9 @@
def __init__(self, spec=None):
self._c_size = None
try:
- if isinstance(spec, six.string_types):
+ if isinstance(spec, str):
self._c_size = SizeStruct.new_from_str(spec)
- elif isinstance(spec, six.integer_types):
+ elif isinstance(spec, int):
abs_val = abs(spec)
if abs_val == spec:
sgn = 1
@@ -382,7 +366,7 @@
return int(self._c_size.get_bytes_str())
def convert_to(self, unit):
- if isinstance(unit, six.string_types):
+ if isinstance(unit, str):
real_unit = unit_strs.get(unit)
if real_unit is None:
raise ValueError("Invalid unit specification: '%s'" % unit)
@@ -393,12 +377,12 @@
return _str_to_decimal(ret)
def human_readable(self, min_unit=B, max_places=2, xlate=True):
- if isinstance(min_unit, six.string_types):
+ if isinstance(min_unit, str):
if min_unit in unit_strs.keys():
min_unit = unit_strs[min_unit]
else:
raise ValueError("Invalid unit specification: '%s'" % min_unit)
- if not isinstance(max_places, six.integer_types):
+ if not isinstance(max_places, int):
raise ValueError("max_places has to be an integer number")
return self._c_size.human_readable(min_unit, max_places, xlate)
@@ -418,7 +402,7 @@
raise ValueError("Invalid size specification: '%s'" % round_to)
def cmp(self, other, abs_vals=False):
- if isinstance(other, six.integer_types):
+ if isinstance(other, int):
if (other < 0 and abs_vals):
other = abs(other)
if 0 <= other <= MAXUINT64:
@@ -467,7 +451,7 @@
@neutralize_none_operand
def __add__(self, other):
- if isinstance(other, six.integer_types):
+ if isinstance(other, int):
if other <= MAXUINT64:
return Size(self._c_size.add_bytes(other))
else:
@@ -483,7 +467,7 @@
@neutralize_none_operand
def __sub__(self, other):
- if isinstance(other, six.integer_types):
+ if isinstance(other, int):
if other <= MAXUINT64:
return Size(self._c_size.sub_bytes(other))
else:
@@ -503,7 +487,7 @@
def __mul__(self, other):
if isinstance(other, (Size, SizeStruct)):
raise ValueError("Cannot multiply Size by Size. It just doesn't
make sense.")
- elif isinstance(other, (Decimal, float)) or (isinstance(other,
six.integer_types)
+ elif isinstance(other, (Decimal, float)) or (isinstance(other, int)
and other > MAXUINT64 or
other < 0):
return Size(self._c_size.mul_float_str(str(other)))
else:
@@ -512,25 +496,8 @@
__rmul__ = __mul__
@neutralize_none_operand
- def __div__(self, other):
- if not six.PY2:
- raise AttributeError
-
- if isinstance(other, six.integer_types):
- if other <= MAXUINT64:
- return Size(self._c_size.div_int(other))
- else:
- other = SizeStruct.new_from_str(str(other))
- return Size(_str_to_decimal(self._c_size.true_div(other)))
- elif isinstance(other, (Decimal, float)):
- other = SizeStruct.new_from_str(str(other))
- return Size(self._c_size.true_div(other))
- else:
- return _str_to_decimal(self._c_size.true_div(other._c_size))
-
- @neutralize_none_operand
def __truediv__(self, other):
- if isinstance(other, six.integer_types):
+ if isinstance(other, int):
if other <= MAXUINT64:
return Size(self._c_size.true_div_int(other))
else:
@@ -558,7 +525,7 @@
def __floordiv__(self, other):
if isinstance(other, (Decimal, float)):
return
Size(self._c_size.mul_float_str(str(Decimal(1)/Decimal(other))))
- elif isinstance(other, six.integer_types):
+ elif isinstance(other, int):
if other <= MAXUINT64:
return self._safe_floordiv_int(other)
else:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libbytesize-2.9/tools/bs_calc.py
new/libbytesize-2.10/tools/bs_calc.py
--- old/libbytesize-2.9/tools/bs_calc.py 2023-07-05 16:26:58.000000000
+0200
+++ new/libbytesize-2.10/tools/bs_calc.py 2023-10-18 12:43:41.000000000
+0200
@@ -93,7 +93,7 @@
def _main():
ap = ArgumentParser(epilog="Report issues at
https://github.com/storaged-project/libbytesize/issues";)
- ap.add_argument("--version", action="version", version="2.9")
+ ap.add_argument("--version", action="version", version="2.10")
ap.add_argument("-u", "--unit", choices=(b_units + d_units),
help="Unit to show the result in")
ap.add_argument("-b", "-B", dest="unit", const="B",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libbytesize-2.9/tools/bscalc.man
new/libbytesize-2.10/tools/bscalc.man
--- old/libbytesize-2.9/tools/bscalc.man 2023-07-05 16:26:34.000000000
+0200
+++ new/libbytesize-2.10/tools/bscalc.man 2023-10-18 12:46:39.000000000
+0200
@@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
-.TH BSCALC "1" "July 2023" "bscalc 2.9" "User Commands"
+.TH BSCALC "1" "October 2023" "bscalc 2.10" "User Commands"
.SH NAME
-bscalc \- manual page for bscalc 2.9
+bscalc \- manual page for bscalc 2.10
.SH DESCRIPTION
usage: bscalc [\-h] [\-\-version]
.IP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libbytesize-2.9/translation-canary/translation_canary/translatable/__init__.py
new/libbytesize-2.10/translation-canary/translation_canary/translatable/__init__.py
---
old/libbytesize-2.9/translation-canary/translation_canary/translatable/__init__.py
2023-03-23 13:05:02.000000000 +0100
+++
new/libbytesize-2.10/translation-canary/translation_canary/translatable/__init__.py
2023-10-02 15:25:06.000000000 +0200
@@ -36,6 +36,8 @@
# Gather tests from this directory
import pkgutil
+import importlib
+
_tests = []
for finder, mod_name, _ispkg in pkgutil.iter_modules(__path__):
# Skip __main__
@@ -43,7 +45,8 @@
continue
# Load the module
- module = finder.find_module(mod_name).load_module()
+ full_name = "{}.{}".format(__name__, mod_name)
+ module = importlib.import_module(full_name)
# Look for attributes that start with 'test_' and add them to the test list
for attrname, attr in module.__dict__.items():
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libbytesize-2.9/translation-canary/translation_canary/translated/__init__.py
new/libbytesize-2.10/translation-canary/translation_canary/translated/__init__.py
---
old/libbytesize-2.9/translation-canary/translation_canary/translated/__init__.py
2023-03-23 13:05:02.000000000 +0100
+++
new/libbytesize-2.10/translation-canary/translation_canary/translated/__init__.py
2023-10-02 15:25:06.000000000 +0200
@@ -34,13 +34,16 @@
# Gather tests from this directory
import pkgutil
+import importlib
+
for finder, mod_name, _ispkg in pkgutil.iter_modules(__path__):
# Skip __main__
if mod_name == "__main__":
continue
# Load the module
- module = finder.find_module(mod_name).load_module(mod_name)
+ full_name = "{}.{}".format(__name__, mod_name)
+ module = importlib.import_module(full_name)
# Look for attributes that start with 'test_' and add them to the test list
for attrname, attr in module.__dict__.items():
