Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-qstylizer for
openSUSE:Factory checked in at 2021-04-21 20:59:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-qstylizer (Old)
and /work/SRC/openSUSE:Factory/.python-qstylizer.new.12324 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-qstylizer"
Wed Apr 21 20:59:53 2021 rev:2 rq:886910 version:0.1.10
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-qstylizer/python-qstylizer.changes
2021-04-10 15:28:47.458478233 +0200
+++
/work/SRC/openSUSE:Factory/.python-qstylizer.new.12324/python-qstylizer.changes
2021-04-21 21:00:12.742278170 +0200
@@ -1,0 +2,6 @@
+Mon Apr 19 16:22:54 UTC 2021 - Ben Greiner <c...@bnavigator.de>
+
+- refresh qstylizer-tinycss2.patch gh#blambright/qstylizer#10
+ because the egg-info/requires.txt is checked upon start by spyder
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-qstylizer.spec ++++++
--- /var/tmp/diff_new_pack.Q2pXod/_old 2021-04-21 21:00:13.254278977 +0200
+++ /var/tmp/diff_new_pack.Q2pXod/_new 2021-04-21 21:00:13.258278983 +0200
@@ -26,16 +26,16 @@
# no sdist on PyPI
Source:
%{url}/archive/refs/tags/%{version}.tar.gz#/qstylizer-%{version}-gh.tar.gz
# PATCH-FIX-UPSTREAM qstylizer-tinycss2.patch -- gh#blambright/qstylizer#10
-Patch0: qstylizer-tinycss2.patch
-BuildRequires: python-rpm-macros
-BuildRequires: %{python_module setuptools}
+Patch0:
https://github.com/blambright/qstylizer/pull/10.patch#/qstylizer-tinycss2.patch
BuildRequires: %{python_module pbr}
+BuildRequires: %{python_module setuptools}
+BuildRequires: python-rpm-macros
# SECTION test requirements
BuildRequires: %{python_module inflection > 0.3.0}
-BuildRequires: %{python_module tinycss2}
-BuildRequires: %{python_module pytest-runner >= 2.7}
BuildRequires: %{python_module pytest >= 4}
BuildRequires: %{python_module pytest-mock >= 1.6}
+BuildRequires: %{python_module pytest-runner >= 2.7}
+BuildRequires: %{python_module tinycss2}
#BuildRequires: %%{python_module pytest-catchlog >= 1}
BuildRequires: %{python_module pytest-xdist >= 1.1}
# /SECTION
++++++ qstylizer-tinycss2.patch ++++++
--- /var/tmp/diff_new_pack.Q2pXod/_old 2021-04-21 21:00:13.282279020 +0200
+++ /var/tmp/diff_new_pack.Q2pXod/_new 2021-04-21 21:00:13.286279027 +0200
@@ -1,16 +1,26 @@
-Index: qstylizer-0.1.10/qstylizer/parser.py
-===================================================================
---- qstylizer-0.1.10.orig/qstylizer/parser.py
-+++ qstylizer-0.1.10/qstylizer/parser.py
-@@ -1,32 +1,39 @@
+From 9228896f335cd6519a8abab70c8c0e38b6a28267 Mon Sep 17 00:00:00 2001
+From: Ben Greiner <c...@bnavigator.de>
+Date: Thu, 8 Apr 2021 21:15:03 +0200
+Subject: [PATCH] use tinycss2 instead of tinycss
+
+---
+ qstylizer/parser.py | 45 ++++++++++++++++++++++++++++-----------------
+ requirements.txt | 2 +-
+ 2 files changed, 29 insertions(+), 18 deletions(-)
+
+diff --git a/qstylizer/parser.py b/qstylizer/parser.py
+index 71864af..635e01e 100644
+--- a/qstylizer/parser.py
++++ b/qstylizer/parser.py
+@@ -1,32 +1,43 @@
# coding: utf-8
-from tinycss.css21 import CSS21Parser
--
- import qstylizer.style
+import tinycss2
--
+ import qstylizer.style
+
+
-class QSSParser(CSS21Parser):
- def parse_declaration(self, tokens):
- declaration = super(QSSParser, self).parse_declaration(tokens)
@@ -39,8 +49,9 @@
"""
- parsed_stylesheet = QSSParser().parse_stylesheet(stylesheet)
-+ parsed_stylesheet = tinycss2.parse_stylesheet(stylesheet,
-+ skip_comments=True, skip_whitespace=True)
++ parsed_stylesheet = tinycss2.parse_stylesheet(
++ stylesheet, skip_comments=True, skip_whitespace=True
++ )
css = qstylizer.style.StyleSheet()
- for rule in parsed_stylesheet.rules:
- selector = rule.selector.as_css()
@@ -49,15 +60,24 @@
- value = declaration.value.as_css()
- css[selector][prop] = value
+ for node in parsed_stylesheet:
-+ if node.type == 'error':
++ if node.type == "error":
+ raise ValueError("Cannot parse Stylesheet: " + node.message)
+ selector =
tinycss2.serialize(_strip_whitespace_recursive(node.prelude))
-+ declaration_list = tinycss2.parse_declaration_list(node.content,
-+ skip_comments=True, skip_whitespace=True)
++ declaration_list = tinycss2.parse_declaration_list(
++ node.content, skip_comments=True, skip_whitespace=True
++ )
+ for declaration in declaration_list:
-+ if declaration.type == 'declaration':
++ if declaration.type == "declaration":
+ prop = declaration.name.strip()
+ v = _strip_whitespace_recursive(declaration.value)
+ value = tinycss2.serialize(v)
+ css[selector][prop] = value
return css
+diff --git a/requirements.txt b/requirements.txt
+index 46f1d65..d56a026 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -1,2 +1,2 @@
+-tinycss >= 0.4, < 1
++tinycss2 >= 0.5, < 2
+ inflection > 0.3.0, < 1
