On Tue, Apr 25, 2017 at 10:58:55PM +0100, Edd Barrett wrote:
> On Tue, Apr 25, 2017 at 10:21:32PM +0500, Alexandr Shadchin wrote:
> > Hmm, I don't reproduce failures on my machines.
> > Can you give me test.log?
>
> If I move my ~/.local out the way, then all tests pass.
>
> This isn't the first time I've seen these kind of shenanigans. I wonder
> if we can exclude ~/.local from ports builds/tests?
>
It may was disabled by user request with -s or PYTHONNOUSERSITE
(or PYTHONUSERBASE).
python.port.mk do it, but we have nonstandart test case.
I attached new diff, wich exclude ~/.local
--
Alexandr Shadchin
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/ipython/Makefile,v
retrieving revision 1.43
diff -u -p -r1.43 Makefile
--- Makefile 12 Mar 2017 21:11:51 -0000 1.43
+++ Makefile 26 Apr 2017 19:09:06 -0000
@@ -2,7 +2,7 @@
COMMENT= enhanced interactive Python shell
-MODPY_EGG_VERSION = 5.1.0
+MODPY_EGG_VERSION = 5.3.0
DISTNAME= ipython-${MODPY_EGG_VERSION}
CATEGORIES= devel
@@ -18,19 +18,19 @@ RUN_DEPENDS = devel/py-decorator${MODPY
devel/py-traitlets${MODPY_FLAVOR} \
devel/desktop-file-utils \
devel/py-pexpect${MODPY_FLAVOR} \
- devel/py-prompt_toolkit${MODPY_FLAVOR}
+ devel/py-prompt_toolkit${MODPY_FLAVOR} \
+ textproc/py-pygments${MODPY_FLAVOR}
# Note that if you have pdb++ installed, tests will fail.
TEST_DEPENDS = ${BASE_PKGPATH}=${MODPY_EGG_VERSION} \
devel/py-path.py${MODPY_FLAVOR} \
devel/py-nbformat${MODPY_FLAVOR}>=4.2.0 \
devel/py-nose${MODPY_FLAVOR} \
www/py-requests${MODPY_FLAVOR} \
- devel/py-testpath${MODPY_FLAVOR} \
- textproc/py-pygments${MODPY_FLAVOR}
+ devel/py-testpath${MODPY_FLAVOR}
BUILD_DEPENDS = ${RUN_DEPENDS} \
textproc/py-sphinx${MODPY_FLAVOR} \
textproc/py-numpydoc${MODPY_FLAVOR} \
- devel/py-ipykernel${MODPY_FLAVOR}>=4.5.2 \
+ devel/py-ipykernel${MODPY_FLAVOR}>=4.6.1 \
devel/py-nose${MODPY_FLAVOR} \
graphics/py-matplotlib${MODPY_FLAVOR} \
www/py-requests${MODPY_FLAVOR}
@@ -50,20 +50,18 @@ PORTHOME = ${WRKSRC}
.if ${FLAVOR:Mpython3}
PKGNAME = ipython${MODPY_MAJOR_VERSION}-${MODPY_EGG_VERSION}
+RUN_DEPENDS += math/py-numpy,python3
.else
RUN_DEPENDS += devel/py-backports-shutil-get-terminal-size
TEST_DEPENDS += devel/py-mock
.endif
-REVISION = 0
-
-pre-patch:
- ln -s ${MODPY_BIN} ${WRKDIR}/bin/python
# Build some HTML docs. OK to ignore python and systrace warnings.
MAKE_ENV += PYTHONPATH=${WRKSRC}
post-build:
cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} html \
- SPHINXBUILD=${LOCALBASE}/bin/sphinx-build${MODPY_BIN_SUFFIX}
+ SPHINXBUILD=${LOCALBASE}/bin/sphinx-build${MODPY_BIN_SUFFIX} \
+ PYTHON=${MODPY_BIN}
# Despite the fact that setupbase.py defines paths for examples to
# be installed into, we still have to do it manually for some reason.
@@ -95,7 +93,7 @@ pre-build:
${SUBST_CMD} ${WRKBUILD}/examples/IPython\ Kernel/ipython.desktop
do-test:
- env LC_CTYPE='en_US.UTF-8' PYTHONIOENCODING='utf-8' \
+ env LC_CTYPE=en_US.UTF-8 PYTHONNOUSERSITE=1 \
${LOCALBASE}/bin/iptest${MODPY_BIN_SUFFIX}
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/ipython/distinfo,v
retrieving revision 1.19
diff -u -p -r1.19 distinfo
--- distinfo 13 Dec 2016 14:50:45 -0000 1.19
+++ distinfo 26 Apr 2017 19:09:06 -0000
@@ -1,2 +1,2 @@
-SHA256 (ipython-5.1.0.tar.gz) = fvRpThNFkTGCEmshmqpKAEfhka9BQlbaZ3LPJJVxuWE=
-SIZE (ipython-5.1.0.tar.gz) = 4945490
+SHA256 (ipython-5.3.0.tar.gz) = v15hXn2W2sWmH7+Y2eKSbZiqVVgmgb6n6TgpkqP0PB0=
+SIZE (ipython-5.3.0.tar.gz) = 4967956
Index: patches/patch-docs_source_conf_py
===================================================================
RCS file: /cvs/ports/devel/ipython/patches/patch-docs_source_conf_py,v
retrieving revision 1.4
diff -u -p -r1.4 patch-docs_source_conf_py
--- patches/patch-docs_source_conf_py 13 Dec 2016 14:50:45 -0000 1.4
+++ patches/patch-docs_source_conf_py 26 Apr 2017 19:09:06 -0000
@@ -6,9 +6,9 @@ putting their name in a PLIST somewhat d
Disable intersphinx.
---- docs/source/conf.py.orig Sat Aug 13 17:56:43 2016
-+++ docs/source/conf.py Fri Aug 19 19:59:00 2016
-@@ -60,8 +60,6 @@ extensions = [
+--- docs/source/conf.py.orig Fri Feb 24 20:12:01 2017
++++ docs/source/conf.py Sun Apr 23 20:51:07 2017
+@@ -55,8 +55,6 @@ extensions = [
'sphinx.ext.autodoc',
'sphinx.ext.autosummary',
'sphinx.ext.doctest',
