On 2021/12/07 19:47, Solene Rapenne wrote:
> On Fri, 03 Dec 2021 19:24:22 +0000
> Stuart Henderson <s...@spacehopper.org>:
>
> > The postgresql MODULES file has scaffolding for setting up a test database
> > that is run in an isolated database server, only for the use of the port
> > issuing it for testing.
> >
>
> I've been able to use the postgresql module to make the postgresql test to
> work.
>
> Not all tests are passing but the test target doesn't fail anymore!
>
> Index: Makefile
> ===================================================================
> RCS file: /home/reposync/ports/databases/py-peewee/Makefile,v
> retrieving revision 1.24
> diff -u -p -r1.24 Makefile
> --- Makefile 2 Nov 2021 00:00:16 -0000 1.24
> +++ Makefile 7 Dec 2021 09:31:55 -0000
> @@ -2,10 +2,9 @@
>
> COMMENT= small expressive ORM
>
> -MODPY_EGG_VERSION= 2.8.3
> +MODPY_EGG_VERSION= 3.14.8
> DISTNAME= peewee-${MODPY_EGG_VERSION}
> PKGNAME= py-${DISTNAME}
> -REVISION= 9
>
> GH_ACCOUNT= coleifer
> GH_PROJECT= peewee
> @@ -20,12 +19,21 @@ PERMIT_PACKAGE= Yes
>
> BUILD_DEPENDS= textproc/py-sphinx,python3>=4.0.2
>
> +TEST_DEPENDS= databases/py-psycopg2 \
Missing ${MODPY_FLAVOR}
> + databases/sqlite3
> +
> FLAVORS= python3
> FLAVOR= python3
>
> -MODULES= lang/python
> +MODULES= databases/postgresql \
> + lang/python
> +
whitespace nit
> MODPY_SETUPTOOLS= Yes
>
> +# required to run tests with postgresql support
> +MODPOSTGRESQL_TEST_DBNAME= peewee_test
> +MODPOSTGRESQL_TEST_CMD= cd ${WRKSRC} && python${MODPY_VERSION}
> runtests.py
please use ${MODPY_BIN} not python${MODPY_VERSION}
otherwise OK
> +
> MAKE_ENV += PYTHONPATH=${WRKSRC}
> DOCSRC = ${WRKSRC}/docs
> post-build:
> @@ -40,7 +48,5 @@ post-install:
> cd ${WRKSRC}/examples && pax -rw * ${EXAMPLES}
> mv ${PREFIX}/bin/pwiz.py ${PREFIX}/bin/pwiz
>
> -do-test:
> - cd ${WRKSRC} && ${MODPY_BIN} tests.py
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /home/reposync/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 3 Dec 2021 11:03:34 -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.8.tar.gz) = fWSHpi7Kies0UahFYXJUpmRq/SsBgIRrqur34bszhPQ=
> +SIZE (peewee-3.14.8.tar.gz) = 891123
> Index: patches/patch-setup_py
> ===================================================================
> RCS file: patches/patch-setup_py
> diff -N patches/patch-setup_py
> --- patches/patch-setup_py 17 Sep 2016 15:33:39 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,25 +0,0 @@
> -$OpenBSD: patch-setup_py,v 1.2 2016/09/17 15:33:39 danj Exp $
> -
> -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:
> -- cython_installed = True
> -+ cython_installed = False
> -
> - speedups_ext_module = Extension(
> - 'playhouse._speedups',
> Index: pkg/PLIST
> ===================================================================
> RCS file: /home/reposync/ports/databases/py-peewee/pkg/PLIST,v
> retrieving revision 1.14
> diff -u -p -r1.14 PLIST
> --- pkg/PLIST 29 Oct 2021 15:38:41 -0000 1.14
> +++ pkg/PLIST 3 Dec 2021 11:03:34 -0000
> @@ -1,13 +1,15 @@
> @comment $OpenBSD: PLIST,v 1.14 2021/10/29 15:38:41 sthen Exp $
> -@pkgpath databases/py-peewee
> @conflict py-peewee-<2.8.3p4
> +@pkgpath databases/py-peewee
> bin/pwiz
> +lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
>
> lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}peewee.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}pwiz.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/peewee-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
>
> 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/
> @@ -15,57 +17,57 @@ 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}psycopg3_ext.${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/psycopg3_ext.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
> @@ -73,17 +75,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/basic.css
> share/doc/${MODPY_PY_PREFIX}peewee/_static/classic.css
> @@ -107,20 +115,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
> @@ -153,9 +168,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
>
