Accepting request 678250 from devel:tools:scm
- Update to 5.3 + Add support for AMQP via fedora-messaging + Improve filtering and searching through issues and PRs + Add support for forcing highlight types based on file extensions + Fix naming rules for labels/tags + Fix support for repoSpanner Git storage backend + CVE-2019-7628: Do not leak partial API keys in key expiration emails (boo#1124762) - Drop patches that are part of this release + 0001-Allow-using-Pagure-with-python-redis-3.0.0.patch + 0002-Fix-Markdown-usage-to-work-with-Markdown-3.0.patch OBS-URL: https://build.opensuse.org/request/show/678250 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pagure?expand=0&rev=6
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
0534c82fac
@ -1,32 +0,0 @@
|
|||||||
From 2b1a46a3b97af49938d4d4f0d08354e5950aaf86 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Neal Gompa <ngompa13@gmail.com>
|
|
||||||
Date: Wed, 9 Jan 2019 09:37:04 -0500
|
|
||||||
Subject: [PATCH 1/2] Allow using Pagure with python-redis >= 3.0.0
|
|
||||||
|
|
||||||
There doesn't seem to be any issues when running the test suite locally
|
|
||||||
with python-redis >= 3.0.0, so let's allow it again.
|
|
||||||
|
|
||||||
Fixes: https://pagure.io/pagure/issue/4183
|
|
||||||
|
|
||||||
Signed-off-by: Neal Gompa <ngompa13@gmail.com>
|
|
||||||
---
|
|
||||||
requirements.txt | 3 +--
|
|
||||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/requirements.txt b/requirements.txt
|
|
||||||
index 15475f68..996fb063 100644
|
|
||||||
--- a/requirements.txt
|
|
||||||
+++ b/requirements.txt
|
|
||||||
@@ -23,8 +23,7 @@ python-openid;python_version<="2.7"
|
|
||||||
python3-openid;python_version>="3.0"
|
|
||||||
python-openid-cla
|
|
||||||
python-openid-teams
|
|
||||||
-# The 3.0.0 release of redis fails to run the tests in jenkins for us :(
|
|
||||||
-redis<3.0.0
|
|
||||||
+redis
|
|
||||||
requests
|
|
||||||
six
|
|
||||||
sqlalchemy >= 0.8
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
||||||
@ -1,67 +0,0 @@
|
|||||||
From f5f4b297b2cee938e7e13064c7e55ef7c6426bfd Mon Sep 17 00:00:00 2001
|
|
||||||
From: Neal Gompa <ngompa13@gmail.com>
|
|
||||||
Date: Wed, 9 Jan 2019 08:39:41 -0500
|
|
||||||
Subject: [PATCH 2/2] Fix Markdown usage to work with Markdown 3.0+
|
|
||||||
|
|
||||||
Markdown 3.0 and later no longer considers the emphasis modifiers
|
|
||||||
to be an extension, and has them always enabled. We still enable
|
|
||||||
the 'smart_strong' extension when we detect older versions of
|
|
||||||
Markdown to retain backward compatibility.
|
|
||||||
|
|
||||||
Signed-off-by: Neal Gompa <ngompa13@gmail.com>
|
|
||||||
---
|
|
||||||
pagure/lib/query.py | 11 ++++++++++-
|
|
||||||
tests/test_pagure_lib.py | 7 +++++--
|
|
||||||
2 files changed, 15 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/pagure/lib/query.py b/pagure/lib/query.py
|
|
||||||
index 86bda508..ae561196 100644
|
|
||||||
--- a/pagure/lib/query.py
|
|
||||||
+++ b/pagure/lib/query.py
|
|
||||||
@@ -4237,7 +4237,6 @@ def text2markdown(text, extended=True, readme=False):
|
|
||||||
"markdown.extensions.def_list",
|
|
||||||
"markdown.extensions.fenced_code",
|
|
||||||
"markdown.extensions.tables",
|
|
||||||
- "markdown.extensions.smart_strong",
|
|
||||||
# All of the above are the .extra extensions
|
|
||||||
# w/o the "attribute lists" one
|
|
||||||
"markdown.extensions.admonition",
|
|
||||||
@@ -4245,6 +4244,16 @@ def text2markdown(text, extended=True, readme=False):
|
|
||||||
"markdown.extensions.sane_lists",
|
|
||||||
"markdown.extensions.toc",
|
|
||||||
]
|
|
||||||
+
|
|
||||||
+ # smart_strong is not an extension anymore in markdown 3.0+
|
|
||||||
+ try:
|
|
||||||
+ md_version = markdown.__version__.version_info
|
|
||||||
+ except AttributeError: # pragma: no cover
|
|
||||||
+ md_version = markdown.__version_info__
|
|
||||||
+
|
|
||||||
+ if md_version < (3, 0, 0):
|
|
||||||
+ extensions.append("markdown.extensions.smart_strong")
|
|
||||||
+
|
|
||||||
# Some extensions are enabled for READMEs and disabled otherwise
|
|
||||||
if readme:
|
|
||||||
extensions.extend(
|
|
||||||
diff --git a/tests/test_pagure_lib.py b/tests/test_pagure_lib.py
|
|
||||||
index 50ddab1a..cbb81adc 100644
|
|
||||||
--- a/tests/test_pagure_lib.py
|
|
||||||
+++ b/tests/test_pagure_lib.py
|
|
||||||
@@ -5018,9 +5018,12 @@ class PagureLibtests(tests.Modeltests):
|
|
||||||
|
|
||||||
def test_text2markdown_table(self):
|
|
||||||
""" Test the text2markdown function with a markdown table. """
|
|
||||||
- v = tuple([int(c) for c in markdown.version.split('.')])
|
|
||||||
+ try:
|
|
||||||
+ md_version = markdown.__version__.version_info
|
|
||||||
+ except AttributeError:
|
|
||||||
+ md_version = markdown.__version_info__
|
|
||||||
|
|
||||||
- if v < (2, 6, 7):
|
|
||||||
+ if md_version < (2, 6, 7):
|
|
||||||
raise unittest.case.SkipTest(
|
|
||||||
'Skipping on old markdown that do not strip the orientation row'
|
|
||||||
)
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:4f0bafe2e69573feb1b2513972e0701bde400ff82bb7bbeda3100de8e3373fed
|
|
||||||
size 21818250
|
|
||||||
3
pagure-5.3.tar.gz
Normal file
3
pagure-5.3.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:593c1885d3d9083f5506a484b6a8d4beb0127929f6a19cccc263888bc4738e73
|
||||||
|
size 21845839
|
||||||
@ -1,3 +1,17 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Feb 22 15:16:39 UTC 2019 - Neal Gompa <ngompa13@gmail.com>
|
||||||
|
|
||||||
|
- Update to 5.3
|
||||||
|
+ Add support for AMQP via fedora-messaging
|
||||||
|
+ Improve filtering and searching through issues and PRs
|
||||||
|
+ Add support for forcing highlight types based on file extensions
|
||||||
|
+ Fix naming rules for labels/tags
|
||||||
|
+ Fix support for repoSpanner Git storage backend
|
||||||
|
+ CVE-2019-7628: Do not leak partial API keys in key expiration emails (boo#1124762)
|
||||||
|
- Drop patches that are part of this release
|
||||||
|
+ 0001-Allow-using-Pagure-with-python-redis-3.0.0.patch
|
||||||
|
+ 0002-Fix-Markdown-usage-to-work-with-Markdown-3.0.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sat Jan 12 23:44:52 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
|
Sat Jan 12 23:44:52 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
|
||||||
|
|
||||||
|
|||||||
10
pagure.spec
10
pagure.spec
@ -23,7 +23,7 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: pagure
|
Name: pagure
|
||||||
Version: 5.2
|
Version: 5.3
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: A git-centered forge
|
Summary: A git-centered forge
|
||||||
Group: Development/Tools/Version Control
|
Group: Development/Tools/Version Control
|
||||||
@ -40,14 +40,6 @@ Source1: https://raw.githubusercontent.com/fedora-infra/python-fedora
|
|||||||
# SUSE-specific README providing a quickstart guide
|
# SUSE-specific README providing a quickstart guide
|
||||||
Source10: pagure-README.SUSE
|
Source10: pagure-README.SUSE
|
||||||
|
|
||||||
# Backports from upstream
|
|
||||||
# Allow Pagure to work with python-redis >= 3.0.0
|
|
||||||
# From: https://pagure.io/pagure/c/2b1a46a3b97af49938d4d4f0d08354e5950aaf86
|
|
||||||
Patch0001: 0001-Allow-using-Pagure-with-python-redis-3.0.0.patch
|
|
||||||
# Fix Pagure to work with Markdown >= 3.0
|
|
||||||
# From: https://pagure.io/pagure/c/f5f4b297b2cee938e7e13064c7e55ef7c6426bfd
|
|
||||||
Patch0002: 0002-Fix-Markdown-usage-to-work-with-Markdown-3.0.patch
|
|
||||||
|
|
||||||
# SUSE-specific fixes
|
# SUSE-specific fixes
|
||||||
# Change the defaults in the example config to match packaging
|
# Change the defaults in the example config to match packaging
|
||||||
Patch1000: pagure-5.0-default-example-cfg.patch
|
Patch1000: pagure-5.0-default-example-cfg.patch
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user