On Tue, 23 Apr 2019 13:55:33 +0100, Stuart Henderson
<[email protected]> wrote:
> I haven't gone through any testing with these yet, but if anyone
> wants to help prepare for python 3.7 then testing these with
> dependencies (with the in-tree Python versions) would be helpful.
>
> databases/py-psycopg2/Makefile
ok
> www/py-aiohttp/Makefile
You're missing some rdep and we don't package some tests so NO_TEST is
needed. Diff attached to fix, with my diff applied, ok
> www/py-gunicorn/Makefile
comments inlined + diff attached
with my diff applied, ok
> www/py-tornado/Makefile
I haven't looked at it
> Index: www/py-gunicorn/Makefile
> ===================================================================
> RCS file: /cvs/ports/www/py-gunicorn/Makefile,v
> retrieving revision 1.20
> diff -u -p -r1.20 Makefile
> --- www/py-gunicorn/Makefile 4 May 2018 11:37:24 -0000
> 1.20 +++ www/py-gunicorn/Makefile 20 Apr 2019 10:10:12 -0000
> @@ -2,7 +2,7 @@
>
> COMMENT = Python WSGI HTTP server
>
> -MODPY_EGG_VERSION = 19.8.1
> +MODPY_EGG_VERSION = 19.9.0
> DISTNAME = gunicorn-${MODPY_EGG_VERSION}
> PKGNAME = py-${DISTNAME}
> CATEGORIES = www
> @@ -25,7 +25,8 @@ RUN_DEPENDS += www/py-aiohttp \
> www/py-multidict
> .endif
> TEST_DEPENDS = devel/py-test${MODPY_FLAVOR} \
> - devel/py-test-cov${MODPY_FLAVOR}
> + devel/py-test-cov${MODPY_FLAVOR} \
> + ${BASE_PKGPATH}=${MODPY_EGG_VERSION}
for psycopg2, you used ${FULLPKGNAME}:${BUILD_PKGPATH}, what's the
difference?
You're missing a tdep on py-coverage and while their check was ok
during last gunicorn update, we updated py-coverage and now we're
outside the bound so we need to remove the check in
patches/patch-requirements_test_txt
--- Makefile.orig Wed Apr 24 13:26:40 2019
+++ Makefile Wed Apr 24 13:31:04 2019
@@ -19,11 +19,16 @@ MODPY_SETUPTOOLS = Yes
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
-# py-multidict is python3 only
-RUN_DEPENDS = textproc/py-chardet${MODPY_FLAVOR} \
- www/py-multidict
+# only py-chardet isn't python3 only
+RUN_DEPENDS = devel/py-async-timeout \
+ textproc/py-chardet${MODPY_FLAVOR} \
+ www/py-multidict \
+ www/py-yarl
TEST_DEPENDS = ${RUN_DEPENDS} \
devel/py-test${MODPY_FLAVOR} \
www/py-gunicorn${MODPY_FLAVOR}
+
+# we don't have any port for pytest-{xdist,timeout}
+NO_TEST = Yes
.include <bsd.port.mk>
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/py-gunicorn/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile 4 May 2018 11:37:24 -0000 1.20
+++ Makefile 24 Apr 2019 18:20:39 -0000
@@ -2,7 +2,7 @@
COMMENT = Python WSGI HTTP server
-MODPY_EGG_VERSION = 19.8.1
+MODPY_EGG_VERSION = 19.9.0
DISTNAME = gunicorn-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
CATEGORIES = www
@@ -24,8 +24,10 @@ FLAVOR ?=
RUN_DEPENDS += www/py-aiohttp \
www/py-multidict
.endif
-TEST_DEPENDS = devel/py-test${MODPY_FLAVOR} \
- devel/py-test-cov${MODPY_FLAVOR}
+TEST_DEPENDS = devel/py-coverage${MODPY_FLAVOR} \
+ devel/py-test${MODPY_FLAVOR} \
+ devel/py-test-cov${MODPY_FLAVOR} \
+ ${BASE_PKGPATH}=${MODPY_EGG_VERSION}
.if ! ${FLAVOR:Mpython3}
TEST_DEPENDS += devel/py-mock
.endif
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/py-gunicorn/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo 4 May 2018 11:37:24 -0000 1.13
+++ distinfo 24 Apr 2019 18:20:39 -0000
@@ -1,2 +1,2 @@
-SHA256 (gunicorn-19.8.1.tar.gz) = vFkAWXnvttLdfVunLZn4qEIoYq0X/zoW6QBoRjDdKhA=
-SIZE (gunicorn-19.8.1.tar.gz) = 415541
+SHA256 (gunicorn-19.9.0.tar.gz) = +iZiCXxm+SD1P3BiHGxYyko8TTQ0IF5gjhIbWztx9PM=
+SIZE (gunicorn-19.9.0.tar.gz) = 415774
Index: patches/patch-requirements_test_txt
===================================================================
RCS file: /cvs/ports/www/py-gunicorn/patches/patch-requirements_test_txt,v
retrieving revision 1.3
diff -u -p -r1.3 patch-requirements_test_txt
--- patches/patch-requirements_test_txt 4 May 2018 11:37:24 -0000 1.3
+++ patches/patch-requirements_test_txt 24 Apr 2019 18:20:39 -0000
@@ -6,8 +6,9 @@ Index: requirements_test.txt
--- requirements_test.txt.orig
+++ requirements_test.txt
@@ -1,3 +1,3 @@
- coverage>=4.0,<4.4 # TODO: https://github.com/benoitc/gunicorn/issues/1548
--pytest==3.0.5
--pytest-cov==2.4.0
+-coverage>=4.0,<4.4 # TODO: https://github.com/benoitc/gunicorn/issues/1548
+-pytest==3.2.5 # TODO: upgrade to latest version requires drop support to Python 2.6
+-pytest-cov==2.5.1
++coverage
+pytest
+pytest-cov
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/py-gunicorn/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST 4 May 2018 11:37:24 -0000 1.8
+++ pkg/PLIST 24 Apr 2019 18:20:39 -0000
@@ -80,8 +80,8 @@ lib/python${MODPY_VERSION}/site-packages
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/${MODPY_PYCACHE}_gaiohttp.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/${MODPY_PYCACHE}async.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/${MODPY_PYCACHE}base_async.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/${MODPY_PYCACHE}gaiohttp.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/${MODPY_PYCACHE}geventlet.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/${MODPY_PYCACHE}ggevent.${MODPY_PYC_MAGIC_TAG}pyc
@@ -90,8 +90,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/${MODPY_PYCACHE}sync.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/${MODPY_PYCACHE}workertmp.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/_gaiohttp.py
-lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/async.py
lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/base.py
+lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/base_async.py
lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/gaiohttp.py
lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/geventlet.py
lib/python${MODPY_VERSION}/site-packages/gunicorn/workers/ggevent.py
