[arch-commits] Commit in python-sphinx/trunk (2 files)

[Johannes Löthberg]

    Date: Thursday, December 3, 2015 @ 14:56:28
  Author: demize
Revision: 148200

upgpkg: python-sphinx 1.3.3-1

Modified:
  python-sphinx/trunk/PKGBUILD
Deleted:
  python-sphinx/trunk/4c2f693cbf7ec40448e7237383880d701ede6c88.patch

------------------------------------------------+
 4c2f693cbf7ec40448e7237383880d701ede6c88.patch |   22 ----------------------
 PKGBUILD                                       |   22 ++++++++++------------
 2 files changed, 10 insertions(+), 34 deletions(-)

Deleted: 4c2f693cbf7ec40448e7237383880d701ede6c88.patch
===================================================================
--- 4c2f693cbf7ec40448e7237383880d701ede6c88.patch	2015-12-03 11:15:23 UTC (rev 148199)
+++ 4c2f693cbf7ec40448e7237383880d701ede6c88.patch	2015-12-03 13:56:28 UTC (rev 148200)
@@ -1,22 +0,0 @@
-From b4331978e04b666909cc04bd39fb738b885ee3b4 Mon Sep 17 00:00:00 2001
-From: Eric Larson <larson.eric.d at gmail.com>
-Date: Tue, 19 May 2015 10:08:26 -0700
-Subject: [PATCH] FIX: Only check if members is True
-
----
- sphinx/ext/autosummary/__init__.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sphinx/ext/autosummary/__init__.py b/sphinx/ext/autosummary/__init__.py
-index 4fd44ac..a53b125 100644
---- a/sphinx/ext/autosummary/__init__.py
-+++ b/sphinx/ext/autosummary/__init__.py
-@@ -276,7 +276,7 @@ def get_items(self, names):
-                 self.warn('failed to import object %s' % real_name)
-                 items.append((display_name, '', '', real_name))
-                 continue
--            if not documenter.check_module():
-+            if documenter.options.members and not documenter.check_module():
-                 continue
- 
-             # try to also get a source code analyzer for attribute docs

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-12-03 11:15:23 UTC (rev 148199)
+++ PKGBUILD	2015-12-03 13:56:28 UTC (rev 148200)
@@ -1,15 +1,18 @@
 # $Id$
-# Maintainer: Sébastien Luttringer
+# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
+# Contributor: Sébastien Luttringer
 # Contributor: Angel Velasquez <angvp at archlinux.org>
 # Contributor: Fabio Volpe <volpefabio at gmail.com>
 
 pkgbase=python-sphinx
 pkgname=('python-sphinx' 'python2-sphinx')
-pkgver=1.3.1
-pkgrel=10
+pkgver=1.3.3
+pkgrel=1
+
 arch=('any')
 url='http://sphinx.pocoo.org/'
 license=('BSD')
+
 makedepends=(
   'python-setuptools'
   'python-docutils'
@@ -31,17 +34,11 @@
   'python-sphinx_rtd_theme' 'python2-sphinx_rtd_theme'
   'python2-mock'
 )
-source=("http://pypi.python.org/packages/source/S/Sphinx/Sphinx-$pkgver.tar.gz"
-  '4c2f693cbf7ec40448e7237383880d701ede6c88.patch')
-md5sums=('8786a194acf9673464c5455b11fd4332'
-         '103a559a4e4a17d4dd9c3e2342486197')
 
+source=("http://pypi.python.org/packages/source/S/Sphinx/Sphinx-$pkgver.tar.gz")
+md5sums=('3800ffa038a1eedb5139f9c247e7ee2f')
+
 prepare() {
-  # https://github.com/sphinx-doc/sphinx/pull/1892
-  pushd Sphinx-$pkgver
-   patch -p1 -i "$srcdir"/4c2f693cbf7ec40448e7237383880d701ede6c88.patch
-  popd
-
   # souce duplication is required because makefile modify source code
   # setyp.py --build tricks don't works well
   cp -a Sphinx-$pkgver Sphinx-${pkgver}2
@@ -57,6 +54,7 @@
   msg2 'Python 3 version'
   cd "$srcdir"/Sphinx-$pkgver
   make PYTHON=python3 build
+
   msg2 'Python 2 version'
   cd "$srcdir"/Sphinx-${pkgver}2
   make PYTHON=python2 build