* Switch on py3-sphinx for python3

* Prevent build from calling out to the internet

ok ajacoutot@
This commit is contained in:
shadchin 2016-04-16 19:06:25 +00:00
parent c2563c60c2
commit d7d33fe909
21 changed files with 196 additions and 42 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.10 2016/04/15 08:53:49 shadchin Exp $
# $OpenBSD: Makefile,v 1.11 2016/04/16 19:06:25 shadchin Exp $
PKG_ARCH= *
COMMENT= small expressive ORM
@ -6,7 +6,7 @@ COMMENT= small expressive ORM
MODPY_EGG_VERSION= 2.8.0
DISTNAME= peewee-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
REVISION= 0
REVISION= 1
CATEGORIES= databases
@ -19,7 +19,7 @@ GH_ACCOUNT= coleifer
GH_PROJECT= peewee
GH_TAGNAME= ${MODPY_EGG_VERSION}
BUILD_DEPENDS = textproc/py-sphinx
BUILD_DEPENDS = textproc/py-sphinx${MODPY_FLAVOR}
FLAVORS= python3
FLAVOR?=
@ -27,12 +27,10 @@ FLAVOR?=
MODULES= lang/python
MODPY_SETUPTOOLS= Yes
MAKE_ENV += PYTHONPATH=${WRKSRC}
MAKE_ENV += PYTHONPATH=${WRKSRC} SPHINXBUILD=${LOCALBASE}/bin/sphinx-build${MODPY_BIN_SUFFIX}
DOCSRC = ${WRKSRC}/docs
post-build:
cd ${DOCSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} html
cd ${DOCSRC} && PYTHONPATH=${WRKSRC} \
${LOCALBASE}/bin/sphinx-build -N . _build/html
DOCS = ${PREFIX}/share/doc/${MODPY_PY_PREFIX}peewee
EXAMPLES = ${PREFIX}/share/examples/${MODPY_PY_PREFIX}peewee

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-docs_Makefile,v 1.1 2016/04/16 19:06:25 shadchin Exp $
--- docs/Makefile.orig Fri Apr 15 20:30:49 2016
+++ docs/Makefile Fri Apr 15 20:30:53 2016
@@ -3,7 +3,7 @@
# You can set these variables from the command line.
SPHINXOPTS =
-SPHINXBUILD = sphinx-build
+SPHINXBUILD ?= sphinx-build
PAPER =
BUILDDIR = _build

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.4 2016/04/15 08:53:49 shadchin Exp $
# $OpenBSD: Makefile,v 1.5 2016/04/16 19:06:25 shadchin Exp $
COMMENT = object-oriented filesystem paths
MODPY_EGG_VERSION = 1.0.1
DISTNAME = pathlib-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
REVISION = 1
REVISION = 2
CATEGORIES = devel
@ -18,7 +18,7 @@ PERMIT_PACKAGE_CDROM = Yes
MODPY_PI = Yes
MODULES = lang/python
BUILD_DEPENDS = textproc/py-sphinx
BUILD_DEPENDS = textproc/py-sphinx${MODPY_FLAVOR}
TEST_DEPENDS = lang/python/${MODPY_VERSION},-tests
FLAVORS = python3
@ -26,8 +26,10 @@ FLAVOR ?=
DOCDIR = ${PREFIX}/share/doc/${MODPY_PY_PREFIX}pathlib
MAKE_ENV += PYTHONPATH=${WRKSRC} SPHINXBUILD=${LOCALBASE}/bin/sphinx-build${MODPY_BIN_SUFFIX}
post-build:
cd ${WRKBUILD}/docs && ${MAKE} html
cd ${WRKBUILD}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} html
post-install:
${INSTALL_DATA_DIR} ${DOCDIR}

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-docs_Makefile,v 1.1 2016/04/16 19:06:25 shadchin Exp $
--- docs/Makefile.orig Fri Apr 15 20:49:10 2016
+++ docs/Makefile Fri Apr 15 20:50:40 2016
@@ -3,7 +3,7 @@
# You can set these variables from the command line.
SPHINXOPTS =
-SPHINXBUILD = sphinx-build
+SPHINXBUILD ?= sphinx-build
PAPER =
BUILDDIR = _build

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.21 2016/04/15 08:53:49 shadchin Exp $
# $OpenBSD: Makefile,v 1.22 2016/04/16 19:06:25 shadchin Exp $
COMMENT= pure Python Expect-like module
@ -6,7 +6,7 @@ MODPY_EGG_VERSION= 4.0.1
DISTNAME= pexpect-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
CATEGORIES= devel
REVISION= 0
REVISION= 1
HOMEPAGE= http://pexpect.sourceforge.net/
@ -18,8 +18,7 @@ MODPY_PI = Yes
MODULES= lang/python
RUN_DEPENDS = devel/py-ptyprocess${MODPY_FLAVOR}
BUILD_DEPENDS = devel/py-ptyprocess \
textproc/py-sphinx
BUILD_DEPENDS = textproc/py-sphinx${MODPY_FLAVOR}
TEST_DEPENDS = ${RUN_DEPENDS} \
devel/py-test${MODPY_FLAVOR} \
shells/bash
@ -32,6 +31,8 @@ MODPY_ADJ_FILES = tests/fakessh/ssh
EXAMPLESDIR= ${PREFIX}/share/examples/${MODPY_PY_PREFIX}pexpect
DOCDIR= ${PREFIX}/share/doc/${MODPY_PY_PREFIX}pexpect
MAKE_ENV += PYTHONPATH=${WRKSRC} SPHINXBUILD=${LOCALBASE}/bin/sphinx-build${MODPY_BIN_SUFFIX}
pre-build:
${SUBST_CMD} ${WRKSRC}/pexpect/replwrap.py
${SUBST_CMD} ${WRKSRC}/tests/test_ctrl_chars.py
@ -40,7 +41,7 @@ pre-build:
${SUBST_CMD} ${WRKSRC}/tests/test_run.py
post-build:
cd ${WRKSRC}/doc && env PYTHONPATH=${WRKSRC} make html
cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} html
post-install:
${INSTALL_DATA_DIR} ${EXAMPLESDIR}

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-doc_Makefile,v 1.1 2016/04/16 19:06:26 shadchin Exp $
--- doc/Makefile.orig Fri Apr 15 20:41:00 2016
+++ doc/Makefile Fri Apr 15 20:41:10 2016
@@ -3,7 +3,7 @@
# You can set these variables from the command line.
SPHINXOPTS =
-SPHINXBUILD = sphinx-build
+SPHINXBUILD ?= sphinx-build
PAPER =
BUILDDIR = _build

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.25 2016/04/15 08:53:49 shadchin Exp $
# $OpenBSD: Makefile,v 1.26 2016/04/16 19:06:26 shadchin Exp $
COMMENT = Python easy_install replacement
@ -6,7 +6,7 @@ MODPY_EGG_VERSION = 8.1.1
DISTNAME = pip-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
CATEGORIES = devel
REVISION = 0
REVISION = 1
HOMEPAGE = https://pip.pypa.io/en/stable/
@ -16,18 +16,17 @@ PERMIT_PACKAGE_CDROM = Yes
MODPY_PI = Yes
MODULES = lang/python
BUILD_DEPENDS = textproc/py-sphinx
BUILD_DEPENDS = textproc/py-sphinx${MODPY_FLAVOR}
MODPY_SETUPTOOLS = Yes
NO_TEST = Yes
FLAVORS = python3
FLAVOR ?=
MAKE_ENV += PYTHONPATH=${WRKSRC}
DOCSRC = ${WRKSRC}/docs
post-build:
cd ${DOCSRC} && PYTHONPATH=${WRKSRC} \
${LOCALBASE}/bin/sphinx-build -N . _build/html
${LOCALBASE}/bin/sphinx-build${MODPY_BIN_SUFFIX} -N . _build/html
DOCS = ${PREFIX}/share/doc/${MODPY_PY_PREFIX}pip

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-docs_conf_py,v 1.1 2016/04/16 19:06:26 shadchin Exp $
Prevent build from calling out to the internet.
--- docs/conf.py.orig Fri Apr 15 21:02:46 2016
+++ docs/conf.py Fri Apr 15 21:02:54 2016
@@ -27,7 +27,7 @@ sys.path.insert(0, os.path.abspath(os.pardir))
# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
# extensions = ['sphinx.ext.autodoc']
-extensions = ['sphinx.ext.extlinks', 'docs.pipext', 'sphinx.ext.intersphinx']
+extensions = ['sphinx.ext.extlinks', 'docs.pipext']
# intersphinx
intersphinx_cache_limit = 0

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.4 2016/04/15 08:53:49 shadchin Exp $
# $OpenBSD: Makefile,v 1.5 2016/04/16 19:06:26 shadchin Exp $
COMMENT = test utilities working with files and commands
MODPY_EGG_VERSION = 0.3
DISTNAME = ${MODPY_EGG_VERSION}
PKGNAME = py-testpath-${MODPY_EGG_VERSION}
REVISION = 0
REVISION = 1
CATEGORIES = devel
@ -17,7 +17,7 @@ GH_ACCOUNT = jupyter
GH_PROJECT = testpath
GH_TAGNAME = ${MODPY_EGG_VERSION}
BUILD_DEPENDS = textproc/py-sphinx
BUILD_DEPENDS = textproc/py-sphinx${MODPY_FLAVOR}
TEST_DEPENDS += ${RUN_DEPENDS} \
devel/py-nose${MODPY_FLAVOR}
RUN_DEPENDS += devel/py-pathlib${MODPY_FLAVOR}
@ -26,17 +26,19 @@ RUN_DEPENDS += devel/py-pathlib${MODPY_FLAVOR}
PERMIT_PACKAGE_CDROM = Yes
MODULES = lang/python
USE_GMAKE = Yes
WRKSRC = ${WRKDIR}/testpath-${MODPY_EGG_VERSION}
FLAVORS = python3
FLAVOR ?=
MAKE_ENV += PYTHONPATH=${WRKSRC} SPHINXBUILD=${LOCALBASE}/bin/sphinx-build${MODPY_BIN_SUFFIX}
# Does not use any setup.py based build system
do-build:
${MODPY_BIN} -m compileall ${WRKBUILD}/testpath/
cd ${WRKBUILD}/doc && env PYTHONPATH=.. ${GMAKE} html
cd ${WRKSRC}/doc && PYTHONPATH=${WRKSRC} \
${LOCALBASE}/bin/sphinx-build${MODPY_BIN_SUFFIX} -N . _build/html
PREFIX_SITE = ${PREFIX}/lib/python${MODPY_VERSION}/site-packages
DOCDIR = ${PREFIX}/share/doc/${MODPY_PY_PREFIX}testpath

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.15 2016/04/15 08:53:49 shadchin Exp $
# $OpenBSD: Makefile,v 1.16 2016/04/16 19:06:26 shadchin Exp $
COMMENT = virtual Python environment builder
@ -6,7 +6,7 @@ MODPY_EGG_VERSION = 13.0.3
DISTNAME = virtualenv-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
CATEGORIES = devel
REVISION = 2
REVISION = 3
HOMEPAGE = http://www.virtualenv.org/
@ -16,7 +16,7 @@ PERMIT_PACKAGE_CDROM = Yes
MODPY_PI = Yes
MODULES = lang/python
BUILD_DEPENDS = textproc/py-sphinx
BUILD_DEPENDS = textproc/py-sphinx${MODPY_FLAVOR}
MODPY_SETUPTOOLS = Yes
@ -26,7 +26,7 @@ FLAVOR ?=
# the pypi archive does not contain the tests
NO_TEST = Yes
MAKE_ENV += PYTHONPATH=${WRKSRC}
MAKE_ENV += PYTHONPATH=${WRKSRC} SPHINXBUILD=${LOCALBASE}/bin/sphinx-build${MODPY_BIN_SUFFIX}
DOCSRC = ${WRKSRC}/docs
post-build:
cd ${DOCSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} html

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-docs_Makefile,v 1.1 2016/04/16 19:06:26 shadchin Exp $
--- docs/Makefile.orig Fri Apr 15 21:15:15 2016
+++ docs/Makefile Fri Apr 15 21:15:22 2016
@@ -3,7 +3,7 @@
# You can set these variables from the command line.
SPHINXOPTS =
-SPHINXBUILD = sphinx-build
+SPHINXBUILD ?= sphinx-build
PAPER =
BUILDDIR = _build

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.17 2015/09/29 10:52:54 sthen Exp $
# $OpenBSD: Makefile,v 1.18 2016/04/16 19:06:26 shadchin Exp $
COMMENT = microframework based on Werkzeug and Jinja 2
MODPY_EGG_VERSION = 0.10.1
REVISION = 1
REVISION = 2
DISTNAME = Flask-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME:L}
@ -26,12 +26,12 @@ RUN_DEPENDS = devel/py-blinker${MODPY_FLAVOR} \
www/py-itsdangerous${MODPY_FLAVOR} \
www/py-jinja2${MODPY_FLAVOR}>=2.4 \
www/py-werkzeug${MODPY_FLAVOR}>=0.7
BUILD_DEPENDS = textproc/py-sphinx \
BUILD_DEPENDS = textproc/py-sphinx${MODPY_FLAVOR} \
www/py-itsdangerous${MODPY_FLAVOR} \
www/py-werkzeug${MODPY_FLAVOR}>=0.7
TEST_DEPENDS = ${RUN_DEPENDS}
MAKE_ENV = PYTHONPATH="${WRKSRC}"
MAKE_ENV = PYTHONPATH="${WRKSRC}" SPHINXBUILD=${LOCALBASE}/bin/sphinx-build${MODPY_BIN_SUFFIX}
post-build:
@cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} html

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-docs_Makefile,v 1.1 2016/04/16 19:06:26 shadchin Exp $
--- docs/Makefile.orig Fri Apr 15 21:22:09 2016
+++ docs/Makefile Fri Apr 15 21:22:15 2016
@@ -3,7 +3,7 @@
# You can set these variables from the command line.
SPHINXOPTS =
-SPHINXBUILD = sphinx-build
+SPHINXBUILD ?= sphinx-build
PAPER =
BUILDDIR = _build

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-docs_conf_py,v 1.1 2016/04/16 19:06:26 shadchin Exp $
Prevent build from calling out to the internet.
--- docs/conf.py.orig Fri Apr 15 21:23:36 2016
+++ docs/conf.py Fri Apr 15 21:23:50 2016
@@ -26,7 +26,7 @@ sys.path.append(os.path.abspath('.'))
# Add any Sphinx extension module names here, as strings. They can be extensions
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx',
+extensions = ['sphinx.ext.autodoc',
'flaskdocext']
# Add any paths that contain templates here, relative to this directory.

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.5 2015/09/29 10:52:54 sthen Exp $
# $OpenBSD: Makefile,v 1.6 2016/04/16 19:06:26 shadchin Exp $
COMMENT = helpers to pass trusted data to untrusted environments
MODPY_EGG_VERSION = 0.24
REVISION = 1
REVISION = 2
DISTNAME = itsdangerous-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
@ -20,11 +20,13 @@ MODULES = lang/python
MODPY_SETUPTOOLS = Yes
BUILD_DEPENDS = textproc/py-sphinx
BUILD_DEPENDS = textproc/py-sphinx${MODPY_FLAVOR}
FLAVORS = python3
FLAVOR ?=
MAKE_ENV += PYTHONPATH=${WRKSRC} SPHINXBUILD=${LOCALBASE}/bin/sphinx-build${MODPY_BIN_SUFFIX}
post-build:
@cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} html

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-docs_Makefile,v 1.1 2016/04/16 19:06:26 shadchin Exp $
--- docs/Makefile.orig Fri Apr 15 21:28:40 2016
+++ docs/Makefile Fri Apr 15 21:28:46 2016
@@ -3,7 +3,7 @@
# You can set these variables from the command line.
SPHINXOPTS =
-SPHINXBUILD = sphinx-build
+SPHINXBUILD ?= sphinx-build
PAPER =
BUILDDIR = _build

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-docs_conf_py,v 1.1 2016/04/16 19:06:26 shadchin Exp $
Prevent build from calling out to the internet.
--- docs/conf.py.orig Fri Apr 15 21:29:34 2016
+++ docs/conf.py Fri Apr 15 21:29:43 2016
@@ -26,7 +26,7 @@ sys.path.append(os.path.abspath('..'))
# Add any Sphinx extension module names here, as strings. They can be extensions
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx']
+extensions = ['sphinx.ext.autodoc']
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']

View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.23 2016/03/28 12:20:33 danj Exp $
# $OpenBSD: Makefile,v 1.24 2016/04/16 19:06:26 shadchin Exp $
COMMENT = WSGI utility collection
MODPY_EGG_VERSION = 0.11.5
DISTNAME = Werkzeug-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME:L}
REVISION = 0
CATEGORIES = www devel
@ -21,7 +22,7 @@ MODULES = lang/python
MODPY_SETUPTOOLS = Yes
BUILD_DEPENDS = textproc/py-sphinx
BUILD_DEPENDS = textproc/py-sphinx${MODPY_FLAVOR}
TEST_DEPENDS = devel/py-test${MODPY_FLAVOR} \
www/py-requests${MODPY_FLAVOR}
@ -29,6 +30,8 @@ TEST_DEPENDS = devel/py-test${MODPY_FLAVOR} \
FLAVORS = python3
FLAVOR ?=
MAKE_ENV += PYTHONPATH=${WRKSRC} SPHINXBUILD=${LOCALBASE}/bin/sphinx-build${MODPY_BIN_SUFFIX}
pre-build:
${SUBST_CMD} ${WRKSRC}/tests/test_serving.py

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-docs_Makefile,v 1.1 2016/04/16 19:06:26 shadchin Exp $
--- docs/Makefile.orig Fri Apr 15 21:33:26 2016
+++ docs/Makefile Fri Apr 15 21:33:32 2016
@@ -3,7 +3,7 @@
# You can set these variables from the command line.
SPHINXOPTS =
-SPHINXBUILD = sphinx-build
+SPHINXBUILD ?= sphinx-build
PAPER =
BUILDDIR = _build

View File

@ -1,9 +1,12 @@
$OpenBSD: patch-tests_test_serving_py,v 1.1 2016/01/04 12:21:41 shadchin Exp $
--- tests/test_serving.py.orig Thu Dec 24 00:04:27 2015
+++ tests/test_serving.py Thu Dec 24 00:03:59 2015
@@ -195,4 +195,4 @@ def test_monkeypached_sleep(tmpdir):
$OpenBSD: patch-tests_test_serving_py,v 1.2 2016/04/16 19:06:26 shadchin Exp $
--- tests/test_serving.py.orig Wed Mar 23 00:38:53 2016
+++ tests/test_serving.py Fri Apr 15 21:33:04 2016
@@ -195,7 +195,7 @@ def test_monkeypached_sleep(tmpdir):
from werkzeug._reloader import ReloaderLoop
ReloaderLoop()._sleep(0)
'''))
- subprocess.check_call(['python', str(script)])
+ subprocess.check_call(['${MODPY_BIN}', str(script)])
def test_wrong_protocol(dev_server):

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-werkzeug_contrib_lint_py,v 1.1 2016/04/16 19:06:26 shadchin Exp $
--- werkzeug/contrib/lint.py.orig Fri Apr 15 21:52:40 2016
+++ werkzeug/contrib/lint.py Fri Apr 15 21:54:00 2016
@@ -19,7 +19,10 @@
:copyright: (c) 2014 by the Werkzeug Team, see AUTHORS for more details.
:license: BSD, see LICENSE for more details.
"""
-from urlparse import urlparse
+try:
+ from urlparse import urlparse
+except ImportError:
+ from urllib.parse import urlparse
from warnings import warn
from werkzeug.datastructures import Headers