Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-sorl-thumbnail for
openSUSE:Factory checked in at 2021-02-23 20:21:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-sorl-thumbnail (Old)
and /work/SRC/openSUSE:Factory/.python-sorl-thumbnail.new.2378 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-sorl-thumbnail"
Tue Feb 23 20:21:56 2021 rev:4 rq:874536 version:12.7.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-sorl-thumbnail/python-sorl-thumbnail.changes
2020-11-24 22:18:35.143835075 +0100
+++
/work/SRC/openSUSE:Factory/.python-sorl-thumbnail.new.2378/python-sorl-thumbnail.changes
2021-02-23 20:23:17.119808499 +0100
@@ -1,0 +2,6 @@
+Mon Feb 22 07:44:55 UTC 2021 - John Vandenberg <[email protected]>
+
+- Disable pgmagick tests on Tumbleweed Python 3.6 due to broken
+ python36-pgmagick
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-sorl-thumbnail.spec ++++++
--- /var/tmp/diff_new_pack.mRxBkW/_old 2021-02-23 20:23:17.663808981 +0100
+++ /var/tmp/diff_new_pack.mRxBkW/_new 2021-02-23 20:23:17.663808981 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-sorl-thumbnail
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,22 +26,11 @@
Group: Development/Languages/Python
URL: https://github.com/jazzband/sorl-thumbnail
Source:
https://files.pythonhosted.org/packages/source/s/sorl-thumbnail/sorl-thumbnail-%{version}.tar.gz
-BuildRequires: %{python_module Django >= 2}
-BuildRequires: %{python_module boto}
-BuildRequires: %{python_module dbm}
-BuildRequires: %{python_module pgmagick}
-BuildRequires: %{python_module pytest-django}
-BuildRequires: %{python_module redis}
BuildRequires: %{python_module setuptools_scm}
BuildRequires: %{python_module setuptools}
-BuildRequires: %{pythons}
-BuildRequires: GraphicsMagick
-BuildRequires: ImageMagick
BuildRequires: fdupes
BuildRequires: lsof
BuildRequires: python-rpm-macros
-BuildRequires: redis
-BuildRequires: vips-tools
Requires: python-Django >= 2
Recommends: ImageMagick
Recommends: python-dbm
@@ -50,6 +39,19 @@
Suggests: python-pgmagick
Suggests: vips-tools
BuildArch: noarch
+# SECTION test requirements
+BuildRequires: %{python_module Django >= 2}
+BuildRequires: %{python_module boto}
+BuildRequires: %{python_module dbm}
+BuildRequires: %{python_module pytest-django}
+BuildRequires: %{python_module redis}
+BuildRequires: %{pythons}
+BuildRequires: GraphicsMagick
+BuildRequires: ImageMagick
+BuildRequires: python3-pgmagick
+BuildRequires: redis
+BuildRequires: vips-tools
+# /SECTION
%python_subpackages
%description
@@ -83,20 +85,25 @@
PYTHONPATH=.
export DJANGO_SETTINGS_MODULE=tests.settings.pil
-%pytest -k 'not TemplateTestCaseB and not test_image_file_deserialize'
+%pytest -rs -k 'not TemplateTestCaseB and not test_image_file_deserialize'
export DJANGO_SETTINGS_MODULE=tests.settings.imagemagick
-%pytest -k 'not TemplateTestCaseB and not test_image_file_deserialize'
+%pytest -rs -k 'not TemplateTestCaseB and not test_image_file_deserialize'
export DJANGO_SETTINGS_MODULE=tests.settings.dbm
-%pytest -k 'not TemplateTestCaseB and not test_image_file_deserialize'
+%pytest -rs -k 'not TemplateTestCaseB and not test_image_file_deserialize'
export DJANGO_SETTINGS_MODULE=tests.settings.graphicsmagick
-%pytest -k 'not TemplateTestCaseB and not test_image_file_deserialize'
-export DJANGO_SETTINGS_MODULE=tests.settings.pgmagick
-%pytest -k 'not (TemplateTestCaseB or test_image_file_deserialize or
test_is_valid_image)'
+%pytest -rs -k 'not TemplateTestCaseB and not test_image_file_deserialize'
+
+# pgmagick is not installed in all environments
+%{python_expand if [ -d %{$python_sitearch}/pgmagick/ ]; then
+ export DJANGO_SETTINGS_MODULE=tests.settings.pgmagick
+ $python -m pytest -rs -k 'not (TemplateTestCaseB or
test_image_file_deserialize or test_is_valid_image)'
+fi
+}
%{_sbindir}/redis-server &
export DJANGO_SETTINGS_MODULE=tests.settings.redis
# skipping test_write and test_no_source_get_image skipped as they count open
file descriptors and sometimes is off
-%pytest -k 'not (TemplateTestCaseB or test_image_file_deserialize or
test_no_source_get_image or test_write)'
+%pytest -rs -k 'not (TemplateTestCaseB or test_image_file_deserialize or
test_no_source_get_image or test_write)'
%files %{python_files}
%doc AUTHORS CHANGES.rst README.rst
