Antoine Jacoutot said:
> Please don't hardcode the python version in dependencies.
Sure. OK?
--
Dmitrij D. Czarkoff
Index: devel/py-gevent/Makefile
===================================================================
RCS file: /cvs/ports/devel/py-gevent/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- devel/py-gevent/Makefile 18 Oct 2015 14:50:31 -0000 1.7
+++ devel/py-gevent/Makefile 31 May 2016 08:58:22 -0000
@@ -2,9 +2,9 @@
COMMENT = network library for easy and scalable concurrency
-MODPY_EGG_VERSION = 1.0.2
+MODPY_EGG_VERSION = 1.1.1
DISTNAME = gevent-${MODPY_EGG_VERSION}
-PKGNAME = py-${DISTNAME}
+PKGNAME = ${MODPY_PY_PREFIX}${DISTNAME}
MAINTAINER = Dmitrij D. Czarkoff <czark...@openbsd.org>
CATEGORIES = devel
@@ -19,13 +19,21 @@ MODULES = lang/python
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
+BUILD_DEPENDS = lang/cython \
+ devel/py-cffi
LIB_DEPENDS = devel/libev \
net/libcares
RUN_DEPENDS = devel/py-greenlet
-TEST_DEPENDS = ${RUN_DEPENDS}
+TEST_DEPENDS = ${RUN_DEPENDS} \
+ lang/python/${MODPY_VERSION},-tests \
+ sysutils/py-psutil
MAKE_ENV = CARES_EMBED=0 LIBEV_EMBED=0
CFLAGS += -I${LOCALBASE}/include
LDFLAGS += -L${LOCALBASE}/lib
+
+do-test:
+ cd ${WRKSRC}/greentest && ${SETENV} ${MAKE_ENV} PYTHONPATH="${WRKSRC}" \
+ ${MODPY_BIN} ./testrunner.py --config ../known_failures.py
.include <bsd.port.mk>
Index: devel/py-gevent/distinfo
===================================================================
RCS file: /cvs/ports/devel/py-gevent/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- devel/py-gevent/distinfo 18 Oct 2015 14:50:31 -0000 1.3
+++ devel/py-gevent/distinfo 21 May 2016 11:10:32 -0000
@@ -1,2 +1,2 @@
-SHA256 (gevent-1.0.2.tar.gz) = OuHKD1M93LF6qxbOZrQks/O4Vf87lQhSaRXTxrc/ujE=
-SIZE (gevent-1.0.2.tar.gz) = 1735721
+SHA256 (gevent-1.1.1.tar.gz) = buW5hRsqzeCN96ubmikD9YtLDlVUBcRE9LHdFvccruo=
+SIZE (gevent-1.1.1.tar.gz) = 2008368
Index: devel/py-gevent/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-gevent/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- devel/py-gevent/pkg/PLIST 18 Oct 2015 14:50:31 -0000 1.2
+++ devel/py-gevent/pkg/PLIST 21 May 2016 11:10:32 -0000
@@ -4,24 +4,49 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/gevent-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/gevent-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/gevent-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/gevent-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
lib/python${MODPY_VERSION}/site-packages/gevent-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
lib/python${MODPY_VERSION}/site-packages/gevent-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/gevent/__init__.py
lib/python${MODPY_VERSION}/site-packages/gevent/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/gevent/_corecffi_build.py
+lib/python${MODPY_VERSION}/site-packages/gevent/_corecffi_build.pyc
+lib/python${MODPY_VERSION}/site-packages/gevent/_fileobjectcommon.py
+lib/python${MODPY_VERSION}/site-packages/gevent/_fileobjectcommon.pyc
+lib/python${MODPY_VERSION}/site-packages/gevent/_fileobjectposix.py
+lib/python${MODPY_VERSION}/site-packages/gevent/_fileobjectposix.pyc
+lib/python${MODPY_VERSION}/site-packages/gevent/_semaphore.py
+lib/python${MODPY_VERSION}/site-packages/gevent/_semaphore.pyc
lib/python${MODPY_VERSION}/site-packages/gevent/_semaphore.so
+lib/python${MODPY_VERSION}/site-packages/gevent/_socket2.py
+lib/python${MODPY_VERSION}/site-packages/gevent/_socket2.pyc
+lib/python${MODPY_VERSION}/site-packages/gevent/_socket3.py
+lib/python${MODPY_VERSION}/site-packages/gevent/_socketcommon.py
+lib/python${MODPY_VERSION}/site-packages/gevent/_socketcommon.pyc
lib/python${MODPY_VERSION}/site-packages/gevent/_ssl2.py
lib/python${MODPY_VERSION}/site-packages/gevent/_ssl2.pyc
+lib/python${MODPY_VERSION}/site-packages/gevent/_ssl3.py
+lib/python${MODPY_VERSION}/site-packages/gevent/_ssl3.pyc
lib/python${MODPY_VERSION}/site-packages/gevent/_sslgte279.py
lib/python${MODPY_VERSION}/site-packages/gevent/_sslgte279.pyc
+lib/python${MODPY_VERSION}/site-packages/gevent/_tblib.py
+lib/python${MODPY_VERSION}/site-packages/gevent/_tblib.pyc
lib/python${MODPY_VERSION}/site-packages/gevent/_threading.py
lib/python${MODPY_VERSION}/site-packages/gevent/_threading.pyc
-lib/python${MODPY_VERSION}/site-packages/gevent/_util.so
+lib/python${MODPY_VERSION}/site-packages/gevent/_util_py2.py
+lib/python${MODPY_VERSION}/site-packages/gevent/_util_py2.pyc
lib/python${MODPY_VERSION}/site-packages/gevent/ares.so
lib/python${MODPY_VERSION}/site-packages/gevent/backdoor.py
lib/python${MODPY_VERSION}/site-packages/gevent/backdoor.pyc
lib/python${MODPY_VERSION}/site-packages/gevent/baseserver.py
lib/python${MODPY_VERSION}/site-packages/gevent/baseserver.pyc
-lib/python${MODPY_VERSION}/site-packages/gevent/core.so
+lib/python${MODPY_VERSION}/site-packages/gevent/builtins.py
+lib/python${MODPY_VERSION}/site-packages/gevent/builtins.pyc
+lib/python${MODPY_VERSION}/site-packages/gevent/core.py
+lib/python${MODPY_VERSION}/site-packages/gevent/core.pyc
+lib/python${MODPY_VERSION}/site-packages/gevent/corecext.so
+lib/python${MODPY_VERSION}/site-packages/gevent/corecffi.py
+lib/python${MODPY_VERSION}/site-packages/gevent/corecffi.pyc
lib/python${MODPY_VERSION}/site-packages/gevent/coros.py
lib/python${MODPY_VERSION}/site-packages/gevent/coros.pyc
lib/python${MODPY_VERSION}/site-packages/gevent/event.py
@@ -54,6 +79,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/gevent/select.pyc
lib/python${MODPY_VERSION}/site-packages/gevent/server.py
lib/python${MODPY_VERSION}/site-packages/gevent/server.pyc
+lib/python${MODPY_VERSION}/site-packages/gevent/signal.py
+lib/python${MODPY_VERSION}/site-packages/gevent/signal.pyc
lib/python${MODPY_VERSION}/site-packages/gevent/socket.py
lib/python${MODPY_VERSION}/site-packages/gevent/socket.pyc
lib/python${MODPY_VERSION}/site-packages/gevent/ssl.py
Index: net/py-geventhttpclient/Makefile
===================================================================
RCS file: /cvs/ports/net/py-geventhttpclient/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- net/py-geventhttpclient/Makefile 29 Sep 2015 10:52:29 -0000 1.3
+++ net/py-geventhttpclient/Makefile 30 May 2016 12:26:07 -0000
@@ -2,10 +2,10 @@
COMMENT = high performance, concurrent HTTP client library
-MODPY_EGG_VERSION = 1.1.0
-DISTNAME = py-geventhttpclient-${MODPY_EGG_VERSION}
+MODPY_EGG_VERSION = 1.2.0
+DISTNAME = geventhttpclient-${MODPY_EGG_VERSION}
+PKGNAME = ${MODPY_PY_PREFIX}${DISTNAME}
CATEGORIES = net devel
-REVISION = 1
HOMEPAGE = https://github.com/gwik/geventhttpclient
@@ -16,16 +16,13 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB += pthread ${MODPY_WANTLIB}
-GH_ACCOUNT = gwik
-GH_PROJECT = geventhttpclient
-GH_TAGNAME = v${MODPY_EGG_VERSION}
-
MODULES = lang/python
+MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
RUN_DEPENDS = devel/py-backports-ssl-match-hostname \
devel/py-gevent \
devel/py-certifi
-TEST_DEPENDS = ${RUN_DEPENDS} \
- devel/py-test
+
+NO_TEST = Yes
.include <bsd.port.mk>
Index: net/py-geventhttpclient/distinfo
===================================================================
RCS file: /cvs/ports/net/py-geventhttpclient/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- net/py-geventhttpclient/distinfo 12 Oct 2014 20:45:56 -0000 1.1.1.1
+++ net/py-geventhttpclient/distinfo 30 May 2016 10:23:24 -0000
@@ -1,2 +1,2 @@
-SHA256 (py-geventhttpclient-1.1.0.tar.gz) =
HTjtMzgClVqK9dAXrEkGqyRFDZ01pIEaoFtyTnB28MY=
-SIZE (py-geventhttpclient-1.1.0.tar.gz) = 163921
+SHA256 (geventhttpclient-1.2.0.tar.gz) =
3xMSCFa/mgW/EAX9MwEUAYRmALceDViant9/8HFoOGg=
+SIZE (geventhttpclient-1.2.0.tar.gz) = 34075
Index: net/py-geventhttpclient/patches/patch-MANIFEST_in
===================================================================
RCS file: net/py-geventhttpclient/patches/patch-MANIFEST_in
diff -N net/py-geventhttpclient/patches/patch-MANIFEST_in
--- net/py-geventhttpclient/patches/patch-MANIFEST_in 12 Oct 2014 20:45:56
-0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-$OpenBSD: patch-MANIFEST_in,v 1.1.1.1 2014/10/12 20:45:56 juanfra Exp $
---- MANIFEST.in.orig Mon Oct 6 16:56:43 2014
-+++ MANIFEST.in Mon Oct 6 16:56:46 2014
-@@ -1,5 +1,4 @@
- include src/geventhttpclient/*.py
--include src/geventhttpclient/cacert.pem
- include ext/*.c
- include ext/*.h
-
Index:
net/py-geventhttpclient/patches/patch-src_geventhttpclient_connectionpool_py
===================================================================
RCS file:
net/py-geventhttpclient/patches/patch-src_geventhttpclient_connectionpool_py
diff -N
net/py-geventhttpclient/patches/patch-src_geventhttpclient_connectionpool_py
---
net/py-geventhttpclient/patches/patch-src_geventhttpclient_connectionpool_py
23 Sep 2015 07:10:28 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_geventhttpclient_connectionpool_py,v 1.1 2015/09/23
07:10:28 czarkoff Exp $
---- src/geventhttpclient/connectionpool.py.orig Sat Sep 19 11:20:54 2015
-+++ src/geventhttpclient/connectionpool.py Sat Sep 19 11:21:19 2015
-@@ -149,7 +149,7 @@ class ConnectionPool(object):
- class SSLConnectionPool(ConnectionPool):
-
- default_options = {
-- 'ssl_version': gevent.ssl.PROTOCOL_SSLv3,
-+ 'ssl_version': gevent.ssl.PROTOCOL_SSLv23,
- 'ca_certs': CA_CERTS,
- 'cert_reqs': gevent.ssl.CERT_REQUIRED
- }
Index: devel/py-dulwich/Makefile
===================================================================
RCS file: /cvs/ports/devel/py-dulwich/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- devel/py-dulwich/Makefile 21 Dec 2015 22:12:23 -0000 1.22
+++ devel/py-dulwich/Makefile 30 May 2016 11:37:22 -0000
@@ -2,9 +2,9 @@
COMMENT = pure Python implementation of Git file formats and
protocols
-MODPY_EGG_VERSION = 0.12.0
+MODPY_EGG_VERSION = 0.13.0
DISTNAME = dulwich-${MODPY_EGG_VERSION}
-PKGNAME = py-${DISTNAME}
+PKGNAME = ${MODPY_PY_PREFIX}${DISTNAME}
CATEGORIES = devel
@@ -21,20 +21,17 @@ MODULES = lang/python
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
-RUN_DEPENDS = devel/py-gevent \
- net/py-geventhttpclient
+RUN_DEPENDS = net/py-geventhttpclient
# One test fails due to the lack of OpenStack SWIFT.
# The other failed tests are related to this bug:
# https://github.com/surfly/gevent/issues/446
TEST_DEPENDS = ${RUN_DEPENDS} \
- devel/py-mock \
devel/py-nose \
devel/git,-main
-
do-test:
- cd ${WRKSRC} && nosetests
+ nosetests -w ${WRKSRC}
post-install:
rm -R ${PREFIX}/lib/python${MODPY_VERSION}/site-packages/docs
Index: devel/py-dulwich/distinfo
===================================================================
RCS file: /cvs/ports/devel/py-dulwich/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- devel/py-dulwich/distinfo 21 Dec 2015 22:12:23 -0000 1.8
+++ devel/py-dulwich/distinfo 30 May 2016 09:17:28 -0000
@@ -1,2 +1,2 @@
-SHA256 (dulwich-0.12.0.tar.gz) = j5Bw837sYXWqtg1wZCRrW2RTsvqzQliRAfHI/toKDMY=
-SIZE (dulwich-0.12.0.tar.gz) = 293900
+SHA256 (dulwich-0.13.0.tar.gz) = jtNTNOIs+T59z9URPY4mIEGWf+TDzq1eJiyRAvPmMjg=
+SIZE (dulwich-0.13.0.tar.gz) = 289213
Index: devel/py-dulwich/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-dulwich/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- devel/py-dulwich/pkg/PLIST 21 Dec 2015 22:12:23 -0000 1.7
+++ devel/py-dulwich/pkg/PLIST 30 May 2016 11:36:54 -0000
@@ -10,8 +10,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/dulwich-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/dulwich/__init__.py
lib/python${MODPY_VERSION}/site-packages/dulwich/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/dulwich/_compat.py
-lib/python${MODPY_VERSION}/site-packages/dulwich/_compat.pyc
lib/python${MODPY_VERSION}/site-packages/dulwich/_diff_tree.c
lib/python${MODPY_VERSION}/site-packages/dulwich/_diff_tree.so
lib/python${MODPY_VERSION}/site-packages/dulwich/_objects.c
Index: devel/py-hg-git/Makefile
===================================================================
RCS file: /cvs/ports/devel/py-hg-git/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- devel/py-hg-git/Makefile 18 Jan 2016 21:58:51 -0000 1.22
+++ devel/py-hg-git/Makefile 30 May 2016 12:23:29 -0000
@@ -2,8 +2,8 @@
COMMENT = mercurial extension to work with git repositories
-MODPY_EGG_VERSION = 0.8.4
-DISTNAME = py-hg-git-${MODPY_EGG_VERSION}
+MODPY_EGG_VERSION = 0.8.5
+DISTNAME = ${MODPY_PY_PREFIX}hg-git-${MODPY_EGG_VERSION}
CATEGORIES = devel
Index: devel/py-hg-git/distinfo
===================================================================
RCS file: /cvs/ports/devel/py-hg-git/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- devel/py-hg-git/distinfo 18 Jan 2016 21:58:51 -0000 1.11
+++ devel/py-hg-git/distinfo 30 May 2016 11:39:15 -0000
@@ -1,2 +1,2 @@
-SHA256 (py-hg-git-0.8.4.tar.gz) = q03ZGaWTGGjKhuxQ/viJAriFejsMSTPXtOgXxBSm2RA=
-SIZE (py-hg-git-0.8.4.tar.gz) = 100975
+SHA256 (py-hg-git-0.8.5.tar.gz) = O2YiQRm9k9hw7BpV8H+uAZG4T/OugQxVcIHPJnm/OvQ=
+SIZE (py-hg-git-0.8.5.tar.gz) = 101206
Index: devel/py-hg-git/patches/patch-tests_test-renames_t
===================================================================
RCS file: devel/py-hg-git/patches/patch-tests_test-renames_t
diff -N devel/py-hg-git/patches/patch-tests_test-renames_t
--- devel/py-hg-git/patches/patch-tests_test-renames_t 19 Mar 2015 08:05:56
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-tests_test-renames_t,v 1.1 2015/03/19 08:05:56 czarkoff Exp $
---- tests/test-renames.t.orig Thu Mar 19 07:11:59 2015
-+++ tests/test-renames.t Thu Mar 19 07:12:21 2015
-@@ -10,7 +10,7 @@ Test that rename detection works
-
- $ git init -q gitrepo
- $ cd gitrepo
-- $ for i in $(seq 1 10); do echo $i >> alpha; done
-+ $ for i in 1 2 3 4 5 6 7 8 9 10; do echo $i >> alpha; done
- $ git add alpha
- $ fn_git_commit -malpha
-
