From ac1efebb02ecc9200d7a1784771c8bbb9e91667d8ebd0fbe40f779464aa5c879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 24 May 2019 19:52:52 +0000 Subject: [PATCH 1/2] - Update to 1.1.2: * Fixes for sphinx 2.0 - Enable tests (failing for now) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-sphinxcontrib-websupport?expand=0&rev=20 --- python-sphinxcontrib-websupport.changes | 7 +++++++ python-sphinxcontrib-websupport.spec | 13 ++++++++++++- sphinxcontrib-websupport-1.1.0.tar.gz | 3 --- sphinxcontrib-websupport-1.1.2.tar.gz | 3 +++ 4 files changed, 22 insertions(+), 4 deletions(-) delete mode 100644 sphinxcontrib-websupport-1.1.0.tar.gz create mode 100644 sphinxcontrib-websupport-1.1.2.tar.gz diff --git a/python-sphinxcontrib-websupport.changes b/python-sphinxcontrib-websupport.changes index 8f1711c..6d16412 100644 --- a/python-sphinxcontrib-websupport.changes +++ b/python-sphinxcontrib-websupport.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri May 24 19:52:17 UTC 2019 - Tomáš Chvátal + +- Update to 1.1.2: + * Fixes for sphinx 2.0 +- Enable tests (failing for now) + ------------------------------------------------------------------- Tue Apr 23 09:13:06 UTC 2019 - Marketa Calabkova diff --git a/python-sphinxcontrib-websupport.spec b/python-sphinxcontrib-websupport.spec index 143315c..e0f8b8a 100644 --- a/python-sphinxcontrib-websupport.spec +++ b/python-sphinxcontrib-websupport.spec @@ -18,14 +18,22 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-sphinxcontrib-websupport -Version: 1.1.0 +Version: 1.1.2 Release: 0 Summary: Sphinx API for Web Apps License: BSD-2-Clause Group: Development/Languages/Python URL: http://sphinx-doc.org/ Source: https://files.pythonhosted.org/packages/source/s/sphinxcontrib-websupport/sphinxcontrib-websupport-%{version}.tar.gz +BuildRequires: %{python_module Jinja2} +BuildRequires: %{python_module SQLAlchemy} +BuildRequires: %{python_module Sphinx} +BuildRequires: %{python_module Whoosh} +BuildRequires: %{python_module docutils} +BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module six} +BuildRequires: %{python_module xapian} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-Jinja2 @@ -54,6 +62,9 @@ documentation into your Web application. %python_install %python_expand %fdupes %{buildroot}%{$python_sitelib} +%check +%pytest + %files %{python_files} %license LICENSE %doc CHANGES README.rst diff --git a/sphinxcontrib-websupport-1.1.0.tar.gz b/sphinxcontrib-websupport-1.1.0.tar.gz deleted file mode 100644 index b6b8025..0000000 --- a/sphinxcontrib-websupport-1.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9de47f375baf1ea07cdb3436ff39d7a9c76042c10a769c52353ec46e4e8fc3b9 -size 587947 diff --git a/sphinxcontrib-websupport-1.1.2.tar.gz b/sphinxcontrib-websupport-1.1.2.tar.gz new file mode 100644 index 0000000..4bf7ee5 --- /dev/null +++ b/sphinxcontrib-websupport-1.1.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1501befb0fdf1d1c29a800fdbf4ef5dc5369377300ddbdd16d2cd40e54c6eefc +size 599000 From 67f874937b37736ef3efc4fdcf01673539cac9c19e442cbea906cdad410a950f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 6 Jun 2019 10:50:22 +0000 Subject: [PATCH 2/2] - Switch to multibuild to fix testing issues OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-sphinxcontrib-websupport?expand=0&rev=21 --- _multibuild | 3 +++ python-sphinxcontrib-websupport.changes | 5 +++++ python-sphinxcontrib-websupport.spec | 23 ++++++++++++++++++++--- 3 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 _multibuild diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..fcc7b97 --- /dev/null +++ b/_multibuild @@ -0,0 +1,3 @@ + + test + diff --git a/python-sphinxcontrib-websupport.changes b/python-sphinxcontrib-websupport.changes index 6d16412..3f41db4 100644 --- a/python-sphinxcontrib-websupport.changes +++ b/python-sphinxcontrib-websupport.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jun 6 10:48:40 UTC 2019 - Tomáš Chvátal + +- Switch to multibuild to fix testing issues + ------------------------------------------------------------------- Fri May 24 19:52:17 UTC 2019 - Tomáš Chvátal diff --git a/python-sphinxcontrib-websupport.spec b/python-sphinxcontrib-websupport.spec index e0f8b8a..d58e02b 100644 --- a/python-sphinxcontrib-websupport.spec +++ b/python-sphinxcontrib-websupport.spec @@ -17,23 +17,34 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} -Name: python-sphinxcontrib-websupport +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "test" +%define psuffix -test +%bcond_without test +%else +%define psuffix %{nil} +%bcond_with test +%endif +Name: python-sphinxcontrib-websupport%{psuffix} Version: 1.1.2 Release: 0 Summary: Sphinx API for Web Apps License: BSD-2-Clause Group: Development/Languages/Python -URL: http://sphinx-doc.org/ +URL: https://github.com/sphinx-doc/sphinxcontrib-websupport Source: https://files.pythonhosted.org/packages/source/s/sphinxcontrib-websupport/sphinxcontrib-websupport-%{version}.tar.gz +%if %{with test} BuildRequires: %{python_module Jinja2} BuildRequires: %{python_module SQLAlchemy} BuildRequires: %{python_module Sphinx} BuildRequires: %{python_module Whoosh} BuildRequires: %{python_module docutils} BuildRequires: %{python_module pytest} -BuildRequires: %{python_module setuptools} BuildRequires: %{python_module six} +BuildRequires: %{python_module sphinxcontrib-websupport >= %{version}} BuildRequires: %{python_module xapian} +%endif +BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-Jinja2 @@ -59,12 +70,17 @@ documentation into your Web application. %python_build %install +%if !%{with test} %python_install %python_expand %fdupes %{buildroot}%{$python_sitelib} +%endif %check +%if %{with test} %pytest +%endif +%if !%{with test} %files %{python_files} %license LICENSE %doc CHANGES README.rst @@ -72,5 +88,6 @@ documentation into your Web application. %{python_sitelib}/sphinxcontrib/websupport/ %{python_sitelib}/sphinxcontrib_websupport-%{version}-py*-nspkg.pth %{python_sitelib}/sphinxcontrib_websupport-%{version}-py*.egg-info +%endif %changelog