Try to fix a FTBFS with Python 3.7 (rhbz#1583678).

This commit is contained in:
Thomas Moschny 2018-06-03 16:10:59 +02:00
parent bea5080da8
commit 93312f7d76
2 changed files with 23 additions and 4 deletions

View File

@ -0,0 +1,11 @@
diff -up Markdown-2.6.11/tests/__init__.py.orig markdown/tests/__init__.py
--- Markdown-2.6.11/tests/__init__.py.orig 2018-06-03 10:51:55.518781537 +0000
+++ Markdown-2.6.11/tests/__init__.py 2018-06-03 10:59:34.088350325 +0000
@@ -185,5 +185,7 @@ def run():
# Except for the warnings that shouldn't
warnings.filterwarnings('default', category=PendingDeprecationWarning)
warnings.filterwarnings('default', category=DeprecationWarning, module='markdown')
+ warnings.filterwarnings('default', category=DeprecationWarning, module='yaml')
+ warnings.filterwarnings('default', category=DeprecationWarning, module='nose')
nose.main(addplugins=[HtmlOutput(), Markdown()])

View File

@ -9,11 +9,12 @@
Name: python-%{pkgname}
Version: 2.6.11
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Markdown implementation in Python
License: BSD
URL: https://python-markdown.github.io/
Source0: https://files.pythonhosted.org/packages/source/M/%{srcname}/%{srcname}-%{version}.tar.gz
Patch0: markdown-2.6.11-python37.patch
BuildArch: noarch
@ -29,6 +30,7 @@ BuildRequires: python2-devel
BuildRequires: python2-nose
%if ! 0%{?rhel}
BuildRequires: python2-yaml
BuildRequires: python2-tidy
%else
BuildRequires: python-yaml
%endif
@ -47,6 +49,9 @@ BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: python%{python3_pkgversion}-nose
BuildRequires: python%{python3_pkgversion}-PyYAML
%{?python_provide:%python_provide python%{python3_pkgversion}-%{pkgname}}
%if ! 0%{?rhel}
BuildRequires: python%{python3_pkgversion}-tidy
%endif
%description -n python%{python3_pkgversion}-%{pkgname}
This is a Python implementation of John Gruber's Markdown. It is
@ -56,7 +61,7 @@ there are a few known issues.
%prep
%setup -qc -n %{srcname}-%{version}
%autosetup -p0 -c -n %{srcname}-%{version}
mv %{srcname}-%{version} python2
%if %{with python3}
@ -111,12 +116,12 @@ ln -s markdown_py-%{python2_version} %{buildroot}%{_bindir}/markdown_py
%check
pushd python2
%{__python2} run-tests.py
%{__python2} run-tests.py -v
popd
%if %{with python3}
pushd python3
%{__python3} run-tests.py
%{__python3} run-tests.py -v
popd
%endif # with python3
@ -145,6 +150,9 @@ popd
%changelog
* Sun Jun 3 2018 Thomas Moschny <thomas.moschny@gmx.de> - 2.6.11-2
- Try to fix a FTBFS with Python 3.7 (rhbz#1583678).
* Sun Feb 11 2018 Thomas Moschny <thomas.moschny@gmx.de> - 2.6.11-1
- Update to 2.6.11.