Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 12 Aug 2019 01:14:45 +0000 (UTC)
From:      Kubilay Kocak <koobs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r508700 - in branches/2019Q3/textproc/py-sphinxcontrib-bitbucket: . files
Message-ID:  <201908120114.x7C1EjOZ028215@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: koobs
Date: Mon Aug 12 01:14:45 2019
New Revision: 508700
URL: https://svnweb.freebsd.org/changeset/ports/508700

Log:
  MFH: r508699 textproc/py-sphinxcontrib-bitbucket: Fix Python 3 build/run
  
  Fix Python 3 build, identified while testing devel/py-virtualenvwrapper:
  
  Exception occurred:
    File "/usr/local/lib/python3.7/site-packages/sphinx/registry.py", line 196, in load_extension
      mod = __import__(extname, None, None, ['setup'])
    File "/usr/local/lib/python3.7/site-packages/sphinxcontrib/bitbucket.py", line 26
      except AttributeError, err:
                           ^
  SyntaxError: invalid syntax
  
  While I'm here, level up ports/python compliance:
  
    - Add python to CATEGORIES
    - Add LICENSE/LICENSE_FILE
    - Add NO_ARCH
    - Add missing RUN_DEPENDS
    - Correct RUN_DEPENDS version-specs
  
  Approved by:	portmgr (blanket(s): build fix, ports compliance, dependencies)
  
  Approved by:	ports-secteam (blanket: ports fixes)

Added:
  branches/2019Q3/textproc/py-sphinxcontrib-bitbucket/files/patch-sphinxcontrib_bitbucket.py
     - copied unchanged from r508699, head/textproc/py-sphinxcontrib-bitbucket/files/patch-sphinxcontrib_bitbucket.py
Modified:
  branches/2019Q3/textproc/py-sphinxcontrib-bitbucket/Makefile
  branches/2019Q3/textproc/py-sphinxcontrib-bitbucket/files/patch-setup.py
Directory Properties:
  branches/2019Q3/   (props changed)

Modified: branches/2019Q3/textproc/py-sphinxcontrib-bitbucket/Makefile
==============================================================================
--- branches/2019Q3/textproc/py-sphinxcontrib-bitbucket/Makefile	Mon Aug 12 01:11:25 2019	(r508699)
+++ branches/2019Q3/textproc/py-sphinxcontrib-bitbucket/Makefile	Mon Aug 12 01:14:45 2019	(r508700)
@@ -3,17 +3,23 @@
 
 PORTNAME=	sphinxcontrib-bitbucket
 PORTVERSION=	1.0
-PORTREVISION=	1
-CATEGORIES=	textproc
+PORTREVISION=	2
+CATEGORIES=	textproc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Sphinx/BitBucket integration
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${PY_FLAVOR}
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0.6:textproc/py-sphinx@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}docutils>=0.6:textproc/py-docutils@${PY_FLAVOR}
+
 USES=		python
 USE_PYTHON=	distutils autoplist
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>

Modified: branches/2019Q3/textproc/py-sphinxcontrib-bitbucket/files/patch-setup.py
==============================================================================
--- branches/2019Q3/textproc/py-sphinxcontrib-bitbucket/files/patch-setup.py	Mon Aug 12 01:11:25 2019	(r508699)
+++ branches/2019Q3/textproc/py-sphinxcontrib-bitbucket/files/patch-setup.py	Mon Aug 12 01:14:45 2019	(r508700)
@@ -1,5 +1,5 @@
---- ./setup.py.orig	2012-08-20 21:53:58.000000000 +0200
-+++ ./setup.py	2012-08-20 21:54:10.000000000 +0200
+--- setup.py.orig	2011-04-24 16:19:59 UTC
++++ setup.py
 @@ -1,9 +1,5 @@
  # -*- coding: utf-8 -*-
  
@@ -10,7 +10,7 @@
  from setuptools import setup, find_packages
  
  try:
-@@ -43,5 +39,4 @@
+@@ -43,5 +39,4 @@ setup(
      include_package_data=True,
      install_requires=requires,
      namespace_packages=['sphinxcontrib'],

Copied: branches/2019Q3/textproc/py-sphinxcontrib-bitbucket/files/patch-sphinxcontrib_bitbucket.py (from r508699, head/textproc/py-sphinxcontrib-bitbucket/files/patch-sphinxcontrib_bitbucket.py)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2019Q3/textproc/py-sphinxcontrib-bitbucket/files/patch-sphinxcontrib_bitbucket.py	Mon Aug 12 01:14:45 2019	(r508700, copy of r508699, head/textproc/py-sphinxcontrib-bitbucket/files/patch-sphinxcontrib_bitbucket.py)
@@ -0,0 +1,13 @@
+# Fix Python 3 build
+
+--- sphinxcontrib/bitbucket.py.orig	2019-08-11 09:19:09 UTC
++++ sphinxcontrib/bitbucket.py
+@@ -23,7 +23,7 @@ def make_link_node(rawtext, app, type, slug, options):
+         base = app.config.bitbucket_project_url
+         if not base:
+             raise AttributeError
+-    except AttributeError, err:
++    except AttributeError as err:
+         raise ValueError('bitbucket_project_url configuration value is not set (%s)' % str(err))
+     #
+     slash = '/' if base[-1] != '/' else ''



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908120114.x7C1EjOZ028215>