From 4b61664f949f34e260348f68b06a54dec2c9554f Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Mon, 18 Mar 2019 10:21:46 -0600 Subject: [PATCH] python-execnet-1.5.0-7 Changelog: - Use standard pypi_name and pypi_source macros - Update Summary to match upstream - Use HTTPS in upstream URL - License is now MIT-only - Remove explicit Requires - Remove Sphinx docs generation (rhbz#1690057) - Drop double listing of python3/LICENSE file - Patch tests for latest apipkg (rhbz#1690057) Resolves: rhbz#1690057 --- ...g-into-the-test-dir-it-isn-t-a-singl.patch | 29 ++++++++++++ 0002-doc-use-a-list-for-html_sidebars.patch | 27 ++++++++++++ python-execnet.spec | 44 +++++++++++-------- 3 files changed, 82 insertions(+), 18 deletions(-) create mode 100644 0001-Don-t-copy-apipkg-into-the-test-dir-it-isn-t-a-singl.patch create mode 100644 0002-doc-use-a-list-for-html_sidebars.patch diff --git a/0001-Don-t-copy-apipkg-into-the-test-dir-it-isn-t-a-singl.patch b/0001-Don-t-copy-apipkg-into-the-test-dir-it-isn-t-a-singl.patch new file mode 100644 index 0000000..2a63656 --- /dev/null +++ b/0001-Don-t-copy-apipkg-into-the-test-dir-it-isn-t-a-singl.patch @@ -0,0 +1,29 @@ +From f40ed2b844f888f0c745a8dd1a66801b30d38d27 Mon Sep 17 00:00:00 2001 +From: Anthony Sottile +Date: Thu, 5 Jul 2018 15:14:35 -0700 +Subject: [PATCH] Don't copy apipkg into the test dir -- it isn't a single file + any more + +--- + testing/test_termination.py | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/testing/test_termination.py b/testing/test_termination.py +index 7320cdf..ae905d4 100644 +--- a/testing/test_termination.py ++++ b/testing/test_termination.py +@@ -1,6 +1,5 @@ + import pytest + import execnet +-import apipkg + import subprocess + import py + import sys +@@ -76,7 +75,6 @@ def test_close_initiating_remote_no_error(testdir, anypython): + print ("termination") + execnet.default_group.terminate() + """) +- testdir.makepyfile(apipkg=apipkg) + popen = subprocess.Popen( + [str(anypython), str(p), str(execnetdir)], + stdout=None, stderr=subprocess.PIPE,) diff --git a/0002-doc-use-a-list-for-html_sidebars.patch b/0002-doc-use-a-list-for-html_sidebars.patch new file mode 100644 index 0000000..75ee73b --- /dev/null +++ b/0002-doc-use-a-list-for-html_sidebars.patch @@ -0,0 +1,27 @@ +From 7424eab7dec61431646d050d87fd4c88a0bf69aa Mon Sep 17 00:00:00 2001 +From: Ken Dreyer +Date: Mon, 18 Mar 2019 14:25:52 -0600 +Subject: [PATCH] doc: use a list for html_sidebars + +Sphinx 1.7 deprecated the use of a single string in html_sidebars, and +Sphinx 2.0 has dropped support for this altogether. +--- + doc/conf.py | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/doc/conf.py b/doc/conf.py +index f904768..7c049fb 100644 +--- a/doc/conf.py ++++ b/doc/conf.py +@@ -98,10 +98,8 @@ html_theme = 'sphinxdoc' + + # html_index = 'index.html' + html_sidebars = { +- 'index': 'indexsidebar.html', ++ 'index': ['indexsidebar.html'], + } +-# 'basics': 'indexsidebar.html', +-# } + # html_additional_pages = {'index': 'index.html'} + + # Theme options are theme-specific and customize the look and feel of a theme diff --git a/python-execnet.spec b/python-execnet.spec index 9a150d3..44e4a69 100644 --- a/python-execnet.spec +++ b/python-execnet.spec @@ -2,14 +2,15 @@ Name: python-%{srcname} Version: 1.5.0 -Release: 6%{?dist} -Summary: Elastic Python Deployment -# package is now under the MIT license, (although the docs still say -# otherwise, see https://bitbucket.org/hpk42/execnet/issue/33), and -# one example file (doc/example/sysinfo.py) is GPLv2+ -License: MIT and GPLv2+ -URL: http://codespeak.net/execnet -Source0: https://pypi.io/packages/source/e/%{srcname}/%{srcname}-%{version}.tar.gz +Release: 7%{?dist} +Summary: Distributed Python deployment and communication +License: MIT +URL: https://codespeak.net/execnet/ +Source0: %pypi_source + +Patch0001: 0001-Don-t-copy-apipkg-into-the-test-dir-it-isn-t-a-singl.patch +Patch0002: 0002-doc-use-a-list-for-html_sidebars.patch + BuildArch: noarch BuildRequires: %{_bindir}/ps @@ -33,9 +34,6 @@ BuildRequires: python2-apipkg BuildRequires: python2-pytest BuildRequires: python2-eventlet BuildRequires: python2-gevent >= 1.0 -BuildRequires: %{_bindir}/sphinx-build-2 -Requires: python2-setuptools -Requires: python2-apipkg %{?python_provide:%python_provide python2-%{srcname}} %description -n python2-%{srcname} @@ -59,8 +57,6 @@ BuildRequires: python3-pytest #BuildRequires: python3-eventlet #BuildRequires: python3-gevent BuildRequires: %{_bindir}/sphinx-build-3 -Requires: python3-setuptools -Requires: python3-apipkg %{?python_provide:%python_provide python3-%{srcname}} %description -n python3-%{srcname} @@ -76,6 +72,12 @@ minimal and fast API targetting the following uses: %prep %setup -qc -n %{srcname}-%{version} + +pushd %{srcname}-%{version} +%patch0001 -p1 +%patch0002 -p1 +popd + mv %{srcname}-%{version} python2 pushd python2 @@ -92,7 +94,6 @@ cp -a python2 python3 SETUPTOOLS_SCM_PRETEND_VERSION=%{version} pushd python2 %py2_build -make -C doc html PYTHONPATH=$(pwd) SPHINXBUILD=sphinx-build-2 popd pushd python3 @@ -105,8 +106,6 @@ popd SETUPTOOLS_SCM_PRETEND_VERSION=%{version} pushd python2 %py2_install -# remove hidden file -rm doc/_build/html/.buildinfo popd pushd python3 @@ -136,7 +135,6 @@ popd %{python2_sitelib}/%{srcname}* %doc python2/README.rst %doc python2/CHANGELOG.rst -%doc python2/doc/_build/html %license python2/LICENSE @@ -146,10 +144,20 @@ popd %doc python3/CHANGELOG.rst %doc python3/doc/_build/html %license python3/LICENSE -%doc python3/LICENSE %changelog +* Mon Mar 18 2019 Ken Dreyer - 1.5.0-7 +- Update Summary to match upstream +- Use HTTPS in upstream URL +- License is now MIT-only +- Use standard pypi_source macro +- Remove explicit Requires +- Remove Sphinx docs generation on py2 (rhbz#1690057) +- Drop double listing of python3/LICENSE file +- Patch tests for latest apipkg (rhbz#1690057) +- Patch docs config for Sphinx 2 (rhbz#1690057) + * Sat Feb 02 2019 Fedora Release Engineering - 1.5.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild