Hello community, here is the log from the commit of package python-django-pyscss for openSUSE:Factory checked in at 2020-04-28 22:31:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-django-pyscss (Old) and /work/SRC/openSUSE:Factory/.python-django-pyscss.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-django-pyscss" Tue Apr 28 22:31:59 2020 rev:4 rq:798612 version:2.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-django-pyscss/python-django-pyscss.changes 2020-04-23 18:37:36.080910028 +0200 +++ /work/SRC/openSUSE:Factory/.python-django-pyscss.new.2738/python-django-pyscss.changes 2020-04-28 22:32:27.573763742 +0200 @@ -1,0 +2,11 @@ +Tue Apr 28 09:53:23 UTC 2020 - Tomáš Chvátal <tchva...@suse.com> + +- Add patch django3.patch to fix building with Django 3.x + +------------------------------------------------------------------- +Tue Apr 28 09:48:44 UTC 2020 - Tomáš Chvátal <tchva...@suse.com> + +- Fix the logic in patch to require mock only on python2: + * crashing_templates.patch + +------------------------------------------------------------------- New: ---- django3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-django-pyscss.spec ++++++ --- /var/tmp/diff_new_pack.1ZTb4w/_old 2020-04-28 22:32:28.489765451 +0200 +++ /var/tmp/diff_new_pack.1ZTb4w/_new 2020-04-28 22:32:28.489765451 +0200 @@ -32,17 +32,20 @@ Patch4: FTBFS-fix-unit-tests.patch Patch5: django-2.0.patch Patch6: crashing_templates.patch +Patch7: django3.patch BuildRequires: %{python_module Django >= 1.10} BuildRequires: %{python_module Pillow} BuildRequires: %{python_module django-compressor >= 1.3} -BuildRequires: %{python_module mock} BuildRequires: %{python_module pyScss >= 1.2.0} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module six} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-Django >= 1.10 Requires: python-pyScss >= 1.3.4 +Requires: python-six %if %{with python2} +BuildRequires: python-mock BuildRequires: python-pathlib %endif %ifpython2 ++++++ crashing_templates.patch ++++++ --- /var/tmp/diff_new_pack.1ZTb4w/_old 2020-04-28 22:32:28.517765503 +0200 +++ /var/tmp/diff_new_pack.1ZTb4w/_new 2020-04-28 22:32:28.521765511 +0200 @@ -73,7 +73,7 @@ - 'mock', ] -+if sys.version_info[0] >= 3: ++if sys.version_info[0] < 3: + tests_require.append('mock') version = '2.0.2' ++++++ django3.patch ++++++ Index: django-pyscss-2.0.2/django_pyscss/compiler.py =================================================================== --- django-pyscss-2.0.2.orig/django_pyscss/compiler.py +++ django-pyscss-2.0.2/django_pyscss/compiler.py @@ -3,7 +3,7 @@ from __future__ import absolute_import import os from pathlib import PurePath -from django.utils.six.moves import StringIO +from six.moves import StringIO from django.conf import settings from django.contrib.staticfiles.storage import staticfiles_storage Index: django-pyscss-2.0.2/setup.py =================================================================== --- django-pyscss-2.0.2.orig/setup.py +++ django-pyscss-2.0.2/setup.py @@ -13,6 +13,7 @@ def read(fname): install_requires = [ 'Django>=1.4', 'pyScss>=1.3.4', + 'six', ] try: Index: django-pyscss-2.0.2/tests/test_compressor.py =================================================================== --- django-pyscss-2.0.2.orig/tests/test_compressor.py +++ django-pyscss-2.0.2/tests/test_compressor.py @@ -4,14 +4,14 @@ from tests.utils import CollectStaticTes APP2_LINK_TAG = """ -{% load staticfiles compress %} +{% load static compress %} {% compress css %} <link rel="stylesheet" type="text/x-scss" href="{% static 'css/app2.scss' %}"> {% endcompress %} """ IMPORT_APP2_STYLE_TAG = """ -{% load staticfiles compress %} +{% load static compress %} {% compress css %} <style type="text/x-scss"> @import "css/app2.scss";