On Sat, Feb 27, 2021 at 10:25:21AM -0600, Lucas Raab wrote:
> On Sat, Feb 27, 2021 at 04:12:47PM +0000, Stuart Henderson wrote:
> > On 2021/02/27 09:52, Lucas Raab wrote:
> > > On Fri, Feb 26, 2021 at 08:52:11PM -0600, Lucas Raab wrote:
> > > > Hello,
> > > >
> > > > Here are some changes to move flask over to py3 and related packages.
> > > >
> > > > flask deps:
> > > > * www/py-itsdangerous (rdep to www/py-flask and py-httpbin)
> > > > * www/py-httpbin is included here as well
> > > > * www/py-werkzeug (rdep to devel/py-test-localserver and www/py-flask)
> > > > * devel/py-test-localserver is included here as well
> > > > * devel/py-blinker (only rdep to www/py-flask)
> > > >
> > > > flask rdeps:
> > > > * www/py-httpbin
> > > >
> > > > httpbin chain:
> > > > * devel/py-test-httpbin
> > > > * www/py-vcrpy
> > > > * test/py-test-vcr
> > > >
> > > > Follow-ups for later:
> > > > * move devel/py-click and related to py3
> > > > * update itsdangerous and werkzeug
> > > > * update flask
> > > >
> > > > Missing anything?
> > > >
> > > > cc: maintainer of py-vcrpy and py-test-vcr
> > > >
> > > > Lucas
> > >
> > > oops, forgot @pkgpath updates. Updated diff
> >
> > > FLAVORS = python3
> > > -FLAVOR ?=
> > > +FLAVOR ?= python3
> >
> > FLAVOR in these cases is not optional, please use = not ?=
> >
> > > 'py-pygal' => 'py3-pygal',
> > > 'py-wtforms' => 'py3-wtforms',
> > > 'py-apsw' => 'py3-apsw',
> > > + 'py-test-httpbin' => 'py3-test-httpbin',
> > > + 'py-test-localserver' => 'py3-test-localserver',
> > > + 'py-test-vcr' => 'py3-test-vcr',
> > > + 'py-flask' => 'py3-flask',
> > > + 'py-httpbin' => 'py3-httpbin',
> > > + 'py-itsdangerous' => 'py3-itsdangerous',
> > > + 'py-vcrpy' => 'py3-vcrpy',
> > > + 'py-werkzeug' => 'py3-werkzeug',
> > > + 'py-blinker' => 'py3-blinker'
> > > };
> >
> > and keep the trailing , here to reduce the risk of breakage for the
> > next person who adds to this ;-)
> >
>
> d'oh! :) Thanks for catching that
>
> Updated diff with FLAVOR = and the comma (plus a bonus @pkgpath that I
> forgot for py-vcrpy)
One last tweak to remove the suffix off the flask bin. Sorry, should
have caught that earlier
diff 55af3c174820b3bc1cdb9fec4a467f1edff7836e /usr/ports
blob - bdac06fd56b722fed56f800606ef979f4e7131ee
file + devel/Makefile
--- devel/Makefile
+++ devel/Makefile
@@ -1384,7 +1384,6 @@
SUBDIR += py-bitstring,python3
SUBDIR += py-blessings
SUBDIR += py-blessings,python3
- SUBDIR += py-blinker
SUBDIR += py-blinker,python3
SUBDIR += py-blist
SUBDIR += py-blist,python3
@@ -1713,9 +1712,7 @@
SUBDIR += py-test-expect,python3
SUBDIR += py-test-forked
SUBDIR += py-test-forked,python3
- SUBDIR += py-test-httpbin
SUBDIR += py-test-httpbin,python3
- SUBDIR += py-test-localserver
SUBDIR += py-test-localserver,python3
SUBDIR += py-test-mock
SUBDIR += py-test-mock,python3
@@ -1727,7 +1724,6 @@
SUBDIR += py-test-subtesthack,python3
SUBDIR += py-test-timeout
SUBDIR += py-test-timeout,python3
- SUBDIR += py-test-vcr
SUBDIR += py-test-vcr,python3
SUBDIR += py-test-xdist
SUBDIR += py-test-xdist,python3
blob - fe6be4e5ed19f8ab1934698b4fdd25f463149120
file + devel/py-blinker/Makefile
--- devel/py-blinker/Makefile
+++ devel/py-blinker/Makefile
@@ -3,7 +3,7 @@
COMMENT = fast, simple object-to-object and broadcast signaling
MODPY_EGG_VERSION = 1.4
-REVISION = 5
+REVISION = 6
DISTNAME = blinker-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
@@ -22,7 +22,7 @@ MODPY_SETUPTOOLS = Yes
MODPY_PYTEST = Yes
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${MODPY_PY_PREFIX}blinker
blob - 8499f3d6b3cf9bc15bfef927d7121a848a8212ce
file + devel/py-blinker/pkg/PLIST
--- devel/py-blinker/pkg/PLIST
+++ devel/py-blinker/pkg/PLIST
@@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.4 2015/09/23 15:33:38 jca Exp $
+@pkgpath devel/py-blinker
lib/python${MODPY_VERSION}/site-packages/blinker/
lib/python${MODPY_VERSION}/site-packages/blinker-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/blinker-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
blob - 7de36735b336353d4352fc14b06a5db1425a3ab6
file + devel/py-test-httpbin/Makefile
--- devel/py-test-httpbin/Makefile
+++ devel/py-test-httpbin/Makefile
@@ -6,7 +6,7 @@ MODPY_EGG_VERSION = 1.0.0
DISTNAME = pytest-httpbin-${MODPY_EGG_VERSION}
PKGNAME = ${DISTNAME:S/py/py-/}
CATEGORIES = devel
-REVISION = 0
+REVISION = 1
HOMEPAGE = https://github.com/kevin1024/pytest-httpbin
@@ -20,7 +20,7 @@ MODPY_SETUPTOOLS = Yes
MODPY_PYTEST = Yes
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
RUN_DEPENDS = devel/py-six${MODPY_FLAVOR} \
devel/py-test${MODPY_FLAVOR} \
blob - c1ca94f3f695db96b59a10486ee75519acc2c83d
file + devel/py-test-httpbin/pkg/PLIST
--- devel/py-test-httpbin/pkg/PLIST
+++ devel/py-test-httpbin/pkg/PLIST
@@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2016/01/05 13:02:39 shadchin Exp $
+@pkgpath devel/py-test-httpbin
lib/python${MODPY_VERSION}/site-packages/pytest_httpbin/
lib/python${MODPY_VERSION}/site-packages/pytest_httpbin-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/pytest_httpbin-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
blob - d1a82d87a111001293d227d942574b08409c3f27
file + devel/py-test-localserver/Makefile
--- devel/py-test-localserver/Makefile
+++ devel/py-test-localserver/Makefile
@@ -5,7 +5,7 @@ COMMENT = py.test plugin to test server
connections l
MODPY_EGG_VERSION = 0.5.0
DISTNAME = pytest-localserver-${MODPY_EGG_VERSION}
PKGNAME = py-test-localserver-${MODPY_EGG_VERSION}
-REVISION = 0
+REVISION = 1
CATEGORIES = devel
@@ -25,6 +25,6 @@ TEST_DEPENDS = devel/py-six${MODPY_FLAVOR} \
www/py-werkzeug${MODPY_FLAVOR}
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
.include <bsd.port.mk>
blob - 08254846c0a5f1bd17afbf5fec07749d210963b3
file + devel/py-test-localserver/pkg/PLIST
--- devel/py-test-localserver/pkg/PLIST
+++ devel/py-test-localserver/pkg/PLIST
@@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2017/10/16 21:05:44 remi Exp $
+@pkgpath devel/py-test-localserver
lib/python${MODPY_VERSION}/site-packages/pytest_localserver/
lib/python${MODPY_VERSION}/site-packages/pytest_localserver-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/pytest_localserver-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
blob - 4d288aff5c0d24628eb5378e89289558913922c6
file + devel/py-test-vcr/Makefile
--- devel/py-test-vcr/Makefile
+++ devel/py-test-vcr/Makefile
@@ -5,7 +5,7 @@ COMMENT = plugin for managing VCR.py cassettes
MODPY_EGG_VERSION = 1.0.2
DISTNAME = pytest-vcr-${MODPY_EGG_VERSION}
PKGNAME = py-test-vcr-${MODPY_EGG_VERSION}
-REVISION = 0
+REVISION = 1
CATEGORIES = devel
@@ -22,7 +22,7 @@ MODPY_PI = Yes
MODPY_PYTEST = Yes
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
RUN_DEPENDS = www/py-vcrpy${MODPY_FLAVOR}
blob - 371ad3c3c32ec4769d0ff1604a8bfc9fee24f1ef
file + devel/py-test-vcr/pkg/PLIST
--- devel/py-test-vcr/pkg/PLIST
+++ devel/py-test-vcr/pkg/PLIST
@@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2019/11/19 00:03:08 pamela Exp $
+@pkgpath devel/py-test-vcr
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}pytest_vcr.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pytest_vcr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/pytest_vcr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
blob - 70a814bef25e3e03435ed77d425856b6cbd2d9ac
file + devel/quirks/Makefile
--- devel/quirks/Makefile
+++ devel/quirks/Makefile
@@ -5,7 +5,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-3.592
+PKGNAME = quirks-3.593
PKG_ARCH = *
MAINTAINER = Marc Espie <es...@openbsd.org>
blob - 223c29079cb61b8fe9a72be272e9f2e11990cdf8
file + devel/quirks/files/Quirks.pm
--- devel/quirks/files/Quirks.pm
+++ devel/quirks/files/Quirks.pm
@@ -590,6 +590,15 @@ my $stem_extensions = {
'py-pygal' => 'py3-pygal',
'py-wtforms' => 'py3-wtforms',
'py-apsw' => 'py3-apsw',
+ 'py-test-httpbin' => 'py3-test-httpbin',
+ 'py-test-localserver' => 'py3-test-localserver',
+ 'py-test-vcr' => 'py3-test-vcr',
+ 'py-flask' => 'py3-flask',
+ 'py-httpbin' => 'py3-httpbin',
+ 'py-itsdangerous' => 'py3-itsdangerous',
+ 'py-vcrpy' => 'py3-vcrpy',
+ 'py-werkzeug' => 'py3-werkzeug',
+ 'py-blinker' => 'py3-blinker',
};
my $obsolete_reason = {
blob - 87ef5ed41e3ab3cc2710bdbca3298dc792235b2c
file + www/Makefile
--- www/Makefile
+++ www/Makefile
@@ -446,7 +446,6 @@
SUBDIR += py-cookies,python3
SUBDIR += py-feedgenerator
SUBDIR += py-feedgenerator,python3
- SUBDIR += py-flask
SUBDIR += py-flask,python3
SUBDIR += py-flask-cors
SUBDIR += py-flask-login,python3
@@ -463,13 +462,11 @@
SUBDIR += py-html5-parser
SUBDIR += py-http_ece
SUBDIR += py-http_ece,python3
- SUBDIR += py-httpbin
SUBDIR += py-httpbin,python3
SUBDIR += py-httpie
SUBDIR += py-httplib2
SUBDIR += py-httplib2,python3
SUBDIR += py-hyperlink,python3
- SUBDIR += py-itsdangerous
SUBDIR += py-itsdangerous,python3
SUBDIR += py-jinja2
SUBDIR += py-jinja2,python3
@@ -523,7 +520,6 @@
SUBDIR += py-urlgrabber
SUBDIR += py-urllib3
SUBDIR += py-urllib3,python3
- SUBDIR += py-vcrpy
SUBDIR += py-vcrpy,python3
SUBDIR += py-waitress
SUBDIR += py-waitress,python3
@@ -531,7 +527,6 @@
SUBDIR += py-webob,python3
SUBDIR += py-webpy,python3
SUBDIR += py-webtest,python3
- SUBDIR += py-werkzeug
SUBDIR += py-werkzeug,python3
SUBDIR += py-wsgiproxy
SUBDIR += py-wtforms,python3
blob - c1121369c33497bf90a30b24987dfa5075b59260
file + www/py-flask/Makefile
--- www/py-flask/Makefile
+++ www/py-flask/Makefile
@@ -5,7 +5,7 @@ COMMENT = microframework based on Werkzeug and
Jinja
MODPY_EGG_VERSION = 0.12.3
DISTNAME = Flask-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME:L}
-REVISION = 3
+REVISION = 4
CATEGORIES = www devel
@@ -21,7 +21,7 @@ MODPY_PYTEST = Yes
MODPY_PYTEST_ARGS = tests
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
RUN_DEPENDS = devel/py-blinker${MODPY_FLAVOR} \
www/py-itsdangerous${MODPY_FLAVOR} \
@@ -38,6 +38,5 @@ post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${MODPY_PY_PREFIX}flask
cd ${WRKSRC}/examples && pax -rw * \
${PREFIX}/share/examples/${MODPY_PY_PREFIX}flask
- mv ${PREFIX}/bin/flask ${PREFIX}/bin/flask${MODPY_BIN_SUFFIX}
.include <bsd.port.mk>
blob - ce2869e7642e40eae2998601b2f173c1724fbb0d
file + www/py-flask/pkg/PLIST
--- www/py-flask/pkg/PLIST
+++ www/py-flask/pkg/PLIST
@@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST,v 1.13 2021/02/19 23:13:07 sthen Exp $
@conflict py-flask-<0.12.3p3
-bin/flask${MODPY_BIN_SUFFIX}
+@pkgpath www/py-flask
+bin/flask
lib/python${MODPY_VERSION}/site-packages/Flask-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/Flask-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/Flask-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
blob - f76fa1a148a2f4d8662ba1dca815e9989c3c9702
file + www/py-httpbin/Makefile
--- www/py-httpbin/Makefile
+++ www/py-httpbin/Makefile
@@ -5,7 +5,7 @@ COMMENT = HTTP request and response service
MODPY_EGG_VERSION = 0.5.0
DISTNAME = httpbin-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 3
+REVISION = 4
CATEGORIES = www
@@ -26,7 +26,7 @@ RUN_DEPENDS = devel/py-decorator${MODPY_FLAVOR} \
www/py-itsdangerous${MODPY_FLAVOR}
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
NO_TEST = Yes
blob - 0416d742581503dbacc863d06bd2ddc9abe2490a
file + www/py-httpbin/pkg/PLIST
--- www/py-httpbin/pkg/PLIST
+++ www/py-httpbin/pkg/PLIST
@@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.2 2016/01/28 04:14:36 shadchin Exp $
+@pkgpath www/py-httpbin
lib/python${MODPY_VERSION}/site-packages/httpbin/
lib/python${MODPY_VERSION}/site-packages/httpbin-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/httpbin-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
blob - f8cf3341baa1c543e3f754db7552a48a620c6bea
file + www/py-itsdangerous/Makefile
--- www/py-itsdangerous/Makefile
+++ www/py-itsdangerous/Makefile
@@ -3,7 +3,7 @@
COMMENT = helpers to pass trusted data to untrusted environments
MODPY_EGG_VERSION = 0.24
-REVISION = 7
+REVISION = 8
DISTNAME = itsdangerous-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
@@ -23,7 +23,7 @@ MODPY_SETUPTOOLS = Yes
BUILD_DEPENDS = textproc/py-sphinx,python3>=1.5
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
MAKE_ENV += PYTHONPATH=${WRKSRC}
blob - bb2da38892470cd918e97c93bb4538b06e304ccf
file + www/py-itsdangerous/pkg/PLIST
--- www/py-itsdangerous/pkg/PLIST
+++ www/py-itsdangerous/pkg/PLIST
@@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.6 2021/02/20 22:27:31 sthen Exp $
+@pkgpath www/py-itsdangerous
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}itsdangerous.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/itsdangerous-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/itsdangerous-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
blob - 43caca38e9f3000eac6cc2ca6af8bf147aea0425
file + www/py-vcrpy/Makefile
--- www/py-vcrpy/Makefile
+++ www/py-vcrpy/Makefile
@@ -5,7 +5,7 @@ COMMENT = automatically mock HTTP interactions to
spe
MODPY_EGG_VERSION = 2.1.1
DISTNAME = vcrpy-${MODPY_EGG_VERSION}
PKGNAME = py-vcrpy-${MODPY_EGG_VERSION}
-REVISION = 0
+REVISION = 1
CATEGORIES = www
@@ -22,21 +22,13 @@ MODPY_PI = Yes
MODPY_PYTEST = Yes
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
RUN_DEPENDS = devel/py-six${MODPY_FLAVOR} \
devel/py-wrapt${MODPY_FLAVOR} \
- textproc/py-yaml${MODPY_FLAVOR}
+ textproc/py-yaml${MODPY_FLAVOR} \
+ www/py-yarl
-.if ! ${FLAVOR:Mpython3}
-RUN_DEPENDS += devel/py-contextlib2 \
- devel/py-mock
-.endif
-
-.if ${FLAVOR:Mpython3}
-RUN_DEPENDS += www/py-yarl
-.endif
-
TEST_DEPENDS = devel/py-mock${MODPY_FLAVOR} \
devel/py-test-httpbin${MODPY_FLAVOR}
blob - 852b9f1c533cf74554546911ede87e7eb7aa2a29
file + www/py-vcrpy/pkg/PLIST
--- www/py-vcrpy/pkg/PLIST
+++ www/py-vcrpy/pkg/PLIST
@@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2019/11/18 23:54:11 pamela Exp $
+@pkgpath www/py-vcrpy
lib/python${MODPY_VERSION}/site-packages/vcr/
lib/python${MODPY_VERSION}/site-packages/vcr/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/vcr/${MODPY_PYCACHE}/
blob - 3d3e2f945b1a2e006413c89a0e2935d493d13d5b
file + www/py-werkzeug/Makefile
--- www/py-werkzeug/Makefile
+++ www/py-werkzeug/Makefile
@@ -5,7 +5,7 @@ COMMENT = WSGI utility collection
MODPY_EGG_VERSION = 0.12.1
DISTNAME = Werkzeug-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME:L}
-REVISION = 5
+REVISION = 6
CATEGORIES = www devel
@@ -21,7 +21,7 @@ GH_TAGNAME= ${MODPY_EGG_VERSION}
MODULES = lang/python
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
MODPY_SETUPTOOLS = Yes
blob - 881f25c7eff1bf4ad3381ad0554a28c53fc5dcc6
file + www/py-werkzeug/pkg/PLIST
--- www/py-werkzeug/pkg/PLIST
+++ www/py-werkzeug/pkg/PLIST
@@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.15 2021/02/20 22:27:31 sthen Exp $
+@pkgpath www/py-werkzeug
lib/python${MODPY_VERSION}/site-packages/Werkzeug-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/Werkzeug-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/Werkzeug-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
