On 2020/11/10 11:28, wen heping wrote:
> Revised patch, now it include:
> i) Update databases/Makefile to remove py-sqlparse
> and py-sqlalchemy-migrate
> ii) Update devel/quirks
> iii) Add "@pkgpath databases/py-sqlports" to pkg/PLIST
>
> Cheers !
> wen
> ________________________________
> 发件人: Stuart Henderson <s...@spacehopper.org>
> 发送时间: 2020年11月10日 16:05
> 收件人: wen heping <wenheping2...@hotmail.com>
> 抄送: ports@openbsd.org <ports@openbsd.org>
> 主题: Re: [Update] databases/py-sqlparse : Update to 0.4.1
>
> On 2020/11/10 07:53, wen heping wrote:
> > Hi, ports@:
> >
> > Here is a patch for databases/py-sqlparse:
> > i) Update to 0.4.1
> > ii) Switch to MODPY_DEFAULT_VERSION_3
>
> Whdn moving a port to py3-only, we are using this:
>
> FLAVORS= python3
> FLAVOR= python3
>
> otherwise things get confusing in dependent ports.
>
> It is also necessary to update the Makefile in the parent directory (so
> databases/Makefile) to remove the py2 version, add an entry to devel/quirks
> to merge the old version (see the many existing py- -> py3- entries),
> and add "@pkgpath databases/py-sqlports" to pkg/PLIST.
>
Oops typo, py-sqlparse rather than py-sqlports. But you have used it in
py-sqlalchemy-migrate as well directly. The whole point of this is to
replace the existing py2 package with the new py3 one so it needs
adapting for the port.
Diff inline fixes that, adds missed REVISION bumps, keeps ${MODPY_FLAVOR}
in the dependency, and stops renaming the scripts in /usr/local/bin with
the -3 suffix (which means that @conflict lines must be added too).
I think this is now right but I'm in a hurry today and might have missed
something so not going to commit it now, if someone else checks and is
OK with it then please go ahead :)
Index: databases/Makefile
===================================================================
RCS file: /cvs/ports/databases/Makefile,v
retrieving revision 1.406
diff -u -p -r1.406 Makefile
--- databases/Makefile 19 Aug 2020 02:21:51 -0000 1.406
+++ databases/Makefile 11 Nov 2020 10:15:53 -0000
@@ -189,13 +189,11 @@
SUBDIR += py-sql,python3
SUBDIR += py-sqlalchemy
SUBDIR += py-sqlalchemy,python3
- SUBDIR += py-sqlalchemy-migrate
SUBDIR += py-sqlalchemy-migrate,python3
SUBDIR += py-sqlite
SUBDIR += py-sqlite2
SUBDIR += py-sqlobject
SUBDIR += py-sqlobject,python3
- SUBDIR += py-sqlparse
SUBDIR += py-sqlparse,python3
SUBDIR += py-storm
SUBDIR += py-sybase
Index: databases/py-sqlalchemy-migrate/Makefile
===================================================================
RCS file: /cvs/ports/databases/py-sqlalchemy-migrate/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- databases/py-sqlalchemy-migrate/Makefile 3 Jul 2020 21:12:37 -0000
1.15
+++ databases/py-sqlalchemy-migrate/Makefile 11 Nov 2020 10:15:53 -0000
@@ -5,7 +5,7 @@ COMMENT = schema migration tools for SQ
MODPY_EGG_VERSION = 0.13.0
DISTNAME = sqlalchemy-migrate-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 0
+REVISION = 1
CATEGORIES = databases
@@ -26,15 +26,9 @@ RUN_DEPENDS = databases/py-sqlalchemy${
www/py-tempita${MODPY_FLAVOR}
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
# test needs unported tempest, py-cfgparse & py-scripttest
NO_TEST = Yes
-
-post-install:
- mv ${PREFIX}/bin/migrate \
- ${PREFIX}/bin/migrate${MODPY_BIN_SUFFIX}
- mv ${PREFIX}/bin/migrate-repository \
- ${PREFIX}/bin/migrate-repository${MODPY_BIN_SUFFIX}
.include <bsd.port.mk>
Index: databases/py-sqlalchemy-migrate/pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/py-sqlalchemy-migrate/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- databases/py-sqlalchemy-migrate/pkg/PLIST 30 Dec 2019 13:02:48 -0000
1.6
+++ databases/py-sqlalchemy-migrate/pkg/PLIST 11 Nov 2020 10:15:53 -0000
@@ -1,6 +1,8 @@
@comment $OpenBSD: PLIST,v 1.6 2019/12/30 13:02:48 sthen Exp $
-bin/migrate${MODPY_BIN_SUFFIX}
-bin/migrate-repository${MODPY_BIN_SUFFIX}
+@conflict py-sqlalchemy-migrate-*
+@pkgpath databases/py-sqlalchemy-migrate
+bin/migrate
+bin/migrate-repository
lib/python${MODPY_VERSION}/site-packages/migrate/
lib/python${MODPY_VERSION}/site-packages/migrate/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/migrate/${MODPY_PYCACHE}/
Index: databases/py-sqlparse/Makefile
===================================================================
RCS file: /cvs/ports/databases/py-sqlparse/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- databases/py-sqlparse/Makefile 3 Jul 2020 21:12:37 -0000 1.11
+++ databases/py-sqlparse/Makefile 11 Nov 2020 10:15:53 -0000
@@ -2,10 +2,9 @@
COMMENT = non-validating SQL parser
-MODPY_EGG_VERSION = 0.2.4
+MODPY_EGG_VERSION = 0.4.1
DISTNAME = sqlparse-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 1
CATEGORIES = databases
@@ -18,10 +17,7 @@ MODPY_SETUPTOOLS = Yes
MODPY_PYTEST = Yes
MODPY_PYTEST_ARGS = tests/
-FLAVORS = python3
-FLAVOR ?=
-
-post-install:
- mv ${PREFIX}/bin/sqlformat ${PREFIX}/bin/sqlformat${MODPY_BIN_SUFFIX}
+FLAVORS = python3
+FLAVOR = python3
.include <bsd.port.mk>
Index: databases/py-sqlparse/distinfo
===================================================================
RCS file: /cvs/ports/databases/py-sqlparse/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- databases/py-sqlparse/distinfo 14 Nov 2017 06:38:27 -0000 1.4
+++ databases/py-sqlparse/distinfo 11 Nov 2020 10:15:53 -0000
@@ -1,2 +1,2 @@
-SHA256 (sqlparse-0.2.4.tar.gz) = zgKERM+rg75Th1Ki/9tWvEF7d4T/NbuaMGJBNxeAfew=
-SIZE (sqlparse-0.2.4.tar.gz) = 61614
+SHA256 (sqlparse-0.4.1.tar.gz) = D5H9LoKcRDYsvPqz6a4S4iutqooprV/1mfnsEJ8EVOg=
+SIZE (sqlparse-0.4.1.tar.gz) = 67228
Index: databases/py-sqlparse/pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/py-sqlparse/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- databases/py-sqlparse/pkg/PLIST 7 Apr 2017 21:55:11 -0000 1.4
+++ databases/py-sqlparse/pkg/PLIST 11 Nov 2020 10:15:53 -0000
@@ -1,5 +1,7 @@
@comment $OpenBSD: PLIST,v 1.4 2017/04/07 21:55:11 sthen Exp $
-bin/sqlformat${MODPY_BIN_SUFFIX}
+@conflict py-sqlparse-*
+@pkgpath databases/py-sqlparse
+bin/sqlformat
lib/python${MODPY_VERSION}/site-packages/sqlparse/
lib/python${MODPY_VERSION}/site-packages/sqlparse-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/sqlparse-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@@ -13,7 +15,6 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSIO
lib/python${MODPY_VERSION}/site-packages/sqlparse/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/sqlparse/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/sqlparse/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/sqlparse/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/sqlparse/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/sqlparse/${MODPY_PYCACHE}formatter.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/sqlparse/${MODPY_PYCACHE}keywords.${MODPY_PYC_MAGIC_TAG}pyc
@@ -22,7 +23,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/sqlparse/${MODPY_PYCACHE}tokens.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/sqlparse/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/sqlparse/cli.py
-lib/python${MODPY_VERSION}/site-packages/sqlparse/compat.py
lib/python${MODPY_VERSION}/site-packages/sqlparse/engine/
lib/python${MODPY_VERSION}/site-packages/sqlparse/engine/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sqlparse/engine/${MODPY_PYCACHE}/
Index: devel/quirks/Makefile
===================================================================
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1091
diff -u -p -r1.1091 Makefile
--- devel/quirks/Makefile 9 Nov 2020 21:42:51 -0000 1.1091
+++ devel/quirks/Makefile 11 Nov 2020 10:15:53 -0000
@@ -5,7 +5,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-3.483
+PKGNAME = quirks-3.484
PKG_ARCH = *
MAINTAINER = Marc Espie <es...@openbsd.org>
Index: devel/quirks/files/Quirks.pm
===================================================================
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1109
diff -u -p -r1.1109 Quirks.pm
--- devel/quirks/files/Quirks.pm 9 Nov 2020 21:42:51 -0000 1.1109
+++ devel/quirks/files/Quirks.pm 11 Nov 2020 10:15:53 -0000
@@ -506,6 +506,8 @@ my $stem_extensions = {
'py-textfsm' => 'py3-textfsm',
'py-unicodecsv' => 'py3-unicodecsv',
'py-enchant' => 'py3-enchant',
+ 'py-sqlparse' => 'py3-sqlparse',
+ 'py-sqlalchemy-migrate' => 'py3-sqlalchemy-migrate',
};
my $obsolete_reason = {
