From 23b3e0c2c5edd8173a670388f679f529a9b27d6783fdd322ce7dbd19a8d5cedd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 14 Mar 2020 09:45:36 +0000 Subject: [PATCH 1/3] - Add patch to fix test fixtures with new pygments: * pygments25.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-readme_renderer?expand=0&rev=7 --- pygments25.patch | 25 +++++++++++++++++++++++++ python-readme_renderer.changes | 6 ++++++ python-readme_renderer.spec | 12 +++++------- 3 files changed, 36 insertions(+), 7 deletions(-) create mode 100644 pygments25.patch diff --git a/pygments25.patch b/pygments25.patch new file mode 100644 index 0000000..7e9bba3 --- /dev/null +++ b/pygments25.patch @@ -0,0 +1,25 @@ +Index: readme_renderer-24.0/tests/fixtures/test_CommonMark_008.html +=================================================================== +--- readme_renderer-24.0.orig/tests/fixtures/test_CommonMark_008.html ++++ readme_renderer-24.0/tests/fixtures/test_CommonMark_008.html +@@ -1,6 +1,6 @@ +

Here is some Python code for a Dog:

+ 
class Dog(Animal):
+-    def __init__(self, name):
++    def __init__(self, name):
+         self.name = name
+ 
+     def make_sound(self):
+Index: readme_renderer-24.0/tests/fixtures/test_rst_008.html
+===================================================================
+--- readme_renderer-24.0.orig/tests/fixtures/test_rst_008.html
++++ readme_renderer-24.0/tests/fixtures/test_rst_008.html
+@@ -4,7 +4,7 @@
+         self.name = name
+ 
+     def make_sound(self):
+-        print('Ruff!')
++        print('Ruff!')
+ 
+ dog = Dog('Fido')
+
diff --git a/python-readme_renderer.changes b/python-readme_renderer.changes index 84263b3..74d567c 100644 --- a/python-readme_renderer.changes +++ b/python-readme_renderer.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Mar 14 09:44:32 UTC 2020 - Tomáš Chvátal + +- Add patch to fix test fixtures with new pygments: + * pygments25.patch + ------------------------------------------------------------------- Sun Mar 3 09:43:05 UTC 2019 - John Vandenberg diff --git a/python-readme_renderer.spec b/python-readme_renderer.spec index a590867..8c41dcc 100644 --- a/python-readme_renderer.spec +++ b/python-readme_renderer.spec @@ -1,7 +1,7 @@ # # spec file for package python-readme_renderer # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,9 +22,9 @@ Version: 24.0 Release: 0 Summary: A library for rendering "readme" descriptions License: Apache-2.0 -Group: Development/Languages/Python -Url: https://github.com/pypa/readme_renderer +URL: https://github.com/pypa/readme_renderer Source: https://files.pythonhosted.org/packages/source/r/readme_renderer/readme_renderer-%{version}.tar.gz +Patch0: pygments25.patch BuildRequires: %{python_module Pygments} BuildRequires: %{python_module bleach >= 3.0.0} BuildRequires: %{python_module check-manifest} @@ -43,7 +43,6 @@ Requires: python-docutils >= 0.13.1 Requires: python-six Recommends: python-cmarkgfm >= 0.2.0 BuildArch: noarch - %python_subpackages %description @@ -53,6 +52,7 @@ long_description for packages. %prep %setup -q -n readme_renderer-%{version} +%patch0 -p1 %build %python_build @@ -63,9 +63,7 @@ long_description for packages. %check export LANG=en_US.UTF-8 -%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitelib} -py.test-%{$python_bin_suffix} -} +%pytest %files %{python_files} %license LICENSE From c711a5dc26e7727561153e316d62f48329bcfff2d86512aaf69a585e9e3d00af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sun, 15 Mar 2020 07:09:39 +0000 Subject: [PATCH 2/3] - Update to 25.0: * Fix testsuite to work with new pygments - Remove merged patch pygments25.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-readme_renderer?expand=0&rev=8 --- pygments25.patch | 25 ------------------------- python-readme_renderer.changes | 7 +++++++ python-readme_renderer.spec | 6 ++---- readme_renderer-24.0.tar.gz | 3 --- readme_renderer-25.0.tar.gz | 3 +++ 5 files changed, 12 insertions(+), 32 deletions(-) delete mode 100644 pygments25.patch delete mode 100644 readme_renderer-24.0.tar.gz create mode 100644 readme_renderer-25.0.tar.gz diff --git a/pygments25.patch b/pygments25.patch deleted file mode 100644 index 7e9bba3..0000000 --- a/pygments25.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: readme_renderer-24.0/tests/fixtures/test_CommonMark_008.html -=================================================================== ---- readme_renderer-24.0.orig/tests/fixtures/test_CommonMark_008.html -+++ readme_renderer-24.0/tests/fixtures/test_CommonMark_008.html -@@ -1,6 +1,6 @@ -

Here is some Python code for a Dog:

- 
class Dog(Animal):
--    def __init__(self, name):
-+    def __init__(self, name):
-         self.name = name
- 
-     def make_sound(self):
-Index: readme_renderer-24.0/tests/fixtures/test_rst_008.html
-===================================================================
---- readme_renderer-24.0.orig/tests/fixtures/test_rst_008.html
-+++ readme_renderer-24.0/tests/fixtures/test_rst_008.html
-@@ -4,7 +4,7 @@
-         self.name = name
- 
-     def make_sound(self):
--        print('Ruff!')
-+        print('Ruff!')
- 
- dog = Dog('Fido')
-
diff --git a/python-readme_renderer.changes b/python-readme_renderer.changes index 74d567c..34f9202 100644 --- a/python-readme_renderer.changes +++ b/python-readme_renderer.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Mar 15 07:07:09 UTC 2020 - Tomáš Chvátal + +- Update to 25.0: + * Fix testsuite to work with new pygments +- Remove merged patch pygments25.patch + ------------------------------------------------------------------- Sat Mar 14 09:44:32 UTC 2020 - Tomáš Chvátal diff --git a/python-readme_renderer.spec b/python-readme_renderer.spec index 8c41dcc..b0f22cf 100644 --- a/python-readme_renderer.spec +++ b/python-readme_renderer.spec @@ -18,14 +18,13 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-readme_renderer -Version: 24.0 +Version: 25.0 Release: 0 Summary: A library for rendering "readme" descriptions License: Apache-2.0 URL: https://github.com/pypa/readme_renderer Source: https://files.pythonhosted.org/packages/source/r/readme_renderer/readme_renderer-%{version}.tar.gz -Patch0: pygments25.patch -BuildRequires: %{python_module Pygments} +BuildRequires: %{python_module Pygments >= 2.5.2} BuildRequires: %{python_module bleach >= 3.0.0} BuildRequires: %{python_module check-manifest} BuildRequires: %{python_module cmarkgfm >= 0.2.0} @@ -52,7 +51,6 @@ long_description for packages. %prep %setup -q -n readme_renderer-%{version} -%patch0 -p1 %build %python_build diff --git a/readme_renderer-24.0.tar.gz b/readme_renderer-24.0.tar.gz deleted file mode 100644 index d944689..0000000 --- a/readme_renderer-24.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bb16f55b259f27f75f640acf5e00cf897845a8b3e4731b5c1a436e4b8529202f -size 24038 diff --git a/readme_renderer-25.0.tar.gz b/readme_renderer-25.0.tar.gz new file mode 100644 index 0000000..ebcfe11 --- /dev/null +++ b/readme_renderer-25.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e67d64242f0174a63c3b727801a2fff4c1f38ebe5d71d95ff7ece081945a6cd4 +size 24116 From 16b7901b174cc4b188c375e8c1afde203e3216f20a980df3c3b8f29f90bd9c40 Mon Sep 17 00:00:00 2001 From: Antonio Larrosa Date: Tue, 24 Mar 2020 17:22:28 +0000 Subject: [PATCH 3/3] Accepting request 787867 from home:alarrosa:branches:devel:languages:python - Do not build the python2 package since Pygments, which is required only builds a python3 package. OBS-URL: https://build.opensuse.org/request/show/787867 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-readme_renderer?expand=0&rev=9 --- python-readme_renderer.changes | 6 ++++++ python-readme_renderer.spec | 1 + 2 files changed, 7 insertions(+) diff --git a/python-readme_renderer.changes b/python-readme_renderer.changes index 34f9202..a71485b 100644 --- a/python-readme_renderer.changes +++ b/python-readme_renderer.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 24 16:03:10 UTC 2020 - Antonio Larrosa + +- Do not build the python2 package since Pygments, which is required + only builds a python3 package. + ------------------------------------------------------------------- Sun Mar 15 07:07:09 UTC 2020 - Tomáš Chvátal diff --git a/python-readme_renderer.spec b/python-readme_renderer.spec index b0f22cf..3905b01 100644 --- a/python-readme_renderer.spec +++ b/python-readme_renderer.spec @@ -16,6 +16,7 @@ # +%define skip_python2 1 %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-readme_renderer Version: 25.0