Hi,
Here are two different diff to update databases/py-peewee.
If cython is installed, it's used. I don't know if we want to use it or
not, hence two patches, one to use cython, the other to do without
cython. I'm rather for adding cython as a build depend and use it but
no strong opinion.
Thoughts? Ok?
Cheers,
Daniel
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/py-peewee/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile 16 Apr 2016 19:06:25 -0000 1.11
+++ Makefile 28 Aug 2016 07:56:07 -0000
@@ -3,10 +3,13 @@
PKG_ARCH= *
COMMENT= small expressive ORM
-MODPY_EGG_VERSION= 2.8.0
+MODPY_EGG_VERSION= 2.8.3
DISTNAME= peewee-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
-REVISION= 1
+
+GH_ACCOUNT= coleifer
+GH_PROJECT= peewee
+GH_TAGNAME= ${MODPY_EGG_VERSION}
CATEGORIES= databases
@@ -15,11 +18,8 @@ HOMEPAGE= http://docs.peewee-orm.com/
# MIT
PERMIT_PACKAGE_CDROM= Yes
-GH_ACCOUNT= coleifer
-GH_PROJECT= peewee
-GH_TAGNAME= ${MODPY_EGG_VERSION}
-
-BUILD_DEPENDS = textproc/py-sphinx${MODPY_FLAVOR}
+BUILD_DEPENDS= textproc/py-sphinx${MODPY_FLAVOR} \
+ lang/cython
FLAVORS= python3
FLAVOR?=
@@ -40,5 +40,8 @@ post-install:
${INSTALL_DATA_DIR} ${EXAMPLES}
cd ${WRKSRC}/examples && pax -rw * ${EXAMPLES}
mv ${PREFIX}/bin/pwiz.py ${PREFIX}/bin/pwiz${MODPY_BIN_SUFFIX}
+
+do-test:
+ cd ${WRKSRC} && ${MODPY_BIN} tests.py
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/py-peewee/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 6 Apr 2016 17:47:59 -0000 1.6
+++ distinfo 28 Aug 2016 07:56:07 -0000
@@ -1,2 +1,2 @@
-SHA256 (peewee-2.8.0.tar.gz) = XuJx1MobGQTdep2ZEr3CpaR7e1SsHo5pUNuhtbdGoNE=
-SIZE (peewee-2.8.0.tar.gz) = 615679
+SHA256 (peewee-2.8.3.tar.gz) = NW3QQbn6Ztbny8T/ROyHhFq/fXRxQn13vvD4+jye2dw=
+SIZE (peewee-2.8.3.tar.gz) = 639529
Index: patches/patch-setup_py
===================================================================
RCS file: /cvs/ports/databases/py-peewee/patches/patch-setup_py,v
retrieving revision 1.1
diff -u -p -r1.1 patch-setup_py
--- patches/patch-setup_py 6 Apr 2016 17:47:59 -0000 1.1
+++ patches/patch-setup_py 28 Aug 2016 07:56:07 -0000
@@ -2,13 +2,14 @@ $OpenBSD: patch-setup_py,v 1.1 2016/04/0
For option --single-version-externally-managed
---- setup.py.orig Fri Apr 1 20:25:54 2016
-+++ setup.py Fri Apr 1 20:26:10 2016
-@@ -1,6 +1,6 @@
+--- setup.py.orig Thu Aug 25 20:17:54 2016
++++ setup.py Sun Aug 28 09:32:29 2016
+@@ -1,7 +1,7 @@
import os
import sys
+ import warnings
-from distutils.core import setup
+from setuptools import setup
from distutils.extension import Extension
+ from distutils.version import StrictVersion
- f = open(os.path.join(os.path.dirname(__file__), 'README.rst'))
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/py-peewee/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST 15 Apr 2016 08:53:49 -0000 1.8
+++ pkg/PLIST 28 Aug 2016 07:56:07 -0000
@@ -33,6 +33,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/playhouse/${MODPY_PYCACHE}signals.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/playhouse/${MODPY_PYCACHE}sqlcipher_ext.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/playhouse/${MODPY_PYCACHE}sqlite_ext.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/playhouse/${MODPY_PYCACHE}sqlite_udf.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/playhouse/${MODPY_PYCACHE}test_utils.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/playhouse/apsw_ext.py
lib/python${MODPY_VERSION}/site-packages/playhouse/berkeleydb.py
@@ -55,6 +56,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/playhouse/signals.py
lib/python${MODPY_VERSION}/site-packages/playhouse/sqlcipher_ext.py
lib/python${MODPY_VERSION}/site-packages/playhouse/sqlite_ext.py
+lib/python${MODPY_VERSION}/site-packages/playhouse/sqlite_udf.py
lib/python${MODPY_VERSION}/site-packages/playhouse/test_utils.py
lib/python${MODPY_VERSION}/site-packages/pwiz.py
share/doc/${MODPY_PY_PREFIX}peewee/
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/py-peewee/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile 16 Apr 2016 19:06:25 -0000 1.11
+++ Makefile 28 Aug 2016 08:15:03 -0000
@@ -3,10 +3,13 @@
PKG_ARCH= *
COMMENT= small expressive ORM
-MODPY_EGG_VERSION= 2.8.0
+MODPY_EGG_VERSION= 2.8.3
DISTNAME= peewee-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
-REVISION= 1
+
+GH_ACCOUNT= coleifer
+GH_PROJECT= peewee
+GH_TAGNAME= ${MODPY_EGG_VERSION}
CATEGORIES= databases
@@ -15,11 +18,7 @@ HOMEPAGE= http://docs.peewee-orm.com/
# MIT
PERMIT_PACKAGE_CDROM= Yes
-GH_ACCOUNT= coleifer
-GH_PROJECT= peewee
-GH_TAGNAME= ${MODPY_EGG_VERSION}
-
-BUILD_DEPENDS = textproc/py-sphinx${MODPY_FLAVOR}
+BUILD_DEPENDS= textproc/py-sphinx${MODPY_FLAVOR}
FLAVORS= python3
FLAVOR?=
@@ -40,5 +39,8 @@ post-install:
${INSTALL_DATA_DIR} ${EXAMPLES}
cd ${WRKSRC}/examples && pax -rw * ${EXAMPLES}
mv ${PREFIX}/bin/pwiz.py ${PREFIX}/bin/pwiz${MODPY_BIN_SUFFIX}
+
+do-test:
+ cd ${WRKSRC} && ${MODPY_BIN} tests.py
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/py-peewee/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 6 Apr 2016 17:47:59 -0000 1.6
+++ distinfo 28 Aug 2016 08:15:03 -0000
@@ -1,2 +1,2 @@
-SHA256 (peewee-2.8.0.tar.gz) = XuJx1MobGQTdep2ZEr3CpaR7e1SsHo5pUNuhtbdGoNE=
-SIZE (peewee-2.8.0.tar.gz) = 615679
+SHA256 (peewee-2.8.3.tar.gz) = NW3QQbn6Ztbny8T/ROyHhFq/fXRxQn13vvD4+jye2dw=
+SIZE (peewee-2.8.3.tar.gz) = 639529
Index: patches/patch-setup_py
===================================================================
RCS file: /cvs/ports/databases/py-peewee/patches/patch-setup_py,v
retrieving revision 1.1
diff -u -p -r1.1 patch-setup_py
--- patches/patch-setup_py 6 Apr 2016 17:47:59 -0000 1.1
+++ patches/patch-setup_py 28 Aug 2016 08:15:03 -0000
@@ -1,14 +1,25 @@
$OpenBSD: patch-setup_py,v 1.1 2016/04/06 17:47:59 danj Exp $
-For option --single-version-externally-managed
+1. For option --single-version-externally-managed
+2. Disable cython
---- setup.py.orig Fri Apr 1 20:25:54 2016
-+++ setup.py Fri Apr 1 20:26:10 2016
-@@ -1,6 +1,6 @@
+--- setup.py.orig Thu Aug 25 20:17:54 2016
++++ setup.py Sun Aug 28 10:12:56 2016
+@@ -1,7 +1,7 @@
import os
import sys
+ import warnings
-from distutils.core import setup
+from setuptools import setup
from distutils.extension import Extension
+ from distutils.version import StrictVersion
- f = open(os.path.join(os.path.dirname(__file__), 'README.rst'))
+@@ -28,7 +28,7 @@ else:
+ 'C extensions, install Cython >=' + cython_min_version +
+ '.')
+ else:
+- cython_installed = True
++ cython_installed = False
+
+ speedups_ext_module = Extension(
+ 'playhouse._speedups',
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/py-peewee/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST 15 Apr 2016 08:53:49 -0000 1.8
+++ pkg/PLIST 28 Aug 2016 08:15:03 -0000
@@ -33,6 +33,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/playhouse/${MODPY_PYCACHE}signals.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/playhouse/${MODPY_PYCACHE}sqlcipher_ext.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/playhouse/${MODPY_PYCACHE}sqlite_ext.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/playhouse/${MODPY_PYCACHE}sqlite_udf.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/playhouse/${MODPY_PYCACHE}test_utils.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/playhouse/apsw_ext.py
lib/python${MODPY_VERSION}/site-packages/playhouse/berkeleydb.py
@@ -55,6 +56,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/playhouse/signals.py
lib/python${MODPY_VERSION}/site-packages/playhouse/sqlcipher_ext.py
lib/python${MODPY_VERSION}/site-packages/playhouse/sqlite_ext.py
+lib/python${MODPY_VERSION}/site-packages/playhouse/sqlite_udf.py
lib/python${MODPY_VERSION}/site-packages/playhouse/test_utils.py
lib/python${MODPY_VERSION}/site-packages/pwiz.py
share/doc/${MODPY_PY_PREFIX}peewee/
