Re: move flask to py3

[Pamela Mosiejczuk]

No objections on vcr/test-vcr bits, thank you Lucas

On 2/27/21 1:06 PM, Lucas Raab wrote:

On Sat, Feb 27, 2021 at 10:25:21AM -0600, Lucas Raab wrote:

On Sat, Feb 27, 2021 at 04:12:47PM +, 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

Re: remove py2 flavor from devel/py-test-vcr

[Pamela Mosiejczuk]

On 2020-09-18 08:48, Kurt Mosiejczuk wrote:

On Fri, Sep 18, 2020 at 06:52:50AM +0200, Bjorn Ketelaars wrote:

On Thu 17/09/2020 21:31, Pamela Mosiejczuk wrote:

www/py-vcrpy has removed the python 2 flavor, and with the preceding
update to that, we can remove the python 2 flavor on test-vcr.
OK?

One question:

Index: pkg/PLIST
===
RCS file: /home/cvs/ports/devel/py-test-vcr/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   19 Nov 2019 00:03:08 -  1.1.1.1
+++ pkg/PLIST   18 Sep 2020 01:21:08 -
@@ -1,4 +1,6 @@
  @comment $OpenBSD: PLIST,v 1.1.1.1 2019/11/19 00:03:08 pamela Exp $
+@conflict py-test-vcr-<=1.0.2

Is there a need for this conflict marker to be version specific? Why not
just use '@conflict py-test-vcr-*'?

Does it really make a difference?

--Kurt

Looks like a consistent convention... when I looked again, constructing 
it with <=


the conflict line was for a different port than the one included, which 
makes sense


if this is usually handled elsewhere.

Update: www/py-vcrpy 2.1.1->4.1.0

[Pamela Mosiejczuk]

Updates vcrpy to 4.1.0, which removes the python2 flavor.
There is a breaking change to how aiohttp follows redirects, and
cassettes may need to be re-recorded after the update.

Passes 267 tests, fails 17. This port is a test dependency for www/tuir
and sysutils/py-vmomi, with no change to pass/fail numbers, and a run
dependency for devel/py-test-vcr, diff to remove py2 there as well
follows.

OK?

Index: Makefile
===
RCS file: /home/cvs/ports/www/py-vcrpy/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile3 Jul 2020 21:13:20 -   1.2
+++ Makefile18 Sep 2020 01:24:09 -
@@ -2,10 +2,9 @@
 
 COMMENT =  automatically mock HTTP interactions to speed testing
 
-MODPY_EGG_VERSION =2.1.1
+MODPY_EGG_VERSION =4.1.0
 DISTNAME = vcrpy-${MODPY_EGG_VERSION}
 PKGNAME =  py-vcrpy-${MODPY_EGG_VERSION}
-REVISION = 0
 
 CATEGORIES =   www
 
@@ -22,20 +21,12 @@ 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}
-
-.if ! ${FLAVOR:Mpython3}
-RUN_DEPENDS += devel/py-contextlib2 \
-   devel/py-mock
-.endif
-
-.if ${FLAVOR:Mpython3}
-RUN_DEPENDS += www/py-yarl
-.endif
+   textproc/py-yaml${MODPY_FLAVOR} \
+   www/py-yarl
 
 TEST_DEPENDS = devel/py-mock${MODPY_FLAVOR} \
devel/py-test-httpbin${MODPY_FLAVOR}
Index: distinfo
===
RCS file: /home/cvs/ports/www/py-vcrpy/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo18 Nov 2019 23:54:11 -  1.1.1.1
+++ distinfo18 Sep 2020 00:27:53 -
@@ -1,2 +1,2 @@
-SHA256 (vcrpy-2.1.1.tar.gz) = J8xpbfZtd3A+q1zfoEGy+Yd7vytUvNOQ3omkvpZMpTY=
-SIZE (vcrpy-2.1.1.tar.gz) = 71072
+SHA256 (vcrpy-4.1.0.tar.gz) = QTjnnrNZga05FAbLtyJ7zn66i614jc8aicLkqLdA3r4=
+SIZE (vcrpy-4.1.0.tar.gz) = 78104
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/www/py-vcrpy/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   18 Nov 2019 23:54:11 -  1.1.1.1
+++ pkg/PLIST   18 Sep 2020 01:15:10 -
@@ -1,23 +1,24 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2019/11/18 23:54:11 pamela Exp $
+@conflict py-vcrpy-<4.1.0
+@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}/
 
lib/python${MODPY_VERSION}/site-packages/vcr/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/vcr/${MODPY_PYCACHE}_handle_coroutine.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/vcr/${MODPY_PYCACHE}cassette.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/vcr/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/vcr/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/vcr/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/vcr/${MODPY_PYCACHE}filters.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/vcr/${MODPY_PYCACHE}matchers.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/vcr/${MODPY_PYCACHE}migration.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/vcr/${MODPY_PYCACHE}patch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/vcr/${MODPY_PYCACHE}record_mode.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/vcr/${MODPY_PYCACHE}request.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/vcr/${MODPY_PYCACHE}serialize.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/vcr/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/vcr/_handle_coroutine.py
 lib/python${MODPY_VERSION}/site-packages/vcr/cassette.py
-lib/python${MODPY_VERSION}/site-packages/vcr/compat.py
 lib/python${MODPY_VERSION}/site-packages/vcr/config.py
 lib/python${MODPY_VERSION}/site-packages/vcr/errors.py
 lib/python${MODPY_VERSION}/site-packages/vcr/filters.py
@@ -30,6 +31,7 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSIO
 
lib/python${MODPY_VERSION}/site-packages/vcr/persisters/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/vcr/persisters/${MODPY_PYCACHE}filesystem.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/vcr/persisters/filesystem.py
+lib/python${MODPY_VERSION}/si

remove py2 flavor from devel/py-test-vcr

[Pamela Mosiejczuk]

www/py-vcrpy has removed the python 2 flavor, and with the preceding
update to that, we can remove the python 2 flavor on test-vcr.

OK?


Index: Makefile
===
RCS file: /home/cvs/ports/devel/py-test-vcr/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile3 Jul 2020 21:12:51 -   1.2
+++ Makefile18 Sep 2020 01:24:47 -
@@ -5,7 +5,7 @@ COMMENT =   plugin for managing VCR.py ca
 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,9 +22,9 @@ MODPY_PI =Yes
 MODPY_PYTEST = Yes
 
 FLAVORS =  python3
-FLAVOR ?=
+FLAVOR =   python3
 
 RUN_DEPENDS =  www/py-vcrpy${MODPY_FLAVOR}
 
-#tests not included in PyPI sdist, an issue is open upstream
+#tests will be included in pypi sdist on future releases
 .include 
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/devel/py-test-vcr/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   19 Nov 2019 00:03:08 -  1.1.1.1
+++ pkg/PLIST   18 Sep 2020 01:21:08 -
@@ -1,4 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2019/11/19 00:03:08 pamela Exp $
+@conflict py-test-vcr-<=1.0.2
+@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

Update: www/tootstream 3.7->3.8.1

[Pamela Mosiejczuk]

Updates tootstream to the newest release, no notable change beyond an
older bump in the mastodon.py version range, which I am removing as too
low, anyway. kmos@ (maintainer) and I tested and agree it is more
appropriate to update mastodon.py to current, as any mastodon server
being reasonably maintained should already be running 3.1.x or 3.2.0. We
don't expect any odd results, but testing is appreciated.

OK? 
-Pamela

Index: Makefile
===
RCS file: /home/cvs/ports/www/tootstream/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile3 Jul 2020 21:13:21 -   1.7
+++ Makefile9 Aug 2020 03:52:37 -
@@ -2,9 +2,8 @@
 
 COMMENT =  CLI for interacting with Mastodon/fediverse instances
 
-MODPY_EGG_VERSION =0.3.7
+MODPY_EGG_VERSION =0.3.8.1
 DISTNAME = tootstream-${MODPY_EGG_VERSION}
-REVISION = 2
 
 CATEGORIES =   www
 
@@ -20,7 +19,7 @@ MODPY_SETUPTOOLS =Yes
 MODPY_PI = Yes
 MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
 
-RUN_DEPENDS =  www/py-mastodon.py>=1.4.5,<1.5.0 \
+RUN_DEPENDS =  www/py-mastodon.py \
devel/py-click${MODPY_FLAVOR} \
devel/py-dateutil${MODPY_FLAVOR} \
textproc/py-colored${MODPY_FLAVOR} \
Index: distinfo
===
RCS file: /home/cvs/ports/www/tootstream/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo27 Aug 2019 03:20:18 -  1.2
+++ distinfo9 Aug 2020 03:28:37 -
@@ -1,2 +1,2 @@
-SHA256 (tootstream-0.3.7.tar.gz) = 3C8CRAeO4f3PgJVVM6fYOxoftpNpK/W2CA8TE5SLats=
-SIZE (tootstream-0.3.7.tar.gz) = 26255
+SHA256 (tootstream-0.3.8.1.tar.gz) = 
aYhpZsmNb9vwUZWIMvgMK1NkOTeW9C8BEIPuJfxat/g=
+SIZE (tootstream-0.3.8.1.tar.gz) = 26399
Index: patches/patch-requirements_txt
===
RCS file: /home/cvs/ports/www/tootstream/patches/patch-requirements_txt,v
retrieving revision 1.1
diff -u -p -r1.1 patch-requirements_txt
--- patches/patch-requirements_txt  15 Dec 2019 17:09:52 -  1.1
+++ patches/patch-requirements_txt  9 Aug 2020 03:50:29 -
@@ -1,14 +1,14 @@
-$OpenBSD: patch-requirements_txt,v 1.1 2019/12/15 17:09:52 kmos Exp $
+$OpenBSD$
 
-Fix for other 1.4.x releases
+Loosen mastodon.py requirement to prevent delay of mastodon 3.1 support.
 
 Index: requirements.txt
 --- requirements.txt.orig
 +++ requirements.txt
 @@ -1,5 +1,5 @@
  click>=6.7
--Mastodon.py==1.4.5
-+Mastodon.py>=1.4.5
+-Mastodon.py==1.5.0
++Mastodon.py>=1.5.0
  colored>=1.3.93
  humanize>=0.5.1
  emoji>=0.4.5

Update: py-mastodon.py 1.4.5->1.5.1

[Pamela Mosiejczuk]

Introduces support for Mastodon 3.1, bookmarks, announcements and
announcement reactions. A Mastodon update deprecated the search_v1 API
but mastodon.py will still allow its use. Includes a testing fix.

Testing this update with tootstream requires applying the proposed update,
which follows, to remove its version restrictions.

OK? Comments?
-pamela (maintainer)

cc: maintainers of tootstream and ephemetoot

 
Index: Makefile
===
RCS file: /home/cvs/ports/www/py-mastodon.py/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile3 Jul 2020 21:13:19 -   1.7
+++ Makefile9 Aug 2020 02:48:51 -
@@ -2,10 +2,9 @@
 
 COMMENT =  python wrapper for the Mastodon API
 
-MODPY_EGG_VERSION =1.4.6
+MODPY_EGG_VERSION =1.5.1
 DISTNAME = Mastodon.py-${MODPY_EGG_VERSION}
 PKGNAME =  py-mastodon.py-${MODPY_EGG_VERSION}
-REVISION = 0
 
 CATEGORIES =   www
 
@@ -21,7 +20,8 @@ MODPY_SETUPTOOLS =Yes
 MODPY_PI = Yes
 MODPY_PYTEST = Yes
 
-MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
+FLAVORS =  python3
+FLAVOR =   python3
 
 BUILD_DEPENDS =devel/py-test-runner${MODPY_FLAVOR}
 
@@ -30,6 +30,7 @@ RUN_DEPENDS = devel/py-dateutil${MODPY_
devel/py-magic${MODPY_FLAVOR} \
devel/py-six${MODPY_FLAVOR} \
devel/py-tz${MODPY_FLAVOR} \
+   graphics/py-blurhash${MODPY_FLAVOR} \
security/py-cryptography${MODPY_FLAVOR} \
www/py-http_ece${MODPY_FLAVOR} \
www/py-requests${MODPY_FLAVOR}
Index: distinfo
===
RCS file: /home/cvs/ports/www/py-mastodon.py/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo27 Aug 2019 03:16:26 -  1.2
+++ distinfo9 Aug 2020 04:13:23 -
@@ -1,2 +1,2 @@
-SHA256 (Mastodon.py-1.4.6.tar.gz) = 
KwFVlIcWVAbXL97Zhv2G4WmX3iqdLz3saKnBvLHdccM=
-SIZE (Mastodon.py-1.4.6.tar.gz) = 680887
+SHA256 (Mastodon.py-1.5.1.tar.gz) = 
Kv3brYtdcyb8yKj4xiv+lW40Yn9RawbGaU/IyP7cM+4=
+SIZE (Mastodon.py-1.5.1.tar.gz) = 1225203
Index: patches/patch-setup_cfg
===
RCS file: patches/patch-setup_cfg
diff -N patches/patch-setup_cfg
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-setup_cfg 9 Aug 2020 04:15:10 -
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Prevent pytest error by removing unnecessary coverage testing.
+
+Index: setup.cfg
+--- setup.cfg.orig
 setup.cfg
+@@ -9,9 +9,6 @@ all_files = 1
+ [aliases]
+ test = pytest
+ 
+-[tool:pytest]
+-addopts = --cov=mastodon
+-
+ [egg_info]
+ tag_build = 
+ tag_date = 0
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/www/py-mastodon.py/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   15 Nov 2018 12:14:05 -  1.1.1.1
+++ pkg/PLIST   9 Aug 2020 04:28:40 -
@@ -1,4 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2018/11/15 12:14:05 danj Exp $
+@pkgpath www/py-mastodon.py,python3
 
lib/python${MODPY_VERSION}/site-packages/Mastodon.py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 
lib/python${MODPY_VERSION}/site-packages/Mastodon.py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 
lib/python${MODPY_VERSION}/site-packages/Mastodon.py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt

Re: [update] www/luakit, homepage has changed

[Pamela Mosiejczuk]

On 2020-09-15 01:55, Stefan Hagen wrote:

Hello,

- updated homepage
- added revision

Best Regards,
Stefan


Updated, thank you

-Pamela

Re: update alephone and marathon game files

[Pamela Mosiejczuk]

Sound, normal/windowed mode, gameplay all fine. Tested local network 
play with kmos@ (pew pew pew!)


OK pamela@

On 2020-09-11 16:22, Peter Hessler wrote:

Update for AlephOne and the Marathon game files to the recent 1.3.1 release.

Major Changes:
 Uses SDL 2 for much-improved compatibility with new operating systems
 Better support for game controllers
 Better performance for the software renderer
 Improved mouse control options, with settings for Classic and Modern
 mouse control
 Better support for high-dpi displays
 New controls dialog, which allows simultaneous key, mouse, and
 controller bindings
 More authentic static effect when using OpenGL
 Adds a stash for sharing info between Lua states
 Better support for Unicode characters in Windows (should fix Rubicon X)
 Better support for original Marathon scenarios including Trojan,
 which now works fully
 A separate 64-bit Windows build is available
 Better master volume and music volume controls
 Video export bitrate depends on the video resolution, which leads to
 much improved export at 1080p with default settings
 Mac apps are now notarized by Apple
 Original games now default to more authentic settings on first
 install; high res plugins are still included but are not enabled by 
default

Plays well for me on amd64

OK?


Index: games/alephone/alephone/Makefile
===
RCS file: /home/cvs/openbsd/ports/games/alephone/alephone/Makefile,v
retrieving revision 1.30
diff -u -p -u -p -r1.30 Makefile
--- games/alephone/alephone/Makefile12 Jul 2019 20:46:14 -  1.30
+++ games/alephone/alephone/Makefile11 Sep 2020 18:06:10 -
@@ -1,12 +1,13 @@
  # $OpenBSD: Makefile,v 1.30 2019/07/12 20:46:14 sthen Exp $
  
+DPB_PROPERTIES =	parallel

+
  DIST_SUBDIR ?=alephone
  COMMENT = open source game engine based on Marathon 2: Durandal
  
-DATE =			20150620

+DATE = 20200904
  DISTNAME =AlephOne-${DATE}
-PKGNAME =  alephone-1.2.1
-REVISION = 6
+PKGNAME =  alephone-1.3.1
  
  EXTRACT_SUFX =		.tar.bz2

  CATEGORIES =  games x11
@@ -20,10 +21,10 @@ PERMIT_PACKAGE =Yes
  
  MASTER_SITES =		https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${DATE}/
  
-WANTLIB +=		GL GLU c m pthread ${COMPILER_LIBCXX} z

-WANTLIB += SDL SDL_net SDL_image SDL_ttf mad png sndfile
-WANTLIB += smpeg speex speexdsp vorbisfile zzip
-WANTLIB += avcodec avformat avutil swscale boost_filesystem boost_system curl
+WANTLIB += ${COMPILER_LIBCXX} GL GLU SDL2 SDL2_image SDL2_net
+WANTLIB += SDL2_ttf avcodec avformat avutil boost_filesystem boost_system
+WANTLIB += c curl expat m mad png sndfile speex speexdsp swscale
+WANTLIB += vorbisfile z zzip
  
  COMPILER =		base-clang ports-gcc base-gcc
  
@@ -31,10 +32,9 @@ BUILD_DEPENDS =		devel/automake/${AUTOMA

devel/autoconf/${AUTOCONF_VER}
  LIB_DEPENDS = archivers/zziplib \
devel/boost \
-   devel/sdl-net \
-   devel/sdl-image \
-   devel/sdl-ttf \
-   devel/smpeg \
+   devel/sdl2-net \
+   devel/sdl2-image \
+   devel/sdl2-ttf \
audio/libmad \
audio/libsndfile \
audio/speex \
@@ -42,11 +42,15 @@ LIB_DEPENDS =   archivers/zziplib \
graphics/ffmpeg \
net/curl
  
+RUN_DEPENDS =		devel/desktop-file-utils \

+   x11/gtk+3,-guic \
+   misc/shared-mime-info
+
  USE_BZIP2 =   Yes
  USE_GMAKE =   Yes
  CONFIGURE_STYLE = gnu
-AUTOCONF_VER = 2.61
-AUTOMAKE_VER = 1.9
+AUTOCONF_VER = 2.65
+AUTOMAKE_VER = 1.16
  CONFIGURE_ENV =   AUTOCONF_VERSION=${AUTOCONF_VER} \
AUTOMAKE_VERSION=${AUTOMAKE_VER} \
CPPFLAGS=-I${LOCALBASE}/include
Index: games/alephone/alephone/distinfo
===
RCS file: /home/cvs/openbsd/ports/games/alephone/alephone/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- games/alephone/alephone/distinfo2 Feb 2016 10:17:44 -   1.10
+++ games/alephone/alephone/distinfo11 Sep 2020 13:08:40 -
@@ -1,2 +1,2 @@
-SHA256 (alephone/AlephOne-20150620.tar.bz2) = 
wPNg37dKYmT5XTdRA6dAAJMM8EOf+wRk+RX1N5RD4TM=
-SIZE (alephone/AlephOne-20150620.tar.bz2) = 5031898
+SHA256 (alephone/AlephOne-20200904.tar.bz2) = 
kCJ6tt2shq+LGO7uIt/Etm6+CDl5829wnLc0nG4dk40=
+SIZE (alephone/AlephOne-20200904.tar.bz2) = 5567722
Index: games/alephone/alephone/patches/patch-Source_Files_FFmpeg_

New: graphics/py-blurhash

[Pamela Mosiejczuk]

This a python implementation of the blurhash algorithm, used by the
mastodon software to hide sensitive images using compact placeholders.
It is needed for an update to mastodon.py to support newer mastodon
versions.
 
Patched so that tests will run, but currently they're not included in
the source distribution. All tests do pass and upstream merged my request to
include them in the future. 

OK to import?
-Pamela


py-blurhash.tgz
Description: Binary data

New: graphics/mypaint

[Pamela Mosiejczuk]

MyPaint is a simple drawing and painting program that works well
with Wacom-style graphics tablets. Its brush engine is versatile and
configurable, and it provides useful, productive tools. The standard
brushes can emulate traditional media like charcoal, pencils, ink, or
paint.

Uses mypaint-brushes2, preceding.

OK to import?

-Pamela



mypaint.tgz
Description: Binary data

New: graphics/mypaint-brushes2

[Pamela Mosiejczuk]

This is needed for the new port mypaint, which follows. (Gimp depends on 
the 1.x branch of this port, currently in the tree, while MyPaint itself 
needs the 2.x).


"Brushes used by MyPaint and other software using libmypaint."

OK to import?

-Pamela



mypaint-brushes2.tgz
Description: Binary data

Re: [new package] mutt-wizard - automated configuration manager for neomutt

[Pamela Mosiejczuk]

On 2020-08-13 14:48, Aisha Tammy wrote:

On 6/1/20 12:46 AM, Aisha Tammy wrote:

Hi,
This is quite a handy package for autoconfiguration of neomutt
and other utilities. I'm hoping we can get it so that a lot of the
newcomers who want to use neomutt won't be that daunted by the dotfiles.

I've attached the port but upstream doesn't make any tagged releases, so
I've made it using a dated format. I'm not sure what the proper method is
when adding versions to such packages.

PS: upstream calls it mutt-wizard but it needs neomutt as told by upstream.

Aisha



Reattaching port with updated Makefile.
It should be building correctly now.

Aisha


I have been using this, and attach a version with a patch from Aisha for 
email validation and a quick fix of mine which makes notmuch integration 
work.


I've tested config, bindings, syncing, password storage and multiple 
account switching and agree this provides a very useful starting config 
for users who want to get up and running. I have not tested sending PGP 
encrypted mail, and the port doesn't take a user quite to the finish 
line on that (and if you don't wish to encrypt your mail you'll need to 
disable lines - it defaults to on), but this is an excellent resource 
for a new would-be neomutt user to get set up, and also uses some 
niceties like the sidebar.


We could leave the final encryption bits as an exercise to the user 
they'd need to figure out anyway, but if anyone who does habitually use 
encryption can test or if anyone has thoughts about use of the default 
neomutt flavor, I can't really speak to that end of things. Most of the 
setup is guided, which is nice. I quite like the rest and would love to 
import this.


-pamela



mutt-wizard.tgz
Description: Binary data

Re: Update: textproc/py-emoji to 0.6.0

[Pamela Mosiejczuk]

On Tue, Aug 11, 2020 at 04:48:49PM -0400, Pamela Mosiejczuk wrote:
> Hi ports@,
> 
> Update for multiple minor fixes and removal of consumerless python 2 flavor.
> This version adds a "variant" selector, allowing specification of text or 
> emoji
> variant form (VS15 or VS16).
> 
> The removed patches have since been upstreamed. Passes all tests.
> 
> OK?
> Pamela


Oops, now with plist tweaking for flavor removal. (Hopefully).


Index: Makefile
===
RCS file: /home/cvs/ports/textproc/py-emoji/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile3 Jul 2020 21:13:14 -   1.7
+++ Makefile9 Aug 2020 00:47:29 -
@@ -2,10 +2,9 @@
 
 COMMENT =  emoji for Python
 
-MODPY_EGG_VERSION =0.5.4
+MODPY_EGG_VERSION =0.6.0
 DISTNAME = emoji-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
-REVISION = 0
 
 CATEGORIES =   textproc
 
@@ -22,6 +21,6 @@ MODPY_PI =Yes
 MODPY_PYTEST = Yes
 
 FLAVORS =  python3
-FLAVOR ?=
+FLAVOR =   python3
 
 .include 
Index: distinfo
===
RCS file: /home/cvs/ports/textproc/py-emoji/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo7 Nov 2019 09:23:53 -   1.3
+++ distinfo9 Aug 2020 00:16:04 -
@@ -1,2 +1,2 @@
-SHA256 (emoji-0.5.4.tar.gz) = YGUtOi3O5bivissJfDF3b7bYCAJ663Ihgw9yza/vwXQ=
-SIZE (emoji-0.5.4.tar.gz) = 43402
+SHA256 (emoji-0.6.0.tar.gz) = 5C2k+NZI+O8QaRvCRvaCoexrGDc6v9m+EOwLOYgjvRE=
+SIZE (emoji-0.6.0.tar.gz) = 51003
Index: patches/patch-setup_cfg
===
RCS file: patches/patch-setup_cfg
diff -N patches/patch-setup_cfg
--- patches/patch-setup_cfg 11 Nov 2019 00:40:45 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-setup_cfg,v 1.1 2019/11/11 00:40:45 kmos Exp $
-
-Remove unneeded py-nose
-
-Index: setup.cfg
 setup.cfg.orig
-+++ setup.cfg
-@@ -1,8 +1,3 @@
--[nosetests]
--verbosity = 3
--cover-package = emoji
--cover-erase = 1
--
- [egg_info]
- tag_build = 
- tag_date = 0
Index: patches/patch-setup_py
===
RCS file: patches/patch-setup_py
diff -N patches/patch-setup_py
--- patches/patch-setup_py  11 Nov 2019 00:40:45 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-$OpenBSD: patch-setup_py,v 1.1 2019/11/11 00:40:45 kmos Exp $
-
-Remove unneeded py-nose
-
-Index: setup.py
 setup.py.orig
-+++ setup.py
-@@ -59,7 +59,6 @@ setup(
- keywords=['emoji'],
- extras_require={
- 'dev': [
--'nose',
- 'coverage',
- 'coveralls'
- ]
Index: patches/patch-tests_test_core_py
===
RCS file: patches/patch-tests_test_core_py
diff -N patches/patch-tests_test_core_py
--- patches/patch-tests_test_core_py11 Nov 2019 00:40:45 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-$OpenBSD: patch-tests_test_core_py,v 1.1 2019/11/11 00:40:45 kmos Exp $
-
-Remove unneeded py-nose
-
-Index: tests/test_core.py
 tests/test_core.py.orig
-+++ tests/test_core.py
-@@ -9,7 +9,6 @@ Unittests for emoji.core
- from __future__ import unicode_literals
- 
- import emoji
--from nose.tools import assert_raises
- 
- 
- def test_emojize_name_only():
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/textproc/py-emoji/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   26 Apr 2019 18:25:54 -  1.1.1.1
+++ pkg/PLIST   11 Aug 2020 21:15:52 -
@@ -1,4 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2019/04/26 18:25:54 kmos Exp $
+@pkgpath textproc/py-emoji
+@conflict py-emoji-*
 lib/python${MODPY_VERSION}/site-packages/emoji/
 
lib/python${MODPY_VERSION}/site-packages/emoji-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 
lib/python${MODPY_VERSION}/site-packages/emoji-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO

Update: textproc/py-emoji to 0.6.0

[Pamela Mosiejczuk]

Hi ports@,

Update for multiple minor fixes and removal of consumerless python 2 flavor.
This version adds a "variant" selector, allowing specification of text or emoji
variant form (VS15 or VS16).

The removed patches have since been upstreamed. Passes all tests.

OK?
Pamela



Index: Makefile
===
RCS file: /home/cvs/ports/textproc/py-emoji/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile3 Jul 2020 21:13:14 -   1.7
+++ Makefile9 Aug 2020 00:47:29 -
@@ -2,10 +2,9 @@
 
 COMMENT =  emoji for Python
 
-MODPY_EGG_VERSION =0.5.4
+MODPY_EGG_VERSION =0.6.0
 DISTNAME = emoji-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
-REVISION = 0
 
 CATEGORIES =   textproc
 
@@ -22,6 +21,6 @@ MODPY_PI =Yes
 MODPY_PYTEST = Yes
 
 FLAVORS =  python3
-FLAVOR ?=
+FLAVOR =   python3
 
 .include 
Index: distinfo
===
RCS file: /home/cvs/ports/textproc/py-emoji/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo7 Nov 2019 09:23:53 -   1.3
+++ distinfo9 Aug 2020 00:16:04 -
@@ -1,2 +1,2 @@
-SHA256 (emoji-0.5.4.tar.gz) = YGUtOi3O5bivissJfDF3b7bYCAJ663Ihgw9yza/vwXQ=
-SIZE (emoji-0.5.4.tar.gz) = 43402
+SHA256 (emoji-0.6.0.tar.gz) = 5C2k+NZI+O8QaRvCRvaCoexrGDc6v9m+EOwLOYgjvRE=
+SIZE (emoji-0.6.0.tar.gz) = 51003
Index: patches/patch-setup_cfg
===
RCS file: patches/patch-setup_cfg
diff -N patches/patch-setup_cfg
--- patches/patch-setup_cfg 11 Nov 2019 00:40:45 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-setup_cfg,v 1.1 2019/11/11 00:40:45 kmos Exp $
-
-Remove unneeded py-nose
-
-Index: setup.cfg
 setup.cfg.orig
-+++ setup.cfg
-@@ -1,8 +1,3 @@
--[nosetests]
--verbosity = 3
--cover-package = emoji
--cover-erase = 1
--
- [egg_info]
- tag_build = 
- tag_date = 0
Index: patches/patch-setup_py
===
RCS file: patches/patch-setup_py
diff -N patches/patch-setup_py
--- patches/patch-setup_py  11 Nov 2019 00:40:45 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-$OpenBSD: patch-setup_py,v 1.1 2019/11/11 00:40:45 kmos Exp $
-
-Remove unneeded py-nose
-
-Index: setup.py
 setup.py.orig
-+++ setup.py
-@@ -59,7 +59,6 @@ setup(
- keywords=['emoji'],
- extras_require={
- 'dev': [
--'nose',
- 'coverage',
- 'coveralls'
- ]
Index: patches/patch-tests_test_core_py
===
RCS file: patches/patch-tests_test_core_py
diff -N patches/patch-tests_test_core_py
--- patches/patch-tests_test_core_py11 Nov 2019 00:40:45 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-$OpenBSD: patch-tests_test_core_py,v 1.1 2019/11/11 00:40:45 kmos Exp $
-
-Remove unneeded py-nose
-
-Index: tests/test_core.py
 tests/test_core.py.orig
-+++ tests/test_core.py
-@@ -9,7 +9,6 @@ Unittests for emoji.core
- from __future__ import unicode_literals
- 
- import emoji
--from nose.tools import assert_raises
- 
- 
- def test_emojize_name_only():

UPDATE: devel/py-unittest2

[Pamela Mosiejczuk]

This is an update for our version of the unittest2 backport, bringing it
up to the newest version from 2015, which some other testing framework
items now specify (including any updates to tox). There were many
fixes between releases, see https://hg.python.org/unittest2

To test this update, you'll want the four new ports I've just sent:
py-argparse, py-fixtures, py-linecache2 and py-traceback2.

6 failed, 381 passed, 3 skipped, 1 warnings in 3.90 seconds

Tested all consumers where possible (py-autobahn's tests are broken;
it wants an outdated version of pytest - this is a test dep only
for autobahn).  Test results are identical except for py-contextlib2,
where this update remedies one failure.


(cc maintainer)

Comments/OKs?




Index: Makefile
===
RCS file: /cvs/ports/devel/py-unittest2/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile18 Nov 2019 03:23:00 -  1.7
+++ Makefile20 Dec 2019 04:51:07 -
@@ -2,11 +2,12 @@
 
 COMMENT =  backport of new features added to unittest
 
-MODPY_EGG_VERSION =0.5.1
+MODPY_EGG_VERSION =1.1.0
 DISTNAME = unittest2-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
 CATEGORIES =   devel
-REVISION = 1
+
+HOMEPAGE = https://hg.python.org/unittest2
 
 MAINTAINER =   frantisek holop 
 
@@ -17,14 +18,17 @@ MODPY_PI =  Yes
 
 MODULES =  lang/python
 MODPY_SETUPTOOLS = Yes
+MODPY_PYTEST = Yes
+MODPY_PYTEST_ARGS =unittest2
+
+BUILD_DEPENDS =devel/py-argparse \
+   devel/py-traceback2
 
-TEST_DEPENDS = devel/py-unittest2
+RUN_DEPENDS =  devel/py-six \
+   devel/py-traceback2
 
 post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/unittest2
${INSTALL_DATA} ${WRKSRC}/README.txt ${PREFIX}/share/doc/unittest2
-
-do-test:
-   cd ${WRKSRC}/unittest2/test && unit2 discover
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/devel/py-unittest2/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo12 Mar 2013 10:39:42 -  1.1.1.1
+++ distinfo20 Dec 2019 04:51:07 -
@@ -1,2 +1,2 @@
-SHA256 (unittest2-0.5.1.tar.gz) = ql3ozfZU2EM3nJe9HuJA6GNW0zVal7FHpvP00UkkenE=
-SIZE (unittest2-0.5.1.tar.gz) = 62470
+SHA256 (unittest2-1.1.0.tar.gz) = IogqDkGMKE4fcYqCKzsCKUTVPS2QjhaQsxmp0+ssBXk=
+SIZE (unittest2-1.1.0.tar.gz) = 81432
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-unittest2/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   12 Mar 2013 10:39:42 -  1.1.1.1
+++ pkg/PLIST   20 Dec 2019 04:51:07 -
@@ -1,13 +1,12 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2013/03/12 10:39:42 benoit Exp $
+@comment $OpenBSD: PLIST,v$
 bin/unit2
-bin/unit2-${MODPY_VERSION}
-bin/unit2.py
 lib/python${MODPY_VERSION}/site-packages/unittest2/
 
lib/python${MODPY_VERSION}/site-packages/unittest2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 
lib/python${MODPY_VERSION}/site-packages/unittest2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 
lib/python${MODPY_VERSION}/site-packages/unittest2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
 
lib/python${MODPY_VERSION}/site-packages/unittest2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
 
lib/python${MODPY_VERSION}/site-packages/unittest2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/unittest2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
 
lib/python${MODPY_VERSION}/site-packages/unittest2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/unittest2/__init__.py
 lib/python${MODPY_VERSION}/site-packages/unittest2/__init__.pyc
@@ -34,6 +33,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/unittest2/test/
 lib/python${MODPY_VERSION}/site-packages/unittest2/test/__init__.py
 lib/python${MODPY_VERSION}/site-packages/unittest2/test/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/unittest2/test/_test_unittest2_with.py
+lib/python${MODPY_VERSION}/site-packages/unittest2/test/_test_unittest2_with.pyc
 lib/python${MODPY_VERSION}/site-packages/unittest2/test/dummy.py
 lib/python${MODPY_VERSION}/site-packages/unittest2/test/dummy.pyc
 lib/python${MODPY_VERSION}/site-packages/unittest2/test/support.py

NEW: devel/py-traceback2

[Pamela Mosiejczuk]

py-traceback2 is a new build+run dependency needed for an update to 
py-unittest2.


traceback2 is a backport of the traceback module. To test this port, my 
new proposed ports py-linecache2 and py-fixtures are needed (and 
unittest2 itself).


All tests pass.

Comments/OKs?



py-traceback2.tgz
Description: Binary data

NEW: devel/py-linecache2

[Pamela Mosiejczuk]

linecache2 is part of the dependency chain needed for an update to 
py-unittest2.


linecache2 is a backport of the linecache Python module. To test, my new 
proposed port py-fixtures is needed (and unittest2 itself).


2 failed tests, 8 passed

Comments/OKs?


py-linecache2.tgz
Description: Binary data

NEW: devel/py-fixtures

[Pamela Mosiejczuk]

py-fixtures is a shared test dependency for new ports py-traceback2 and 
py-linecache2, which are needed to update py-unittest2.


Fixtures defines a Python contract for reusable state / support
logic, primarily for unit testing. Helper and adaptation logic is
included to make it easy to write your own fixtures using the
fixtures contract.

One test intermittently fails (I haven't figured out why), 129 pass for 
both flavors.


Comments/OKs?


py-fixtures.tgz
Description: Binary data

NEW: devel/py-argparse

[Pamela Mosiejczuk]

py-argparse is a new build dependency required to update our existing 
backport of py-unittest2.


DESCR:
The argparse module makes it easy to write user friendly command line 
interfaces.

The program defines what arguments it requires, and argparse will figure out
how to parse those out of sys.argv. The argparse module also automatically
generates help and usage messages and issues errors when users give the
program invalid arguments.


Passes all tests on both flavors.

Comments/OKs?


py-argparse.tgz
Description: Binary data

Re: enable tests on www/py-mastodon.py

[Pamela Mosiejczuk]

ping

On Sat, Nov 23, 2019 at 12:27:42PM -0500, Pamela Mosiejczuk wrote:
> Hi,
> With missing deps imported, these tests can now be run, so flip them on. 
> 
> OK?
> -pamela
> 


Index: Makefile
===
RCS file: /cvs/ports/www/py-mastodon.py/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile27 Aug 2019 03:16:26 -  1.5
+++ Makefile19 Nov 2019 00:48:27 -
@@ -18,6 +18,7 @@ PERMIT_PACKAGE =  Yes
 MODULES =  lang/python
 MODPY_SETUPTOOLS = Yes
 MODPY_PI = Yes
+MODPY_PYTEST = Yes
 
 MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
 
@@ -32,7 +33,11 @@ RUN_DEPENDS =devel/py-dateutil${MODPY_
www/py-http_ece${MODPY_FLAVOR} \
www/py-requests${MODPY_FLAVOR}
 
-# missing test dependencies test-vcr and vcrpy
-NO_TEST =  Yes
+TEST_DEPENDS = devel/py-test-cov${MODPY_FLAVOR} \
+   devel/py-test-mock${MODPY_FLAVOR} \
+   devel/py-test-runner${MODPY_FLAVOR} \
+   devel/py-test-vcr${MODPY_FLAVOR} \
+   www/py-requests-mock${MODPY_FLAVOR} \
+   www/py-vcrpy${MODPY_FLAVOR}
 
 .include 

Re: [update] devel/py-test-cov

[Pamela Mosiejczuk]

ping, fresh copy below

On Sat, Nov 23, 2019 at 04:01:04AM -0500, Pamela Mosiejczuk wrote:
> On Fri, Sep 06, 2019 at 05:31:30PM -0400, Johan Huldtgren wrote:
> > hello,
> > 
> > minor update to py-test-cov from 2.5.1 to 2.7.1, this is one of the
> > required dependencies needed to update audio/py-jwt.
> > 
> > thanks,
> > 
> > .jh
> 
> 
> This port has been updated since Johan's message; updated version attached.
> 
> Changelog: https://pytest-cov.readthedocs.io/en/latest/changelog.html#id2
> (Our version is now several releases out of date. Updated comment pulled
> from the documentation).
> 
> py-test-cov is a run dependency for py-nbval, which has the same 
> test results with the new version. (2 failures and 10 passes for both
> flavors). I also checked www/jupyter-notebook, which uses py-nbval
> for its own tests in turn, and those all pass with old and new.
> 
> py-test-cov is a test dependency for various ports, and all results
> for available tests were identical, save for reducing the py-requests
> python2 test failures from 8 to 6, and silencing a warning for toot.
> (py-ipykernels tests were not run, kmos@ said something about fallout
> from debug packages).
> 
> OK?
> -pamela
> 


Index: Makefile
===
RCS file: /cvs/ports/devel/py-test-cov/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile12 Jul 2019 20:45:54 -  1.13
+++ Makefile23 Nov 2019 07:52:51 -
@@ -1,12 +1,11 @@
 # $OpenBSD: Makefile,v 1.13 2019/07/12 20:45:54 sthen Exp $
 
-COMMENT =  library for stubbing in Python
+COMMENT =  pytest plugin for measuring coverage
 
-MODPY_EGG_VERSION =2.5.1
+MODPY_EGG_VERSION =2.8.1
 DISTNAME = pytest-cov-${MODPY_EGG_VERSION}
 PKGNAME =  ${DISTNAME:S/py/py-/}
 CATEGORIES =   devel
-REVISION = 1
 
 HOMEPAGE = https://pytest-cov.readthedocs.org/en/latest/
 
@@ -24,6 +23,7 @@ FLAVOR ?=
 RUN_DEPENDS =  devel/py-coverage${MODPY_FLAVOR} \
devel/py-test${MODPY_FLAVOR}
 
+# Missing py-fields, py-hunter and py-process-tests
 NO_TEST =  Yes
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/devel/py-test-cov/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo12 May 2017 09:39:17 -  1.8
+++ distinfo23 Nov 2019 07:52:51 -
@@ -1,2 +1,2 @@
-SHA256 (pytest-cov-2.5.1.tar.gz) = A6p1LPEdtB0oHqHYB9lUxO2jXPobIdaXGWbMBBu/bi0=
-SIZE (pytest-cov-2.5.1.tar.gz) = 36201
+SHA256 (pytest-cov-2.8.1.tar.gz) = zGdC2LrEUHAhcWn19yzu4eDlWwIh9UvPJIRZctOkfys=
+SIZE (pytest-cov-2.8.1.tar.gz) = 47661

enable tests on www/py-mastodon.py

[Pamela Mosiejczuk]

Hi,
With missing deps imported, these tests can now be run, so flip them on. 

OK?
-pamela


Index: Makefile
===
RCS file: /cvs/ports/www/py-mastodon.py/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile27 Aug 2019 03:16:26 -  1.5
+++ Makefile19 Nov 2019 00:48:27 -
@@ -18,6 +18,7 @@ PERMIT_PACKAGE =  Yes
 MODULES =  lang/python
 MODPY_SETUPTOOLS = Yes
 MODPY_PI = Yes
+MODPY_PYTEST = Yes
 
 MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
 
@@ -32,7 +33,11 @@ RUN_DEPENDS =devel/py-dateutil${MODPY_
www/py-http_ece${MODPY_FLAVOR} \
www/py-requests${MODPY_FLAVOR}
 
-# missing test dependencies test-vcr and vcrpy
-NO_TEST =  Yes
+TEST_DEPENDS = devel/py-test-cov${MODPY_FLAVOR} \
+   devel/py-test-mock${MODPY_FLAVOR} \
+   devel/py-test-runner${MODPY_FLAVOR} \
+   devel/py-test-vcr${MODPY_FLAVOR} \
+   www/py-requests-mock${MODPY_FLAVOR} \
+   www/py-vcrpy${MODPY_FLAVOR}
 
 .include 

Re: [update] devel/py-test-cov

[Pamela Mosiejczuk]

On Fri, Sep 06, 2019 at 05:31:30PM -0400, Johan Huldtgren wrote:
> hello,
> 
> minor update to py-test-cov from 2.5.1 to 2.7.1, this is one of the
> required dependencies needed to update audio/py-jwt.
> 
> thanks,
> 
> .jh


This port has been updated since Johan's message; updated version attached.

Changelog: https://pytest-cov.readthedocs.io/en/latest/changelog.html#id2
(Our version is now several releases out of date. Updated comment pulled
from the documentation).

py-test-cov is a run dependency for py-nbval, which has the same 
test results with the new version. (2 failures and 10 passes for both
flavors). I also checked www/jupyter-notebook, which uses py-nbval
for its own tests in turn, and those all pass with old and new.

py-test-cov is a test dependency for various ports, and all results
for available tests were identical, save for reducing the py-requests
python2 test failures from 8 to 6, and silencing a warning for toot.
(py-ipykernels tests were not run, kmos@ said something about fallout
from debug packages).

OK?
-pamela


Index: Makefile
===
RCS file: /cvs/ports/devel/py-test-cov/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile12 Jul 2019 20:45:54 -  1.13
+++ Makefile23 Nov 2019 07:52:51 -
@@ -1,12 +1,11 @@
 # $OpenBSD: Makefile,v 1.13 2019/07/12 20:45:54 sthen Exp $
 
-COMMENT =  library for stubbing in Python
+COMMENT =  pytest plugin for measuring coverage
 
-MODPY_EGG_VERSION =2.5.1
+MODPY_EGG_VERSION =2.8.1
 DISTNAME = pytest-cov-${MODPY_EGG_VERSION}
 PKGNAME =  ${DISTNAME:S/py/py-/}
 CATEGORIES =   devel
-REVISION = 1
 
 HOMEPAGE = https://pytest-cov.readthedocs.org/en/latest/
 
@@ -24,6 +23,7 @@ FLAVOR ?=
 RUN_DEPENDS =  devel/py-coverage${MODPY_FLAVOR} \
devel/py-test${MODPY_FLAVOR}
 
+# Missing py-fields, py-hunter and py-process-tests
 NO_TEST =  Yes
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/devel/py-test-cov/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo12 May 2017 09:39:17 -  1.8
+++ distinfo23 Nov 2019 07:52:51 -
@@ -1,2 +1,2 @@
-SHA256 (pytest-cov-2.5.1.tar.gz) = A6p1LPEdtB0oHqHYB9lUxO2jXPobIdaXGWbMBBu/bi0=
-SIZE (pytest-cov-2.5.1.tar.gz) = 36201
+SHA256 (pytest-cov-2.8.1.tar.gz) = zGdC2LrEUHAhcWn19yzu4eDlWwIh9UvPJIRZctOkfys=
+SIZE (pytest-cov-2.8.1.tar.gz) = 47661

Re: NEW devel/py-zc-lockfile

[Pamela Mosiejczuk]

I took a stab at the zopetesting update and don't have that ready for 
primetime yet, but was able to install and run your tests fine with 4.7. 
All seven pass on both flavors.


OK pamela@

On 2019-10-21 10:46, Björn Ketelaars wrote:

devel/py-zc-lockfile is part of the dependency chain of a future update
of py-CherryPy.

DESCR:
The zc.lockfile package provides a basic portable implementation of
interprocess locks using lock files. The purpose if not specifically to lock
files, but to simply provide locks with an implementation based on
file-locking primitives. Of course, these locks could be used to mediate
access to other files. For example, the ZODB file storage implementation uses
file locks to mediate access to file-storage database files. The database
files and lock file files are separate files.

Comments/OK to import?

remove sqlports-compact reference in portgen manual

[Pamela Mosiejczuk]

Oops, just tripped over this. OK to update?
-pamela

Index: portgen.1
===
RCS file: /cvs/src/share/man/man1/portgen.1,v
retrieving revision 1.2
diff -u -p -r1.2 portgen.1
--- portgen.1   24 Jun 2019 18:56:42 -  1.2
+++ portgen.1   16 Nov 2019 23:33:56 -
@@ -61,8 +61,6 @@ The following packages must be installed
 .Pp
 .Bl -item -offset indent -compact
 .It
-.Cm sqlports-compact
-or
 .Cm sqlports
 .It
 .Cm p5-DBI

Re: NEW: devel/py-test-vcr

[Pamela Mosiejczuk]

Ping, reattaching. No changes with the update to my proposed 
www/py-vcrpy port, preceding.


OK to import?

-pamela

On 2019-08-19 15:34, Pamela Mosiejczuk wrote:

Hi,

DESCR:
Py-test plugin for managing VCR.py cassettes. This plugin is
configured, for the most part, by overriding py-test fixtures or
passing options to the vcr marker.


This is a missing test dependency for mastodon.py, along with the 
py-vcrpy port I've just sent (which this one needs as a dependency).


No tests were included on pypi, but I pulled the tests from github and 
they all pass for both flavors.



OK to import?


py-test-vcr.tgz
Description: Binary data

Re: NEW: www/py-vcrpy

[Pamela Mosiejczuk]

Pinging, but there has since been a minor bugfix release, so new version 
attached.


In addition to tests for mastodon.py, kmos@ now needs this to get 
py-siphon tests working, and Paco Esteban also ran into being unable to 
use the tests on www/buku due to its absence.


OK to import?

-pamela


On 2019-08-19 15:33, Pamela Mosiejczuk wrote:

Hi all,

DESCR:
VCR.py simplifies and speeds up tests that make HTTP requests. The first
time you run code that is inside a VCR.py context manager or decorated
function, VCR.py records all HTTP interactions that take place through
the libraries it supports and serializes and writes them to a flat file
(in yaml format by default). This flat file is called a cassette.

When the relevant piece of code is executed again, VCR.py will read the
serialized requests and responses from the aforementioned cassette file,
and intercept any HTTP requests that it recognizes from the original
test run and return the responses that corresponded to those requests.


This is useful for API testing, and I'd like to add it in as a missing 
py-mastodon.py test dependency (along with a py-test plugin, which 
follows), as mastodon itself is a moving target with lots of versions 
in active use. (It looks like it's one of the missing test deps for 
www/buku as well, but will not on its own allow that test suite).


All tests pass for both flavors. Additional tests that fail may get 
pulled in if you already have some optional dependencies installed. 
Modified the python2-incompatible aiohttp plist entries.


OK to import?


py-vcrpy.tgz
Description: Binary data

Re: [NEW:] fonts/opendyslexic

[Pamela Mosiejczuk]

ping? reattached. No response from the author in the meantime about 
making the static archive usable.


-pamela

On 2019-09-20 16:34, Pamela Mosiejczuk wrote:


Hi all,

The makers of the OpenDyslexic font have relicensed it as SIL OFL 1.1, 
available here: https://github.com/antijingoist/opendyslexic. The font 
is intended to be more readable for readers with dyslexia, and 
features increased spacing, weighted bottoms of characters to indicate 
direction, and unique characters to help prevent flipping and swapping.


This release contains only the .otf and .woff files. Future releases 
will add in the ttf files and a monospace variant. I've been using 
these with Firefox and Inkscape.


My makefile uses the tag for the release rather than the static 
download, as the current release's zip includes the font files but not 
the files containing license/copyright. I've put in an issue with 
upstream asking those be added in so we can avoid potential changing 
checksums, etc.


Ok to import?
<https://github.com/antijingoist/opendyslexic/releases/download/v0.9.10/opendyslexic-0.9.10-beta-2019.09.16.zip> 





opendyslexic.tgz
Description: Binary data

Re: [NEW:] fonts/opendyslexic

[Pamela Mosiejczuk]

(Oops, pardon the accidental github link paste at the end. That's the 
release zip I didn't use.)


On 9/20/19 4:34 PM, Pamela Mosiejczuk wrote:

Hi all,

The makers of the OpenDyslexic font have relicensed it as SIL OFL 1.1, 
available here: https://github.com/antijingoist/opendyslexic. The font 
is intended to be more readable for readers with dyslexia, and 
features increased spacing, weighted bottoms of characters to indicate 
direction, and unique characters to help prevent flipping and swapping.


This release contains only the .otf and .woff files. Future releases 
will add in the ttf files and a monospace variant. I've been using 
these with Firefox and Inkscape.


My makefile uses the tag for the release rather than the static 
download, as the current release's zip includes the font files but not 
the files containing license/copyright. I've put in an issue with 
upstream asking those be added in so we can avoid potential changing 
checksums, etc.


Ok to import?
<https://github.com/antijingoist/opendyslexic/releases/download/v0.9.10/opendyslexic-0.9.10-beta-2019.09.16.zip> 

[NEW:] fonts/opendyslexic

[Pamela Mosiejczuk]

Hi all,

The makers of the OpenDyslexic font have relicensed it as SIL OFL 1.1, 
available here: https://github.com/antijingoist/opendyslexic. The font 
is intended to be more readable for readers with dyslexia, and features 
increased spacing, weighted bottoms of characters to indicate direction, 
and unique characters to help prevent flipping and swapping.


This release contains only the .otf and .woff files. Future releases 
will add in the ttf files and a monospace variant. I've been using these 
with Firefox and Inkscape.


My makefile uses the tag for the release rather than the static 
download, as the current release's zip includes the font files but not 
the files containing license/copyright. I've put in an issue with 
upstream asking those be added in so we can avoid potential changing 
checksums, etc.


Ok to import?




opendyslexic.tgz
Description: Binary data

NEW: devel/py-test-vcr

[Pamela Mosiejczuk]

Hi,

DESCR:
Py-test plugin for managing VCR.py cassettes. This plugin is
configured, for the most part, by overriding py-test fixtures or
passing options to the vcr marker.


This is a missing test dependency for mastodon.py, along with the 
py-vcrpy port I've just sent (which this one needs as a dependency).


No tests were included on pypi, but I pulled the tests from github and 
they all pass for both flavors.



OK to import?


py-test-vcr.tgz
Description: Binary data

NEW: www/py-vcrpy

[Pamela Mosiejczuk]

Hi all,

DESCR:
VCR.py simplifies and speeds up tests that make HTTP requests. The first
time you run code that is inside a VCR.py context manager or decorated
function, VCR.py records all HTTP interactions that take place through
the libraries it supports and serializes and writes them to a flat file
(in yaml format by default). This flat file is called a cassette.

When the relevant piece of code is executed again, VCR.py will read the
serialized requests and responses from the aforementioned cassette file,
and intercept any HTTP requests that it recognizes from the original
test run and return the responses that corresponded to those requests.


This is useful for API testing, and I'd like to add it in as a missing 
py-mastodon.py test dependency (along with a py-test plugin, which 
follows), as mastodon itself is a moving target with lots of versions in 
active use. (It looks like it's one of the missing test deps for 
www/buku as well, but will not on its own allow that test suite).


All tests pass for both flavors. Additional tests that fail may get 
pulled in if you already have some optional dependencies installed. 
Modified the python2-incompatible aiohttp plist entries.


OK to import?


py-vcrpy.tgz
Description: Binary data

Re: py-mastodon.py: update to 1.4.5

[Pamela Mosiejczuk]

On 8/17/19 2:33 PM, Klemens Nanni wrote:

Required for the tootstream update that follows soon.  There's 1.4.6 but
tootstream requires 1.4.5.

No PLIST change, but py-magic is a new RDEP.  I've also added version
specs to dependencies to keep track of them.

Changelog is lengthy as we're skipping a few versions so please see
https://github.com/halcy/Mastodon.py/releases

Feedback? OK?


Hi Klemens,

kmos@ and I had these (mastodon.py and tootstream) in progress. I've 
sorted out the missing test dependencies and will send those today to 
see whether others agree to import.


We've been testing 1.4.6 with the new tootstream as well with no 
problems so far, and kmos@ sent a pull request to loosen requirements 
slightly, avoiding this lockstep for a few more potential bugfixes, 
given recent mastodon API additions.


Upstream have agreed to merge and re-release with a dependency allowing 
versions below 1.5.0. It sounded like that will happen ASAP, but if not, 
or if they find breakage, I will counter-diff on 1.4.5 so we can get in 
your tootstream update quickly.


-Pamela

Re: UPDATE: productivity/zim 0.69

[Pamela Mosiejczuk]

OK

On 3/27/19 3:59 PM, Sebastian Benoit wrote:

just a tiny update:

=== 0.69 - Sun 16 Dec 2018 ===
* Performance improvements for indexing large notebooks
* Performance improvement for auto-completion of page names in dialogs
* Updated translations from launchpad


ok?


Index: Makefile
===
RCS file: /cvs/ports/productivity/zim/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile10 Dec 2018 23:38:37 -  1.20
+++ Makefile27 Mar 2019 19:57:42 -
@@ -2,7 +2,7 @@
  
  COMMENT =		desktop wiki
  
-MODPY_EGG_VERSION =	0.68

+MODPY_EGG_VERSION =0.69
  DISTNAME =zim-${MODPY_EGG_VERSION}
  
  CATEGORIES =		productivity

Index: distinfo
===
RCS file: /cvs/ports/productivity/zim/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo10 Dec 2018 23:38:37 -  1.8
+++ distinfo27 Mar 2019 19:57:42 -
@@ -1,2 +1,2 @@
-SHA256 (zim-0.68.tar.gz) = 2RUY4BD2pulRp1MUE4tVRaTFEVH8mfUTqndooYhY3xU=
-SIZE (zim-0.68.tar.gz) = 2044224
+SHA256 (zim-0.69.tar.gz) = QZkIcIk5dqbiAnHh9ZoLiWAA82chjybBOohHElKgBMg=
+SIZE (zim-0.69.tar.gz) = 2044631

Re: Adding TEST_ENV/UTF-8 to various ports

[Pamela Mosiejczuk]

On 3/16/19 5:12 PM, Remi Locherer wrote:



This adds TEST_ENV to python.port.mk. Plus it adds MODPY_PYTEST and
MODPY_PYTEST_ARGS to deal with "-m pytest". I counted a bit more than
70 ports using this testing method.

I added productivity/vdirsyncer as an example.

OK?

Remi


Tried on an assortment of relevant ports, including py-click-log, 
py-cairocffi (needs MODPY_PYTEST_ARGS = lib/cairocffi) and the py3 
version of py-lazy-object-proxy, as well as py-betamax and the included 
vdirsyncer, with no surprises.


for my part, OK pamela@