Date: Mon, 31 Aug 2015 12:44:06 +0000 (UTC) From: Kubilay Kocak <koobs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r395669 - in head/devel/py-pbr: . files Message-ID: <201508311244.t7VCi6Vn079353@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: koobs Date: Mon Aug 31 12:44:05 2015 New Revision: 395669 URL: https://svnweb.freebsd.org/changeset/ports/395669 Log: devel/py-pbr: Update to 1.6.0, Backport sphinx fix - Update to 1.6.0 - Backport upstream fix [1] for sphinx 1.3+ causing the following error in ports that utilise pbr and that build documentation, like virtualenvwrapper (currently BROKEN): TypeError: init_values() takes exactly 2 arguments (1 given) [1] https://review.openstack.org/#/c/193462/ [2] https://bugs.launchpad.net/oslotest/+bug/1379998 Added: head/devel/py-pbr/files/ head/devel/py-pbr/files/patch-pbr_builddoc.py (contents, props changed) Modified: head/devel/py-pbr/Makefile head/devel/py-pbr/distinfo Modified: head/devel/py-pbr/Makefile ============================================================================== --- head/devel/py-pbr/Makefile Mon Aug 31 12:25:43 2015 (r395668) +++ head/devel/py-pbr/Makefile Mon Aug 31 12:44:05 2015 (r395669) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pbr -PORTVERSION= 1.3.0 +PORTVERSION= 1.6.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Modified: head/devel/py-pbr/distinfo ============================================================================== --- head/devel/py-pbr/distinfo Mon Aug 31 12:25:43 2015 (r395668) +++ head/devel/py-pbr/distinfo Mon Aug 31 12:44:05 2015 (r395669) @@ -1,2 +1,2 @@ -SHA256 (pbr-1.3.0.tar.gz) = 1a6f8d514fc11d2571c75c207d932c106f024f199b5f12d25f8ca022b026c59d -SIZE (pbr-1.3.0.tar.gz) = 99701 +SHA256 (pbr-1.6.0.tar.gz) = 4eaee8ff5544703edd1951ed1dc0b283da99a74f740d9f9055eeefcf329de1d1 +SIZE (pbr-1.6.0.tar.gz) = 99945 Added: head/devel/py-pbr/files/patch-pbr_builddoc.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/py-pbr/files/patch-pbr_builddoc.py Mon Aug 31 12:44:05 2015 (r395669) @@ -0,0 +1,59 @@ +From 12e36886fe343f8103a21c60d6925115ad8dbc26 Mon Sep 17 00:00:00 2001 +From: Thomas Bechtold <tbechtold@suse.com> +Date: Tue, 2 Jun 2015 18:40:38 +0200 +Subject: [PATCH] Remove sphinx_config.init_values() manual call + +The function signature for Sphinx's config.init_values() changed since +version 1.3. That leads to: + +TypeError: init_values() takes exactly 2 arguments (1 given) + +But the function is already correctly called from +application.Sphinx()'s constructor. So use the configuration object +from the application instead of creating an own config object. + +Commit 1dfe9ef348c777bef67b2c2b1d35e50ebc720333 already introduced this +change and commit e41a9180ed3103bb45fa1d1be93ba951016b029c reverted it +due to build failures with Sphinx 1.1.3 . The failure occurred because +using the application class to detect if man pages can build raised a +warning which was treated as error. This case is now handled and tested +with Sphinx 1.1.3 and 1.3.1. + +Change-Id: Idf6c7b329880c6698b61ee9e88f29c0f6e0956bf +Closes-Bug: #1379998 + +--- pbr/builddoc.py.orig 2015-08-24 21:30:59 UTC ++++ pbr/builddoc.py +@@ -27,7 +27,6 @@ except ImportError: + try: + from sphinx import apidoc + from sphinx import application +- from sphinx import config + from sphinx import setup_command + except Exception as e: + # NOTE(dhellmann): During the installation of docutils, setuptools +@@ -129,10 +128,21 @@ class LocalBuildDoc(setup_command.BuildD + confoverrides['release'] = self.release + if self.today: + confoverrides['today'] = self.today +- sphinx_config = config.Config(self.config_dir, 'conf.py', {}, []) +- sphinx_config.init_values() +- if self.builder == 'man' and len(sphinx_config.man_pages) == 0: ++ ++ # NOTE(toabctl): creating the app with "warningiserror=False" is ++ # used to detect if man_pages are available.Only needed for sphinx<1.3 ++ # See also https://github.com/sphinx-doc/sphinx/issues/1933 ++ app = application.Sphinx( ++ self.source_dir, self.config_dir, ++ self.builder_target_dir, self.doctree_dir, ++ self.builder, confoverrides, status_stream, ++ freshenv=self.fresh_env, warningiserror=False) ++ ++ if self.builder == 'man' and len(app.config.man_pages) == 0: + return ++ ++ # NOTE(toabctl): Now create the app with "warningiserror=True for real ++ # usage + app = application.Sphinx( + self.source_dir, self.config_dir, + self.builder_target_dir, self.doctree_dir,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508311244.t7VCi6Vn079353>