HI, ports@:
Here is the revised patch for py-peewee:
i) Update to 3.14.0
ii) Switch to python3
iii) Add NO_SQLITE=1 to MAKE_ENV to avoid error message when build.
It build well and run well and pass the regression tests.
Coments?
wen
________________________________
发件人: owner-po...@openbsd.org <owner-po...@openbsd.org> 代表 wen heping
<wenheping2...@hotmail.com>
发送时间: 2020年8月19日 7:19
收件人: ports@openbsd.org <ports@openbsd.org>
主题: 回复: [Update] databases/py-peewee: Update to 3.13.3
ping ...
________________________________
发件人: owner-po...@openbsd.org <owner-po...@openbsd.org> 代表 wen heping
<wenheping2...@hotmail.com>
发送时间: 2020年8月4日 12:25
收件人: ports@openbsd.org <ports@openbsd.org>
主题: [Update] databases/py-peewee: Update to 3.13.3
Hi, ports@:
Here is a patch for databases/py-peewee:
i) Update to 3.13.3
ii) Add py-psycopg2 as TEST_DEPENDS
It build well and run well and pass the tests on amd64-current system,
both with py2 and py3.
No other ports depends on it.
Cheers !
wen
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/py-peewee/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile 10 Dec 2020 02:20:29 -0000 1.18
+++ Makefile 7 Feb 2021 01:43:21 -0000
@@ -2,10 +2,9 @@
COMMENT= small expressive ORM
-MODPY_EGG_VERSION= 2.8.3
+MODPY_EGG_VERSION= 3.14.0
DISTNAME= peewee-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
-REVISION= 3
GH_ACCOUNT= coleifer
GH_PROJECT= peewee
@@ -20,13 +19,17 @@ PERMIT_PACKAGE= Yes
BUILD_DEPENDS= textproc/py-sphinx${MODPY_FLAVOR}>=1.5
+TEST_DEPENDS= databases/py-psycopg2${MODPY_FLAVOR}
+
FLAVORS= python3
-FLAVOR?=
+FLAVOR?= python3
MODULES= lang/python
MODPY_SETUPTOOLS= Yes
-MAKE_ENV += PYTHONPATH=${WRKSRC}
SPHINXBUILD=${LOCALBASE}/bin/sphinx-build${MODPY_BIN_SUFFIX}
+MAKE_ENV += PYTHONPATH=${WRKSRC} \
+ SPHINXBUILD=${LOCALBASE}/bin/sphinx-build${MODPY_BIN_SUFFIX}\
+ NO_SQLITE=1
DOCSRC = ${WRKSRC}/docs
post-build:
cd ${DOCSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} html
@@ -41,6 +44,6 @@ post-install:
mv ${PREFIX}/bin/pwiz.py ${PREFIX}/bin/pwiz${MODPY_BIN_SUFFIX}
do-test:
- cd ${WRKSRC} && ${MODPY_BIN} tests.py
+ cd ${WRKSRC} && ${MODPY_BIN} runtests.py
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/py-peewee/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo 17 Sep 2016 15:33:39 -0000 1.7
+++ distinfo 7 Feb 2021 01:43:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (peewee-2.8.3.tar.gz) = NW3QQbn6Ztbny8T/ROyHhFq/fXRxQn13vvD4+jye2dw=
-SIZE (peewee-2.8.3.tar.gz) = 639529
+SHA256 (peewee-3.14.0.tar.gz) = dUHeOElT5L/jCF0YRRKoEP+/Gm7lVQFnGHYvKHf6iKQ=
+SIZE (peewee-3.14.0.tar.gz) = 877299
Index: patches/patch-setup_py
===================================================================
RCS file: /cvs/ports/databases/py-peewee/patches/patch-setup_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-setup_py
--- patches/patch-setup_py 17 Sep 2016 15:33:39 -0000 1.2
+++ patches/patch-setup_py 7 Feb 2021 01:43:21 -0000
@@ -1,25 +1,37 @@
-$OpenBSD: patch-setup_py,v 1.2 2016/09/17 15:33:39 danj Exp $
+$OpenBSD$
+- disable cython
-1. For option --single-version-externally-managed
-2. Disable cython
-
---- 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
-
-@@ -28,7 +28,7 @@ else:
- 'C extensions, install Cython >=' + cython_min_version +
- '.')
- else:
+Index: setup.py
+--- setup.py.orig
++++ setup.py
+@@ -19,18 +19,18 @@ extension_support = True # Assume we are building C e
+ # Check if Cython is available and use it to generate extension modules. If
+ # Cython is not installed, we will fall back to using the pre-generated C
files
+ # (so long as we're running on CPython).
+-try:
+- from Cython.Build import cythonize
+- from Cython.Distutils import build_ext
+- from Cython.Distutils.extension import Extension
+-except ImportError:
+- cython_installed = False
+-else:
+- if platform.python_implementation() != 'CPython':
+- cython_installed = extension_support = False
+- warnings.warn('C extensions disabled as you are not using CPython.')
+- else:
- cython_installed = True
-+ cython_installed = False
++#try:
++# from Cython.Build import cythonize
++# from Cython.Distutils import build_ext
++# from Cython.Distutils.extension import Extension
++#except ImportError:
++# cython_installed = False
++#else:
++# if platform.python_implementation() != 'CPython':
++# cython_installed = extension_support = False
++# warnings.warn('C extensions disabled as you are not using CPython.')
++# else:
++cython_installed = False
- speedups_ext_module = Extension(
- 'playhouse._speedups',
+ if 'sdist' in sys.argv and not cython_installed:
+ raise Exception('Building sdist requires that Cython be installed.')
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/py-peewee/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- pkg/PLIST 10 Dec 2020 02:20:29 -0000 1.10
+++ pkg/PLIST 7 Feb 2021 01:43:21 -0000
@@ -6,6 +6,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/peewee-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/peewee-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/peewee-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/peewee-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
lib/python${MODPY_VERSION}/site-packages/peewee-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/peewee.py
lib/python${MODPY_VERSION}/site-packages/playhouse/
@@ -13,57 +14,55 @@ lib/python${MODPY_VERSION}/site-packages
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/playhouse/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/playhouse/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/playhouse/${MODPY_PYCACHE}apsw_ext.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/playhouse/${MODPY_PYCACHE}berkeleydb.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/playhouse/${MODPY_PYCACHE}csv_loader.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/playhouse/${MODPY_PYCACHE}csv_utils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/playhouse/${MODPY_PYCACHE}cockroachdb.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/playhouse/${MODPY_PYCACHE}dataset.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/playhouse/${MODPY_PYCACHE}db_url.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/playhouse/${MODPY_PYCACHE}djpeewee.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/playhouse/${MODPY_PYCACHE}fields.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/playhouse/${MODPY_PYCACHE}flask_utils.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/playhouse/${MODPY_PYCACHE}gfk.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/playhouse/${MODPY_PYCACHE}hybrid.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/playhouse/${MODPY_PYCACHE}kv.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/playhouse/${MODPY_PYCACHE}migrate.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/playhouse/${MODPY_PYCACHE}mysql_ext.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/playhouse/${MODPY_PYCACHE}pool.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/playhouse/${MODPY_PYCACHE}postgres_ext.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/playhouse/${MODPY_PYCACHE}read_slave.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/playhouse/${MODPY_PYCACHE}reflection.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/playhouse/${MODPY_PYCACHE}shortcuts.${MODPY_PYC_MAGIC_TAG}pyc
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_changelog.${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}sqliteq.${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
-lib/python${MODPY_VERSION}/site-packages/playhouse/csv_loader.py
-lib/python${MODPY_VERSION}/site-packages/playhouse/csv_utils.py
+lib/python${MODPY_VERSION}/site-packages/playhouse/cockroachdb.py
lib/python${MODPY_VERSION}/site-packages/playhouse/dataset.py
lib/python${MODPY_VERSION}/site-packages/playhouse/db_url.py
-lib/python${MODPY_VERSION}/site-packages/playhouse/djpeewee.py
lib/python${MODPY_VERSION}/site-packages/playhouse/fields.py
lib/python${MODPY_VERSION}/site-packages/playhouse/flask_utils.py
-lib/python${MODPY_VERSION}/site-packages/playhouse/gfk.py
lib/python${MODPY_VERSION}/site-packages/playhouse/hybrid.py
lib/python${MODPY_VERSION}/site-packages/playhouse/kv.py
lib/python${MODPY_VERSION}/site-packages/playhouse/migrate.py
+lib/python${MODPY_VERSION}/site-packages/playhouse/mysql_ext.py
lib/python${MODPY_VERSION}/site-packages/playhouse/pool.py
lib/python${MODPY_VERSION}/site-packages/playhouse/postgres_ext.py
-lib/python${MODPY_VERSION}/site-packages/playhouse/read_slave.py
lib/python${MODPY_VERSION}/site-packages/playhouse/reflection.py
lib/python${MODPY_VERSION}/site-packages/playhouse/shortcuts.py
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_changelog.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/sqliteq.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/
share/doc/${MODPY_PY_PREFIX}peewee/_images/
+share/doc/${MODPY_PY_PREFIX}peewee/_images/crdb.png
share/doc/${MODPY_PY_PREFIX}peewee/_images/mysql.png
-share/doc/${MODPY_PY_PREFIX}peewee/_images/peewee-logo.png
+share/doc/${MODPY_PY_PREFIX}peewee/_images/peewee3-logo.png
share/doc/${MODPY_PY_PREFIX}peewee/_images/postgresql.png
+share/doc/${MODPY_PY_PREFIX}peewee/_images/schema-horizontal.png
share/doc/${MODPY_PY_PREFIX}peewee/_images/schema.jpg
share/doc/${MODPY_PY_PREFIX}peewee/_images/sqlite.png
share/doc/${MODPY_PY_PREFIX}peewee/_images/tweepee.jpg
@@ -71,17 +70,23 @@ share/doc/${MODPY_PY_PREFIX}peewee/_sour
share/doc/${MODPY_PY_PREFIX}peewee/_sources/index.rst.txt
share/doc/${MODPY_PY_PREFIX}peewee/_sources/peewee/
share/doc/${MODPY_PY_PREFIX}peewee/_sources/peewee/api.rst.txt
+share/doc/${MODPY_PY_PREFIX}peewee/_sources/peewee/changes.rst.txt
share/doc/${MODPY_PY_PREFIX}peewee/_sources/peewee/contributing.rst.txt
+share/doc/${MODPY_PY_PREFIX}peewee/_sources/peewee/crdb.rst.txt
share/doc/${MODPY_PY_PREFIX}peewee/_sources/peewee/database.rst.txt
share/doc/${MODPY_PY_PREFIX}peewee/_sources/peewee/example.rst.txt
share/doc/${MODPY_PY_PREFIX}peewee/_sources/peewee/hacks.rst.txt
share/doc/${MODPY_PY_PREFIX}peewee/_sources/peewee/installation.rst.txt
+share/doc/${MODPY_PY_PREFIX}peewee/_sources/peewee/interactive.rst.txt
share/doc/${MODPY_PY_PREFIX}peewee/_sources/peewee/models.rst.txt
-share/doc/${MODPY_PY_PREFIX}peewee/_sources/peewee/more-resources.rst.txt
share/doc/${MODPY_PY_PREFIX}peewee/_sources/peewee/playhouse.rst.txt
+share/doc/${MODPY_PY_PREFIX}peewee/_sources/peewee/query_builder.rst.txt
+share/doc/${MODPY_PY_PREFIX}peewee/_sources/peewee/query_examples.rst.txt
+share/doc/${MODPY_PY_PREFIX}peewee/_sources/peewee/query_operators.rst.txt
share/doc/${MODPY_PY_PREFIX}peewee/_sources/peewee/querying.rst.txt
share/doc/${MODPY_PY_PREFIX}peewee/_sources/peewee/quickstart.rst.txt
-share/doc/${MODPY_PY_PREFIX}peewee/_sources/peewee/transactions.rst.txt
+share/doc/${MODPY_PY_PREFIX}peewee/_sources/peewee/relationships.rst.txt
+share/doc/${MODPY_PY_PREFIX}peewee/_sources/peewee/sqlite_ext.rst.txt
share/doc/${MODPY_PY_PREFIX}peewee/_static/
share/doc/${MODPY_PY_PREFIX}peewee/_static/ajax-loader.gif
share/doc/${MODPY_PY_PREFIX}peewee/_static/basic.css
@@ -111,20 +116,27 @@ share/doc/${MODPY_PY_PREFIX}peewee/index
share/doc/${MODPY_PY_PREFIX}peewee/objects.inv
share/doc/${MODPY_PY_PREFIX}peewee/peewee/
share/doc/${MODPY_PY_PREFIX}peewee/peewee/api.html
+share/doc/${MODPY_PY_PREFIX}peewee/peewee/changes.html
share/doc/${MODPY_PY_PREFIX}peewee/peewee/contributing.html
+share/doc/${MODPY_PY_PREFIX}peewee/peewee/crdb.html
share/doc/${MODPY_PY_PREFIX}peewee/peewee/database.html
share/doc/${MODPY_PY_PREFIX}peewee/peewee/example.html
share/doc/${MODPY_PY_PREFIX}peewee/peewee/hacks.html
share/doc/${MODPY_PY_PREFIX}peewee/peewee/installation.html
+share/doc/${MODPY_PY_PREFIX}peewee/peewee/interactive.html
share/doc/${MODPY_PY_PREFIX}peewee/peewee/models.html
-share/doc/${MODPY_PY_PREFIX}peewee/peewee/more-resources.html
share/doc/${MODPY_PY_PREFIX}peewee/peewee/playhouse.html
+share/doc/${MODPY_PY_PREFIX}peewee/peewee/query_builder.html
+share/doc/${MODPY_PY_PREFIX}peewee/peewee/query_examples.html
+share/doc/${MODPY_PY_PREFIX}peewee/peewee/query_operators.html
share/doc/${MODPY_PY_PREFIX}peewee/peewee/querying.html
share/doc/${MODPY_PY_PREFIX}peewee/peewee/quickstart.html
-share/doc/${MODPY_PY_PREFIX}peewee/peewee/transactions.html
+share/doc/${MODPY_PY_PREFIX}peewee/peewee/relationships.html
+share/doc/${MODPY_PY_PREFIX}peewee/peewee/sqlite_ext.html
share/doc/${MODPY_PY_PREFIX}peewee/search.html
share/doc/${MODPY_PY_PREFIX}peewee/searchindex.js
share/examples/${MODPY_PY_PREFIX}peewee/
+share/examples/${MODPY_PY_PREFIX}peewee/adjacency_list.py
share/examples/${MODPY_PY_PREFIX}peewee/analytics/
share/examples/${MODPY_PY_PREFIX}peewee/analytics/app.py
share/examples/${MODPY_PY_PREFIX}peewee/analytics/reports.py
@@ -157,9 +169,9 @@ share/examples/${MODPY_PY_PREFIX}peewee/
share/examples/${MODPY_PY_PREFIX}peewee/blog/templates/login.html
share/examples/${MODPY_PY_PREFIX}peewee/blog/templates/logout.html
share/examples/${MODPY_PY_PREFIX}peewee/diary.py
-share/examples/${MODPY_PY_PREFIX}peewee/redis_vtable/
-share/examples/${MODPY_PY_PREFIX}peewee/redis_vtable/README.md
-share/examples/${MODPY_PY_PREFIX}peewee/redis_vtable/redis_vtab.py
+share/examples/${MODPY_PY_PREFIX}peewee/graph.py
+share/examples/${MODPY_PY_PREFIX}peewee/hexastore.py
+share/examples/${MODPY_PY_PREFIX}peewee/reddit_ranking.py
share/examples/${MODPY_PY_PREFIX}peewee/twitter/
share/examples/${MODPY_PY_PREFIX}peewee/twitter/app.py
share/examples/${MODPY_PY_PREFIX}peewee/twitter/requirements.txt
