Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-demjson for openSUSE:Factory
checked in at 2021-01-20 18:29:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-demjson (Old)
and /work/SRC/openSUSE:Factory/.python-demjson.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-demjson"
Wed Jan 20 18:29:05 2021 rev:5 rq:865002 version:2.2.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-demjson/python-demjson.changes
2020-05-28 09:18:11.953085720 +0200
+++ /work/SRC/openSUSE:Factory/.python-demjson.new.28504/python-demjson.changes
2021-01-20 18:29:24.179626548 +0100
@@ -1,0 +2,7 @@
+Wed Jan 20 09:52:52 UTC 2021 - John Vandenberg <jay...@gmail.com>
+
+- Remove unnecessary bcond tests
+- Replace build dependency 2to3 with modernize, fixing Tumbleweed builds
+- Disable two tests failing on Python 3
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-demjson.spec ++++++
--- /var/tmp/diff_new_pack.AvcJBD/_old 2021-01-20 18:29:25.087627379 +0100
+++ /var/tmp/diff_new_pack.AvcJBD/_new 2021-01-20 18:29:25.087627379 +0100
@@ -17,7 +17,6 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%bcond_without tests
Name: python-demjson
Version: 2.2.4
Release: 0
@@ -26,10 +25,10 @@
Group: Development/Languages/Python
URL: http://deron.meranda.us/python/demjson/
Source:
https://files.pythonhosted.org/packages/source/d/demjson/demjson-%{version}.tar.gz
+BuildRequires: %{python_module modernize}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
-BuildRequires: python3-2to3
Requires(post): update-alternatives
Requires(postun): update-alternatives
BuildArch: noarch
@@ -50,6 +49,9 @@
%prep
%setup -q -n demjson-%{version}
sed -i "1d" demjson.py # Fix non-executable script
+python-modernize -nw test/test_demjson.py
+# These two fail on Python 3.6
+sed -Ei 's/(testEncodeArrayLike|testEncodeStringLike)/_\1/'
test/test_demjson.py
%build
%python_build
@@ -59,16 +61,10 @@
%python_clone -a %{buildroot}%{_bindir}/jsonlint
%python_expand %fdupes %{buildroot}%{$python_sitelib}
-%if %{with tests}3
%check
-%python_expand cp test/test_demjson.py
test/test_demjson_%{$python_bin_suffix}.py
-%if %{have_python3}
-2to3 -nw test/test_demjson_%{python3_bin_suffix}.py
-%endif
%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitelib}
-$python test/test_demjson_%{$python_bin_suffix}.py
+$python test/test_demjson.py
}
-%endif
%post
%python_install_alternative jsonlint
