Re: py-msgpack 1.0.0 upgrade broke salt

2020-03-13 Thread Jeremie Courreges-Anglas 
On Fri, Mar 13 2020, Stuart Henderson  wrote:
> On 2020/03/13 12:25, Jeremie Courreges-Anglas wrote:
>> I *think* I've seen an EPOCH change where a bump was needed for
>> consumers, but I have no idea which change and why.  Anyway make
>> repackage works fine in py-msgpack consumers, that's enough for me to
>> say that a bump is not needed (of course that needs PLIST_DB).
>
> This should only be needed if there is a version number in a
> dependency port and that has to change.
>
>> >  # requirements/base.txt
>> >  RUN_DEPENDS = devel/py-futures \
>> > -  net/py-msgpack \
>> > +  net/py-msgpack<=0.6.2v0 \
>> 
>> This should be net/py-msgpack>=0.6.2v0 instead, 0.6.2v0 > 1.0.0.
>> With this fixed, ok jca@
>
> Depends on the purpose of the RUN_DEPENDS line...

>From my PoV it's just about increasing the chances of pushing a working
salt package to end users.

> if it's to act as a
> hint to future porters that py-msgpack can't be updated with this version
> of salt, then bket's version makes a lot of sense. Or it could cover both
> min and max versions with something like >=0.6.2v0,<1.0.0v0 (warning I have
> not tested that :)

Documenting the version requirement occurred to me but I failed to
mention it.  Your proposal seems to work correctly, ok jca@

I guess a comment in py-msgpack/Makefile would be needed too if the port
didn't have a maintainer, but I'll just let Bjorn see what works best
for him.

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: py-msgpack 1.0.0 upgrade broke salt

2020-03-13 Thread Stuart Henderson 
On 2020/03/13 12:25, Jeremie Courreges-Anglas wrote:
> I *think* I've seen an EPOCH change where a bump was needed for
> consumers, but I have no idea which change and why.  Anyway make
> repackage works fine in py-msgpack consumers, that's enough for me to
> say that a bump is not needed (of course that needs PLIST_DB).

This should only be needed if there is a version number in a
dependency port and that has to change.

> >  # requirements/base.txt
> >  RUN_DEPENDS =  devel/py-futures \
> > -   net/py-msgpack \
> > +   net/py-msgpack<=0.6.2v0 \
> 
> This should be net/py-msgpack>=0.6.2v0 instead, 0.6.2v0 > 1.0.0.
> With this fixed, ok jca@

Depends on the purpose of the RUN_DEPENDS line... if it's to act as a
hint to future porters that py-msgpack can't be updated with this version
of salt, then bket's version makes a lot of sense. Or it could cover both
min and max versions with something like >=0.6.2v0,<1.0.0v0 (warning I have
not tested that :)

Re: py-msgpack 1.0.0 upgrade broke salt

2020-03-13 Thread Jeremie Courreges-Anglas 
On Fri, Mar 13 2020, Bjorn Ketelaars  wrote:
> On Thu 12/03/2020 20:30, Jeremie Courreges-Anglas wrote:
>> >> >I discussed py-msgpack offlist with another user who needed
>> >> >py-msgpack-1.0.0 for an update of a vim plugin.
>> 
>> I'm no salt or vim user but... I think having salt working properly is
>> much higher priority than an update for a vim plugin.  Especially as 6.7
>> is approaching.
>> 
>> >>> Although the update of
>> >> >py-msgpack has been tested this issue has not been seen.
>> >> >
>> >> >It seems that upstream of salt is still working on a solution [0]. Easy
>> >> >fix therefore is to revert py-msgpack to 0.6.2, and bump its
>> >> >consumers.
>> 
>> Do you need to bump all consumers?  I suspect it would be enough to
>> enforce the version requirements in sysutils/salt and bump its REVISION.
>
> Likely caused by my ignorance, but I thought that I needed to bump all
> consumers.

I *think* I've seen an EPOCH change where a bump was needed for
consumers, but I have no idea which change and why.  Anyway make
repackage works fine in py-msgpack consumers, that's enough for me to
say that a bump is not needed (of course that needs PLIST_DB).

--8<--
russell /usr/ports/net/synapse$ make repackage
===>  Cleaning for synapse-1.11.1
/usr/bin/doas -u _pbuild rm -f /usr/ports/packages/amd64/all/synapse-1.11.1.tgz 
/usr/ports/packages/amd64/ftp/synapse-1.11.1.tgz 
/usr/ports/pobj/synapse-1.11.1/fake-amd64/debug-pkg/Makefile
/usr/bin/doas -u _pfetch rm -f 
/usr/ports/packages/amd64/cache/synapse-1.11.1.tgz
rm -f  /usr/ports/update/amd64/synapse-1.11.1
`/usr/ports/pobj/synapse-1.11.1/fake-amd64/.fake_done' is up to date.
Installing /usr/ports/net/synapse/pkg/README as 
/usr/ports/pobj/synapse-1.11.1/fake-amd64/usr/local/share/doc/pkg-readmes/synapse
Installing /usr/ports/net/synapse/pkg/synapse.rc as 
/usr/ports/pobj/synapse-1.11.1/fake-amd64/etc/rc.d/synapse
===>  Building package for synapse-1.11.1
Create /usr/ports/packages/amd64/all/synapse-1.11.1.tgz
Creating package synapse-1.11.1
/usr/ports/plist/amd64/synapse-1.11.1 was updated
@depend net/py-msgpack,python3:py3-msgpack-*:py3-msgpack-1.0.0 -> @depend 
net/py-msgpack,python3:py3-msgpack-*:py3-msgpack-0.6.2v0
^^
Link to /usr/ports/packages/amd64/ftp/synapse-1.11.1.tgz
russell /usr/ports/net/synapse$
-->8--


> Enclosed a new diff which reverts py-msgpack to 0.6.2, and enforces
> version requirements in salt and bumps REVISION. I will commit this
> tonight unless someone has a better idea.

Please see below,

> diff --git net/py-msgpack/Makefile net/py-msgpack/Makefile
> index ea82fc3e07a..c06d478b9de 100644
> --- net/py-msgpack/Makefile
> +++ net/py-msgpack/Makefile
> @@ -2,7 +2,8 @@
>  
>  COMMENT =messagepack (de)serializer
>  
> -MODPY_EGG_VERSION =  1.0.0
> +MODPY_EGG_VERSION =  0.6.2
> +EPOCH =  0
>  DISTNAME =   msgpack-${MODPY_EGG_VERSION}
>  PKGNAME =py-msgpack-${MODPY_EGG_VERSION}
>  
> diff --git net/py-msgpack/distinfo net/py-msgpack/distinfo
> index 5ec380d7403..8d9bdadf9d3 100644
> --- net/py-msgpack/distinfo
> +++ net/py-msgpack/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (msgpack-1.0.0.tar.gz) = lTTVzEgNSv9yAjNBGh92W+kIhXULB993I4CzTBDstcA=
> -SIZE (msgpack-1.0.0.tar.gz) = 232331
> +SHA256 (msgpack-0.6.2.tar.gz) = 6jwvhZNG/NVfxG6WiFMB2cL3o21FP12PKWeEDvoeGDA=
> +SIZE (msgpack-0.6.2.tar.gz) = 119062
> diff --git net/py-msgpack/pkg/PLIST net/py-msgpack/pkg/PLIST
> index 7d948a0df47..2f24d170108 100644
> --- net/py-msgpack/pkg/PLIST
> +++ net/py-msgpack/pkg/PLIST
> @@ -10,10 +10,8 @@ 
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE
>  
> lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}ext.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}fallback.${MODPY_PYC_MAGIC_TAG}pyc
> -${MODPY_COMMENT}@so 
> lib/python${MODPY_VERSION}/site-packages/msgpack/_cmsgpack.so
> +@so lib/python${MODPY_VERSION}/site-packages/msgpack/_cmsgpack.so
>  lib/python${MODPY_VERSION}/site-packages/msgpack/_version.py
>  lib/python${MODPY_VERSION}/site-packages/msgpack/exceptions.py
> -lib/python${MODPY_VERSION}/site-packages/msgpack/ext.py
>  lib/python${MODPY_VERSION}/site-packages/msgpack/fallback.py
> diff --git sysutils/salt/Makefile sysutils/salt/Makefile
> index 5129c2a60ad..d75547f2fbc 100644
> --- sysutils/salt/Makefile
> +++ sysutils/salt/Makefile
> @@ -19,7 +19,7 @@ COMMENT =   remote execution and configuration 
> management system
>  
>  MODPY_EGG_VERSION =  2018.3.3
>

Re: py-msgpack 1.0.0 upgrade broke salt

2020-03-13 Thread Bjorn Ketelaars 
On Thu 12/03/2020 20:30, Jeremie Courreges-Anglas wrote:
> >> >I discussed py-msgpack offlist with another user who needed
> >> >py-msgpack-1.0.0 for an update of a vim plugin.
> 
> I'm no salt or vim user but... I think having salt working properly is
> much higher priority than an update for a vim plugin.  Especially as 6.7
> is approaching.
> 
> >>> Although the update of
> >> >py-msgpack has been tested this issue has not been seen.
> >> >
> >> >It seems that upstream of salt is still working on a solution [0]. Easy
> >> >fix therefore is to revert py-msgpack to 0.6.2, and bump its
> >> >consumers.
> 
> Do you need to bump all consumers?  I suspect it would be enough to
> enforce the version requirements in sysutils/salt and bump its REVISION.

Likely caused by my ignorance, but I thought that I needed to bump all
consumers.

Enclosed a new diff which reverts py-msgpack to 0.6.2, and enforces
version requirements in salt and bumps REVISION. I will commit this
tonight unless someone has a better idea.


diff --git net/py-msgpack/Makefile net/py-msgpack/Makefile
index ea82fc3e07a..c06d478b9de 100644
--- net/py-msgpack/Makefile
+++ net/py-msgpack/Makefile
@@ -2,7 +2,8 @@
 
 COMMENT =  messagepack (de)serializer
 
-MODPY_EGG_VERSION =1.0.0
+MODPY_EGG_VERSION =0.6.2
+EPOCH =0
 DISTNAME = msgpack-${MODPY_EGG_VERSION}
 PKGNAME =  py-msgpack-${MODPY_EGG_VERSION}
 
diff --git net/py-msgpack/distinfo net/py-msgpack/distinfo
index 5ec380d7403..8d9bdadf9d3 100644
--- net/py-msgpack/distinfo
+++ net/py-msgpack/distinfo
@@ -1,2 +1,2 @@
-SHA256 (msgpack-1.0.0.tar.gz) = lTTVzEgNSv9yAjNBGh92W+kIhXULB993I4CzTBDstcA=
-SIZE (msgpack-1.0.0.tar.gz) = 232331
+SHA256 (msgpack-0.6.2.tar.gz) = 6jwvhZNG/NVfxG6WiFMB2cL3o21FP12PKWeEDvoeGDA=
+SIZE (msgpack-0.6.2.tar.gz) = 119062
diff --git net/py-msgpack/pkg/PLIST net/py-msgpack/pkg/PLIST
index 7d948a0df47..2f24d170108 100644
--- net/py-msgpack/pkg/PLIST
+++ net/py-msgpack/pkg/PLIST
@@ -10,10 +10,8 @@ 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE
 
lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}ext.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}fallback.${MODPY_PYC_MAGIC_TAG}pyc
-${MODPY_COMMENT}@so 
lib/python${MODPY_VERSION}/site-packages/msgpack/_cmsgpack.so
+@so lib/python${MODPY_VERSION}/site-packages/msgpack/_cmsgpack.so
 lib/python${MODPY_VERSION}/site-packages/msgpack/_version.py
 lib/python${MODPY_VERSION}/site-packages/msgpack/exceptions.py
-lib/python${MODPY_VERSION}/site-packages/msgpack/ext.py
 lib/python${MODPY_VERSION}/site-packages/msgpack/fallback.py
diff --git sysutils/salt/Makefile sysutils/salt/Makefile
index 5129c2a60ad..d75547f2fbc 100644
--- sysutils/salt/Makefile
+++ sysutils/salt/Makefile
@@ -19,7 +19,7 @@ COMMENT = remote execution and configuration 
management system
 
 MODPY_EGG_VERSION =2018.3.3
 DISTNAME = salt-${MODPY_EGG_VERSION}
-REVISION = 0
+REVISION = 1
 
 CATEGORIES =   sysutils net devel
 
@@ -40,7 +40,7 @@ BUILD_DEPENDS =   textproc/py-yaml \

 # requirements/base.txt
 RUN_DEPENDS =  devel/py-futures \
-   net/py-msgpack \
+   net/py-msgpack<=0.6.2v0 \
textproc/py-MarkupSafe \
textproc/py-yaml \
www/py-jinja2 \

Re: py-msgpack 1.0.0 upgrade broke salt

2020-03-12 Thread Jeremie Courreges-Anglas 
On Wed, Mar 11 2020, Florian Obser  wrote:
> FWIW this one works for me, pkg_add also sees it as an updated.
> Thanks,
> Florian
>
> On Tue, Mar 10, 2020 at 10:45:08PM +0100, Florian Obser wrote:
>> I don't have an opinion on how best to fix this, so don't wait on me ;)
>> 
>> On 10 March 2020 21:28:42 CET, Bjorn Ketelaars  wrote:
>> >On Tue 10/03/2020 19:49, Florian Obser wrote:
>> >> The release notes have
>> >> 
>> >> * Remove encoding option from the Packer and Unpacker.
>> >> 
>> >> ( https://github.com/msgpack/msgpack-python/blob/v1.0.0/ChangeLog.rst
>> >)
>> >> 
>> >> $ doas salt-minion  
>> >> 
>> >
>> >I discussed py-msgpack offlist with another user who needed
>> >py-msgpack-1.0.0 for an update of a vim plugin.

I'm no salt or vim user but... I think having salt working properly is
much higher priority than an update for a vim plugin.  Especially as 6.7
is approaching.

>>> Although the update of
>> >py-msgpack has been tested this issue has not been seen.
>> >
>> >It seems that upstream of salt is still working on a solution [0]. Easy
>> >fix therefore is to revert py-msgpack to 0.6.2, and bump its
>> >consumers.

Do you need to bump all consumers?  I suspect it would be enough to
enforce the version requirements in sysutils/salt and bump its REVISION.

>> >Downside of course would be that specific vim plugins will start
>> >complaining.
>> >
>> >I had a look at the consumers of py-msgpack, which we have in ports.
>> >All of them seem happy with py-msgpack-0.6.2. None of them, except
>> >net/synapse, received an update recently. synapse relies on
>> >msgpack>=0.5.2 [1]:
>> >
>> >  RUN_DEPENDS
>> >/usr/ports/devel/py-test-expect
>> >/usr/ports/devel/py-test-expect,python3
>> >/usr/ports/editors/py-neovim
>> >/usr/ports/editors/py-neovim,python3
>> >/usr/ports/net/synapse
>> >/usr/ports/sysutils/salt
>> >  TEST_DEPENDS
>> >/usr/ports/editors/py-neovim
>> >/usr/ports/editors/py-neovim,python3
>> >/usr/ports/net/synapse
>> >/usr/ports/sysutils/salt
>> >
>> >Different route would be to support two versions of py-msgpack. For now
>> >I propose to make sure that all ports work, thus revert. I will take a
>> >look at the alternative route in the near future.
>> >
>> >Comments/OK?
>> >
>> >[0] https://github.com/saltstack/salt/issues/56007
>> >[1]
>> >https://github.com/matrix-org/synapse/blob/master/synapse/python_dependencies.py
>> >
>> >
>> >diff --git devel/py-test-expect/Makefile devel/py-test-expect/Makefile
>> >index f19faf3d50b..0768ce54782 100644
>> >--- devel/py-test-expect/Makefile
>> >+++ devel/py-test-expect/Makefile
>> >@@ -6,7 +6,7 @@ MODPY_EGG_VERSION = 1.1.0
>> > DISTNAME = pytest-expect-${MODPY_EGG_VERSION}
>> > PKGNAME =  ${DISTNAME:S/py/py-/}
>> > CATEGORIES =   devel
>> >-REVISION = 1
>> >+REVISION = 2
>> > 
>> > HOMEPAGE = https://github.com/gsnedders/pytest-expect
>> > 
>> >diff --git editors/py-neovim/Makefile editors/py-neovim/Makefile
>> >index ef30c889738..185624959d5 100644
>> >--- editors/py-neovim/Makefile
>> >+++ editors/py-neovim/Makefile
>> >@@ -3,6 +3,7 @@
>> > COMMENT =  Python plugin support for Neovim
>> > 
>> > MODPY_EGG_VERSION =0.4.0
>> >+REVISION = 0
>> > DISTNAME = pynvim-${MODPY_EGG_VERSION}
>> > PKGNAME =  py-neovim-${MODPY_EGG_VERSION}
>> > 
>> >diff --git net/py-msgpack/Makefile net/py-msgpack/Makefile
>> >index ea82fc3e07a..c06d478b9de 100644
>> >--- net/py-msgpack/Makefile
>> >+++ net/py-msgpack/Makefile
>> >@@ -2,7 +2,8 @@
>> > 
>> > COMMENT =  messagepack (de)serializer
>> > 
>> >-MODPY_EGG_VERSION =1.0.0
>> >+MODPY_EGG_VERSION =0.6.2
>> >+EPOCH =0
>> > DISTNAME = msgpack-${MODPY_EGG_VERSION}
>> > PKGNAME =  py-msgpack-${MODPY_EGG_VERSION}
>> > 
>> >diff --git net/py-msgpack/distinfo net/py-msgpack/distinfo
>> >index 5ec380d7403..8d9bdadf9d3 100644
>> >--- net/py-msgpack/distinfo
>> >+++ net/py-msgpack/distinfo
>> >@@ -1,2 +1,2 @@
>> >-SHA256 (msgpack-1.0.0.tar.gz) =
>> >lTTVzEgNSv9yAjNBGh92W+kIhXULB993I4CzTBDstcA=
>> >-SIZE (msgpack-1.0.0.tar.gz) = 232331
>> >+SHA256 (msgpack-0.6.2.tar.gz) =
>> >6jwvhZNG/NVfxG6WiFMB2cL3o21FP12PKWeEDvoeGDA=
>> >+SIZE (msgpack-0.6.2.tar.gz) = 119062
>> >diff --git net/py-msgpack/pkg/PLIST net/py-msgpack/pkg/PLIST
>> >index 7d948a0df47..2f24d170108 100644
>> >--- net/py-msgpack/pkg/PLIST
>> >+++ net/py-msgpack/pkg/PLIST
>> >@@ -10,10 +10,8 @@
>> >${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE
>> >lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
>> >lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
>> >lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
>> >-lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}ext.${MODPY_PYC_MAGIC_TAG}pyc
>> >lib/pyt

Re: py-msgpack 1.0.0 upgrade broke salt

2020-03-11 Thread Florian Obser 
FWIW this one works for me, pkg_add also sees it as an updated.
Thanks,
Florian

On Tue, Mar 10, 2020 at 10:45:08PM +0100, Florian Obser wrote:
> I don't have an opinion on how best to fix this, so don't wait on me ;)
> 
> On 10 March 2020 21:28:42 CET, Bjorn Ketelaars  wrote:
> >On Tue 10/03/2020 19:49, Florian Obser wrote:
> >> The release notes have
> >> 
> >> * Remove encoding option from the Packer and Unpacker.
> >> 
> >> ( https://github.com/msgpack/msgpack-python/blob/v1.0.0/ChangeLog.rst
> >)
> >> 
> >> $ doas salt-minion  
> >> 
> >
> >I discussed py-msgpack offlist with another user who needed
> >py-msgpack-1.0.0 for an update of a vim plugin. Although the update of
> >py-msgpack has been tested this issue has not been seen.
> >
> >It seems that upstream of salt is still working on a solution [0]. Easy
> >fix therefore is to revert py-msgpack to 0.6.2, and bump its consumers.
> >Downside of course would be that specific vim plugins will start
> >complaining.
> >
> >I had a look at the consumers of py-msgpack, which we have in ports.
> >All of them seem happy with py-msgpack-0.6.2. None of them, except
> >net/synapse, received an update recently. synapse relies on
> >msgpack>=0.5.2 [1]:
> >
> >  RUN_DEPENDS
> >/usr/ports/devel/py-test-expect
> >/usr/ports/devel/py-test-expect,python3
> >/usr/ports/editors/py-neovim
> >/usr/ports/editors/py-neovim,python3
> >/usr/ports/net/synapse
> >/usr/ports/sysutils/salt
> >  TEST_DEPENDS
> >/usr/ports/editors/py-neovim
> >/usr/ports/editors/py-neovim,python3
> >/usr/ports/net/synapse
> >/usr/ports/sysutils/salt
> >
> >Different route would be to support two versions of py-msgpack. For now
> >I propose to make sure that all ports work, thus revert. I will take a
> >look at the alternative route in the near future.
> >
> >Comments/OK?
> >
> >[0] https://github.com/saltstack/salt/issues/56007
> >[1]
> >https://github.com/matrix-org/synapse/blob/master/synapse/python_dependencies.py
> >
> >
> >diff --git devel/py-test-expect/Makefile devel/py-test-expect/Makefile
> >index f19faf3d50b..0768ce54782 100644
> >--- devel/py-test-expect/Makefile
> >+++ devel/py-test-expect/Makefile
> >@@ -6,7 +6,7 @@ MODPY_EGG_VERSION =  1.1.0
> > DISTNAME =  pytest-expect-${MODPY_EGG_VERSION}
> > PKGNAME =   ${DISTNAME:S/py/py-/}
> > CATEGORIES =devel
> >-REVISION =  1
> >+REVISION =  2
> > 
> > HOMEPAGE =  https://github.com/gsnedders/pytest-expect
> > 
> >diff --git editors/py-neovim/Makefile editors/py-neovim/Makefile
> >index ef30c889738..185624959d5 100644
> >--- editors/py-neovim/Makefile
> >+++ editors/py-neovim/Makefile
> >@@ -3,6 +3,7 @@
> > COMMENT =   Python plugin support for Neovim
> > 
> > MODPY_EGG_VERSION = 0.4.0
> >+REVISION =  0
> > DISTNAME =  pynvim-${MODPY_EGG_VERSION}
> > PKGNAME =   py-neovim-${MODPY_EGG_VERSION}
> > 
> >diff --git net/py-msgpack/Makefile net/py-msgpack/Makefile
> >index ea82fc3e07a..c06d478b9de 100644
> >--- net/py-msgpack/Makefile
> >+++ net/py-msgpack/Makefile
> >@@ -2,7 +2,8 @@
> > 
> > COMMENT =   messagepack (de)serializer
> > 
> >-MODPY_EGG_VERSION = 1.0.0
> >+MODPY_EGG_VERSION = 0.6.2
> >+EPOCH = 0
> > DISTNAME =  msgpack-${MODPY_EGG_VERSION}
> > PKGNAME =   py-msgpack-${MODPY_EGG_VERSION}
> > 
> >diff --git net/py-msgpack/distinfo net/py-msgpack/distinfo
> >index 5ec380d7403..8d9bdadf9d3 100644
> >--- net/py-msgpack/distinfo
> >+++ net/py-msgpack/distinfo
> >@@ -1,2 +1,2 @@
> >-SHA256 (msgpack-1.0.0.tar.gz) =
> >lTTVzEgNSv9yAjNBGh92W+kIhXULB993I4CzTBDstcA=
> >-SIZE (msgpack-1.0.0.tar.gz) = 232331
> >+SHA256 (msgpack-0.6.2.tar.gz) =
> >6jwvhZNG/NVfxG6WiFMB2cL3o21FP12PKWeEDvoeGDA=
> >+SIZE (msgpack-0.6.2.tar.gz) = 119062
> >diff --git net/py-msgpack/pkg/PLIST net/py-msgpack/pkg/PLIST
> >index 7d948a0df47..2f24d170108 100644
> >--- net/py-msgpack/pkg/PLIST
> >+++ net/py-msgpack/pkg/PLIST
> >@@ -10,10 +10,8 @@
> >${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE
> >lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> >lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
> >lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
> >-lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}ext.${MODPY_PYC_MAGIC_TAG}pyc
> >lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}fallback.${MODPY_PYC_MAGIC_TAG}pyc
> >-${MODPY_COMMENT}@so
> >lib/python${MODPY_VERSION}/site-packages/msgpack/_cmsgpack.so
> >+@so lib/python${MODPY_VERSION}/site-packages/msgpack/_cmsgpack.so
> > lib/python${MODPY_VERSION}/site-packages/msgpack/_version.py
> > lib/python${MODPY_VERSION}/site-packages/msgpack/exceptions.py
> >-lib/python${MODPY_VERSION}/site-packages/msgpack/ext.py
> > lib/python${MODPY_VERSION}/site-pack

Re: py-msgpack 1.0.0 upgrade broke salt

2020-03-10 Thread Florian Obser 
I don't have an opinion on how best to fix this, so don't wait on me ;)

On 10 March 2020 21:28:42 CET, Bjorn Ketelaars  wrote:
>On Tue 10/03/2020 19:49, Florian Obser wrote:
>> The release notes have
>> 
>> * Remove encoding option from the Packer and Unpacker.
>> 
>> ( https://github.com/msgpack/msgpack-python/blob/v1.0.0/ChangeLog.rst
>)
>> 
>> $ doas salt-minion  
>> 
>
>I discussed py-msgpack offlist with another user who needed
>py-msgpack-1.0.0 for an update of a vim plugin. Although the update of
>py-msgpack has been tested this issue has not been seen.
>
>It seems that upstream of salt is still working on a solution [0]. Easy
>fix therefore is to revert py-msgpack to 0.6.2, and bump its consumers.
>Downside of course would be that specific vim plugins will start
>complaining.
>
>I had a look at the consumers of py-msgpack, which we have in ports.
>All of them seem happy with py-msgpack-0.6.2. None of them, except
>net/synapse, received an update recently. synapse relies on
>msgpack>=0.5.2 [1]:
>
>  RUN_DEPENDS
>/usr/ports/devel/py-test-expect
>/usr/ports/devel/py-test-expect,python3
>/usr/ports/editors/py-neovim
>/usr/ports/editors/py-neovim,python3
>/usr/ports/net/synapse
>/usr/ports/sysutils/salt
>  TEST_DEPENDS
>/usr/ports/editors/py-neovim
>/usr/ports/editors/py-neovim,python3
>/usr/ports/net/synapse
>/usr/ports/sysutils/salt
>
>Different route would be to support two versions of py-msgpack. For now
>I propose to make sure that all ports work, thus revert. I will take a
>look at the alternative route in the near future.
>
>Comments/OK?
>
>[0] https://github.com/saltstack/salt/issues/56007
>[1]
>https://github.com/matrix-org/synapse/blob/master/synapse/python_dependencies.py
>
>
>diff --git devel/py-test-expect/Makefile devel/py-test-expect/Makefile
>index f19faf3d50b..0768ce54782 100644
>--- devel/py-test-expect/Makefile
>+++ devel/py-test-expect/Makefile
>@@ -6,7 +6,7 @@ MODPY_EGG_VERSION =1.1.0
> DISTNAME =pytest-expect-${MODPY_EGG_VERSION}
> PKGNAME = ${DISTNAME:S/py/py-/}
> CATEGORIES =  devel
>-REVISION =1
>+REVISION =2
> 
> HOMEPAGE =https://github.com/gsnedders/pytest-expect
> 
>diff --git editors/py-neovim/Makefile editors/py-neovim/Makefile
>index ef30c889738..185624959d5 100644
>--- editors/py-neovim/Makefile
>+++ editors/py-neovim/Makefile
>@@ -3,6 +3,7 @@
> COMMENT = Python plugin support for Neovim
> 
> MODPY_EGG_VERSION =   0.4.0
>+REVISION =0
> DISTNAME =pynvim-${MODPY_EGG_VERSION}
> PKGNAME = py-neovim-${MODPY_EGG_VERSION}
> 
>diff --git net/py-msgpack/Makefile net/py-msgpack/Makefile
>index ea82fc3e07a..c06d478b9de 100644
>--- net/py-msgpack/Makefile
>+++ net/py-msgpack/Makefile
>@@ -2,7 +2,8 @@
> 
> COMMENT = messagepack (de)serializer
> 
>-MODPY_EGG_VERSION =   1.0.0
>+MODPY_EGG_VERSION =   0.6.2
>+EPOCH =   0
> DISTNAME =msgpack-${MODPY_EGG_VERSION}
> PKGNAME = py-msgpack-${MODPY_EGG_VERSION}
> 
>diff --git net/py-msgpack/distinfo net/py-msgpack/distinfo
>index 5ec380d7403..8d9bdadf9d3 100644
>--- net/py-msgpack/distinfo
>+++ net/py-msgpack/distinfo
>@@ -1,2 +1,2 @@
>-SHA256 (msgpack-1.0.0.tar.gz) =
>lTTVzEgNSv9yAjNBGh92W+kIhXULB993I4CzTBDstcA=
>-SIZE (msgpack-1.0.0.tar.gz) = 232331
>+SHA256 (msgpack-0.6.2.tar.gz) =
>6jwvhZNG/NVfxG6WiFMB2cL3o21FP12PKWeEDvoeGDA=
>+SIZE (msgpack-0.6.2.tar.gz) = 119062
>diff --git net/py-msgpack/pkg/PLIST net/py-msgpack/pkg/PLIST
>index 7d948a0df47..2f24d170108 100644
>--- net/py-msgpack/pkg/PLIST
>+++ net/py-msgpack/pkg/PLIST
>@@ -10,10 +10,8 @@
>${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE
>lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
>lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
>lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
>-lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}ext.${MODPY_PYC_MAGIC_TAG}pyc
>lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}fallback.${MODPY_PYC_MAGIC_TAG}pyc
>-${MODPY_COMMENT}@so
>lib/python${MODPY_VERSION}/site-packages/msgpack/_cmsgpack.so
>+@so lib/python${MODPY_VERSION}/site-packages/msgpack/_cmsgpack.so
> lib/python${MODPY_VERSION}/site-packages/msgpack/_version.py
> lib/python${MODPY_VERSION}/site-packages/msgpack/exceptions.py
>-lib/python${MODPY_VERSION}/site-packages/msgpack/ext.py
> lib/python${MODPY_VERSION}/site-packages/msgpack/fallback.py
>diff --git net/synapse/Makefile net/synapse/Makefile
>index dd2b881637b..b9a8cb8416a 100644
>--- net/synapse/Makefile
>+++ net/synapse/Makefile
>@@ -3,6 +3,7 @@
> COMMENT = open network for secure, decentralized communication
> 
> MODPY_EGG_VERSION =   1.11.1
>+REVISION =0
> 
> GH_ACCOUNT =  matrix-org
> GH_PROJE

Re: py-msgpack 1.0.0 upgrade broke salt

2020-03-10 Thread Bjorn Ketelaars 
On Tue 10/03/2020 19:49, Florian Obser wrote:
> The release notes have
> 
> * Remove encoding option from the Packer and Unpacker.
> 
> ( https://github.com/msgpack/msgpack-python/blob/v1.0.0/ChangeLog.rst )
> 
> $ doas salt-minion  
> 

I discussed py-msgpack offlist with another user who needed
py-msgpack-1.0.0 for an update of a vim plugin. Although the update of
py-msgpack has been tested this issue has not been seen.

It seems that upstream of salt is still working on a solution [0]. Easy
fix therefore is to revert py-msgpack to 0.6.2, and bump its consumers.
Downside of course would be that specific vim plugins will start
complaining.

I had a look at the consumers of py-msgpack, which we have in ports.
All of them seem happy with py-msgpack-0.6.2. None of them, except
net/synapse, received an update recently. synapse relies on
msgpack>=0.5.2 [1]:

  RUN_DEPENDS
/usr/ports/devel/py-test-expect
/usr/ports/devel/py-test-expect,python3
/usr/ports/editors/py-neovim
/usr/ports/editors/py-neovim,python3
/usr/ports/net/synapse
/usr/ports/sysutils/salt
  TEST_DEPENDS
/usr/ports/editors/py-neovim
/usr/ports/editors/py-neovim,python3
/usr/ports/net/synapse
/usr/ports/sysutils/salt

Different route would be to support two versions of py-msgpack. For now
I propose to make sure that all ports work, thus revert. I will take a
look at the alternative route in the near future.

Comments/OK?

[0] https://github.com/saltstack/salt/issues/56007
[1] 
https://github.com/matrix-org/synapse/blob/master/synapse/python_dependencies.py


diff --git devel/py-test-expect/Makefile devel/py-test-expect/Makefile
index f19faf3d50b..0768ce54782 100644
--- devel/py-test-expect/Makefile
+++ devel/py-test-expect/Makefile
@@ -6,7 +6,7 @@ MODPY_EGG_VERSION = 1.1.0
 DISTNAME = pytest-expect-${MODPY_EGG_VERSION}
 PKGNAME =  ${DISTNAME:S/py/py-/}
 CATEGORIES =   devel
-REVISION = 1
+REVISION = 2
 
 HOMEPAGE = https://github.com/gsnedders/pytest-expect
 
diff --git editors/py-neovim/Makefile editors/py-neovim/Makefile
index ef30c889738..185624959d5 100644
--- editors/py-neovim/Makefile
+++ editors/py-neovim/Makefile
@@ -3,6 +3,7 @@
 COMMENT =  Python plugin support for Neovim
 
 MODPY_EGG_VERSION =0.4.0
+REVISION = 0
 DISTNAME = pynvim-${MODPY_EGG_VERSION}
 PKGNAME =  py-neovim-${MODPY_EGG_VERSION}
 
diff --git net/py-msgpack/Makefile net/py-msgpack/Makefile
index ea82fc3e07a..c06d478b9de 100644
--- net/py-msgpack/Makefile
+++ net/py-msgpack/Makefile
@@ -2,7 +2,8 @@
 
 COMMENT =  messagepack (de)serializer
 
-MODPY_EGG_VERSION =1.0.0
+MODPY_EGG_VERSION =0.6.2
+EPOCH =0
 DISTNAME = msgpack-${MODPY_EGG_VERSION}
 PKGNAME =  py-msgpack-${MODPY_EGG_VERSION}
 
diff --git net/py-msgpack/distinfo net/py-msgpack/distinfo
index 5ec380d7403..8d9bdadf9d3 100644
--- net/py-msgpack/distinfo
+++ net/py-msgpack/distinfo
@@ -1,2 +1,2 @@
-SHA256 (msgpack-1.0.0.tar.gz) = lTTVzEgNSv9yAjNBGh92W+kIhXULB993I4CzTBDstcA=
-SIZE (msgpack-1.0.0.tar.gz) = 232331
+SHA256 (msgpack-0.6.2.tar.gz) = 6jwvhZNG/NVfxG6WiFMB2cL3o21FP12PKWeEDvoeGDA=
+SIZE (msgpack-0.6.2.tar.gz) = 119062
diff --git net/py-msgpack/pkg/PLIST net/py-msgpack/pkg/PLIST
index 7d948a0df47..2f24d170108 100644
--- net/py-msgpack/pkg/PLIST
+++ net/py-msgpack/pkg/PLIST
@@ -10,10 +10,8 @@ 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE
 
lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}ext.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}fallback.${MODPY_PYC_MAGIC_TAG}pyc
-${MODPY_COMMENT}@so 
lib/python${MODPY_VERSION}/site-packages/msgpack/_cmsgpack.so
+@so lib/python${MODPY_VERSION}/site-packages/msgpack/_cmsgpack.so
 lib/python${MODPY_VERSION}/site-packages/msgpack/_version.py
 lib/python${MODPY_VERSION}/site-packages/msgpack/exceptions.py
-lib/python${MODPY_VERSION}/site-packages/msgpack/ext.py
 lib/python${MODPY_VERSION}/site-packages/msgpack/fallback.py
diff --git net/synapse/Makefile net/synapse/Makefile
index dd2b881637b..b9a8cb8416a 100644
--- net/synapse/Makefile
+++ net/synapse/Makefile
@@ -3,6 +3,7 @@
 COMMENT =  open network for secure, decentralized communication
 
 MODPY_EGG_VERSION =1.11.1
+REVISION = 0
 
 GH_ACCOUNT =   matrix-org
 GH_PROJECT =   synapse
diff --git sysutils/salt/Makefile sysutils/salt/Makefile
index 5129c2a60ad..74117bfa890 100644
--- sysutils/salt/Makefile
+++ sysutils/salt/Makefile
@@ -19,7 +19,7 @@ COMMENT = remote execution and

Re: py-msgpack 1.0.0 upgrade broke salt

2020-03-10 Thread Stuart Henderson 

...but there might be other problems

https://github.com/saltstack/salt/issues/56007

--
Sent from a phone, apologies for poor formatting.

On 10 March 2020 20:16:39 Stuart Henderson  wrote:


Looks like this was fixed in salt 2019.2.1.


--
Sent from a phone, apologies for poor formatting.

On 10 March 2020 18:50:07 Florian Obser  wrote:


The release notes have

* Remove encoding option from the Packer and Unpacker.

( https://github.com/msgpack/msgpack-python/blob/v1.0.0/ChangeLog.rst )

$ doas salt-minion

Process Process-1:
Traceback (most recent call last):
 File "/usr/local/lib/python2.7/multiprocessing/process.py", line 267, in 
 _bootstrap

   self.run()
 File "/usr/local/lib/python2.7/multiprocessing/process.py", line 114, in run
   self._target(*self._args, **self._kwargs)
 File "/usr/local/lib/python2.7/site-packages/salt/scripts.py", line 146, in 
 minion_process

   minion.start()
 File "/usr/local/lib/python2.7/site-packages/salt/cli/daemons.py", line 
 348, in start

   self.minion.tune_in()
 File "/usr/local/lib/python2.7/site-packages/salt/minion.py", line 1026, in 
 tune_in

   self._bind()
 File "/usr/local/lib/python2.7/site-packages/salt/minion.py", line 940, in 
 _bind
   self.event = salt.utils.event.get_event('minion', opts=self.opts, 
   io_loop=self.io_loop)
 File "/usr/local/lib/python2.7/site-packages/salt/utils/event.py", line 
 143, in get_event

   raise_errors=raise_errors)
 File "/usr/local/lib/python2.7/site-packages/salt/utils/event.py", line 
 271, in __init__

   self.connect_pub()
 File "/usr/local/lib/python2.7/site-packages/salt/utils/event.py", line 
 383, in connect_pub

   io_loop=self.io_loop
 File "/usr/local/lib/python2.7/site-packages/salt/transport/ipc.py", line 
 257, in __new__

   client.__singleton_init__(io_loop=io_loop, socket_path=socket_path)
 File "/usr/local/lib/python2.7/site-packages/salt/transport/ipc.py", line 
 620, in __singleton_init__

   socket_path, io_loop=io_loop)
 File "/usr/local/lib/python2.7/site-packages/salt/transport/ipc.py", line 
 280, in __singleton_init__

   self.unpacker = msgpack.Unpacker(encoding=encoding)
TypeError: __init__() got an unexpected keyword argument 'encoding'

Thanks,
Florian

--
I'm not entirely sure you are real.

Re: py-msgpack 1.0.0 upgrade broke salt

2020-03-10 Thread Stuart Henderson 

Looks like this was fixed in salt 2019.2.1.


--
Sent from a phone, apologies for poor formatting.

On 10 March 2020 18:50:07 Florian Obser  wrote:


The release notes have

* Remove encoding option from the Packer and Unpacker.

( https://github.com/msgpack/msgpack-python/blob/v1.0.0/ChangeLog.rst )

$ doas salt-minion

Process Process-1:
Traceback (most recent call last):
 File "/usr/local/lib/python2.7/multiprocessing/process.py", line 267, in 
 _bootstrap

   self.run()
 File "/usr/local/lib/python2.7/multiprocessing/process.py", line 114, in run
   self._target(*self._args, **self._kwargs)
 File "/usr/local/lib/python2.7/site-packages/salt/scripts.py", line 146, in 
 minion_process

   minion.start()
 File "/usr/local/lib/python2.7/site-packages/salt/cli/daemons.py", line 
 348, in start

   self.minion.tune_in()
 File "/usr/local/lib/python2.7/site-packages/salt/minion.py", line 1026, in 
 tune_in

   self._bind()
 File "/usr/local/lib/python2.7/site-packages/salt/minion.py", line 940, in 
 _bind
   self.event = salt.utils.event.get_event('minion', opts=self.opts, 
   io_loop=self.io_loop)
 File "/usr/local/lib/python2.7/site-packages/salt/utils/event.py", line 
 143, in get_event

   raise_errors=raise_errors)
 File "/usr/local/lib/python2.7/site-packages/salt/utils/event.py", line 
 271, in __init__

   self.connect_pub()
 File "/usr/local/lib/python2.7/site-packages/salt/utils/event.py", line 
 383, in connect_pub

   io_loop=self.io_loop
 File "/usr/local/lib/python2.7/site-packages/salt/transport/ipc.py", line 
 257, in __new__

   client.__singleton_init__(io_loop=io_loop, socket_path=socket_path)
 File "/usr/local/lib/python2.7/site-packages/salt/transport/ipc.py", line 
 620, in __singleton_init__

   socket_path, io_loop=io_loop)
 File "/usr/local/lib/python2.7/site-packages/salt/transport/ipc.py", line 
 280, in __singleton_init__

   self.unpacker = msgpack.Unpacker(encoding=encoding)
TypeError: __init__() got an unexpected keyword argument 'encoding'

Thanks,
Florian

--
I'm not entirely sure you are real.

py-msgpack 1.0.0 upgrade broke salt

2020-03-10 Thread Florian Obser 
The release notes have

* Remove encoding option from the Packer and Unpacker.

( https://github.com/msgpack/msgpack-python/blob/v1.0.0/ChangeLog.rst )

$ doas salt-minion  

Process Process-1:
Traceback (most recent call last):
  File "/usr/local/lib/python2.7/multiprocessing/process.py", line 267, in 
_bootstrap
self.run()
  File "/usr/local/lib/python2.7/multiprocessing/process.py", line 114, in run
self._target(*self._args, **self._kwargs)
  File "/usr/local/lib/python2.7/site-packages/salt/scripts.py", line 146, in 
minion_process
minion.start()
  File "/usr/local/lib/python2.7/site-packages/salt/cli/daemons.py", line 348, 
in start
self.minion.tune_in()
  File "/usr/local/lib/python2.7/site-packages/salt/minion.py", line 1026, in 
tune_in
self._bind()
  File "/usr/local/lib/python2.7/site-packages/salt/minion.py", line 940, in 
_bind
self.event = salt.utils.event.get_event('minion', opts=self.opts, 
io_loop=self.io_loop)
  File "/usr/local/lib/python2.7/site-packages/salt/utils/event.py", line 143, 
in get_event
raise_errors=raise_errors)
  File "/usr/local/lib/python2.7/site-packages/salt/utils/event.py", line 271, 
in __init__
self.connect_pub()
  File "/usr/local/lib/python2.7/site-packages/salt/utils/event.py", line 383, 
in connect_pub
io_loop=self.io_loop
  File "/usr/local/lib/python2.7/site-packages/salt/transport/ipc.py", line 
257, in __new__
client.__singleton_init__(io_loop=io_loop, socket_path=socket_path)
  File "/usr/local/lib/python2.7/site-packages/salt/transport/ipc.py", line 
620, in __singleton_init__
socket_path, io_loop=io_loop)
  File "/usr/local/lib/python2.7/site-packages/salt/transport/ipc.py", line 
280, in __singleton_init__
self.unpacker = msgpack.Unpacker(encoding=encoding)
TypeError: __init__() got an unexpected keyword argument 'encoding'

Thanks,
Florian

-- 
I'm not entirely sure you are real.