Re: Update: net/py-slixmpp 1.4.2 -> 1.5.2

2020-07-08 Thread Björn Ketelaars
On Wed 08/07/2020 16:09, Paco Esteban wrote:
> On Wed, 08 Jul 2020, Björn Ketelaars wrote:
> 
> > On Wed 08/07/2020 10:39, Paco Esteban wrote:
> > > Comments/ok welcome.
> > 
> > Diff looks ok, though you should run 'make update-patches'. Builds ok.
> 
> You're right.  Diff included at the end with the update-patches.
> 
> > 
> > Guess having a newer version of py3-cares is important as (all) tests
> > fail when having the version from ports (py-cares-2.4.0;p1) around.
> > Updating to py-cares-3.1.1 (from kmos@, which has not been committed
> > yet) seems to be a requirement, though one test still fails.
> 
> Yes, but that's probably the new net/py-aiodns that depends on
> py-cares>=3.0.0
> 
> It went in yesterday, I did not realize that, sorry :-/
> 
> The failing test was there before the update, it's because it tries to
> connect to an xmpp server at localhost if I'm not mistaken.

After the update of py-cares has been committed, which has not happened
yet: OK bket@



Re: Update: net/py-slixmpp 1.4.2 -> 1.5.2

2020-07-08 Thread Paco Esteban
On Wed, 08 Jul 2020, Björn Ketelaars wrote:

> On Wed 08/07/2020 10:39, Paco Esteban wrote:
> > Comments/ok welcome.
> 
> Diff looks ok, though you should run 'make update-patches'. Builds ok.

You're right.  Diff included at the end with the update-patches.

> 
> Guess having a newer version of py3-cares is important as (all) tests
> fail when having the version from ports (py-cares-2.4.0;p1) around.
> Updating to py-cares-3.1.1 (from kmos@, which has not been committed
> yet) seems to be a requirement, though one test still fails.

Yes, but that's probably the new net/py-aiodns that depends on
py-cares>=3.0.0

It went in yesterday, I did not realize that, sorry :-/

The failing test was there before the update, it's because it tries to
connect to an xmpp server at localhost if I'm not mistaken.
> 
> = test session starts 
> ==
> platform openbsd6 -- Python 3.8.3, pytest-4.4.0, py-1.8.0, pluggy-0.11.0
> rootdir: /tmp/ports/pobj/py-slixmpp-1.5.2-python3/slixmpp-1.5.2
> collected 370 items
> 
> tests/live_multiple_streams.py ..[  
> 0%]
> tests/live_test.py F [  
> 0%]
> tests/test_cache.py  [  
> 1%]
> tests/test_events.py [  
> 2%]
> tests/test_jid.py    [ 
> 12%]
> tests/test_overall.py .. [ 
> 12%]
> tests/test_plugins.py .. [ 
> 14%]
> tests/test_stanza_base.py .  [ 
> 15%]
> tests/test_stanza_element.py ... [ 
> 24%]
> tests/test_stanza_error.py   [ 
> 25%]
> tests/test_stanza_gmail.py ..[ 
> 25%]
> tests/test_stanza_iq.py .[ 
> 27%]
> tests/test_stanza_message.py ... [ 
> 28%]
> tests/test_stanza_presence.py    [ 
> 29%]
> tests/test_stanza_roster.py ...  [ 
> 30%]
> tests/test_stanza_xep_0004.py ...[ 
> 31%]
> tests/test_stanza_xep_0009.py    [ 
> 35%]
> tests/test_stanza_xep_0030.py .  [ 
> 42%]
> tests/test_stanza_xep_0033.py    [ 
> 44%]
> tests/test_stanza_xep_0047.py    [ 
> 45%]
> tests/test_stanza_xep_0050.py .. [ 
> 46%]
> tests/test_stanza_xep_0059.py ...[ 
> 48%]
> tests/test_stanza_xep_0060.py ...[ 
> 53%]
> tests/test_stanza_xep_0085.py .  [ 
> 54%]
> tests/test_stanza_xep_0122.py .  [ 
> 55%]
> tests/test_stanza_xep_0184.py .. [ 
> 55%]
> tests/test_stanza_xep_0300.py .. [ 
> 56%]
> tests/test_stanza_xep_0323.py .  [ 
> 58%]
> tests/test_stanza_xep_0325.py    [ 
> 60%]
> tests/test_stanza_xep_0380.py .  [ 
> 60%]
> tests/test_stream.py ... [ 
> 61%]
> tests/test_stream_exceptions.py  [ 
> 62%]
> tests/test_stream_filters.py ..  [ 
> 62%]
> tests/test_stream_handlers.py .. [ 
> 64%]
> tests/test_stream_presence.py ...[ 
> 66%]
> tests/test_stream_roster.py ..   [ 
> 68%]
> tests/test_stream_xep_0030.py .. [ 
> 72%]
> tests/test_stream_xep_0047.py ...[ 
> 73%]
> tests/test_stream_xep_0050.py ...[ 
> 76%]
> tests/test_stream_xep_0060.py ...[ 
> 87%]
> tests/test_stream_xep_0066.py .  [ 
> 87%]
> tests/test_stream_xep_0085.py .  [ 
> 87%]
> tests/test_stream_xep_0092.py .. [ 
> 88%]
> tests/test_stream_xep_0128.py .. [ 
> 88%]
> tests/test_stream_xep_0249.py .. [ 
> 89%]
> tests/test_stream_xep_0323.py s  [ 
> 94%]
> 

Re: Update: net/py-slixmpp 1.4.2 -> 1.5.2

2020-07-08 Thread Björn Ketelaars
On Wed 08/07/2020 10:39, Paco Esteban wrote:
> Comments/ok welcome.

Diff looks ok, though you should run 'make update-patches'. Builds ok.

Guess having a newer version of py3-cares is important as (all) tests
fail when having the version from ports (py-cares-2.4.0;p1) around.
Updating to py-cares-3.1.1 (from kmos@, which has not been committed
yet) seems to be a requirement, though one test still fails.


= test session starts ==
platform openbsd6 -- Python 3.8.3, pytest-4.4.0, py-1.8.0, pluggy-0.11.0
rootdir: /tmp/ports/pobj/py-slixmpp-1.5.2-python3/slixmpp-1.5.2
collected 370 items

tests/live_multiple_streams.py ..[  0%]
tests/live_test.py F [  0%]
tests/test_cache.py  [  1%]
tests/test_events.py [  2%]
tests/test_jid.py    [ 12%]
tests/test_overall.py .. [ 12%]
tests/test_plugins.py .. [ 14%]
tests/test_stanza_base.py .  [ 15%]
tests/test_stanza_element.py ... [ 24%]
tests/test_stanza_error.py   [ 25%]
tests/test_stanza_gmail.py ..[ 25%]
tests/test_stanza_iq.py .[ 27%]
tests/test_stanza_message.py ... [ 28%]
tests/test_stanza_presence.py    [ 29%]
tests/test_stanza_roster.py ...  [ 30%]
tests/test_stanza_xep_0004.py ...[ 31%]
tests/test_stanza_xep_0009.py    [ 35%]
tests/test_stanza_xep_0030.py .  [ 42%]
tests/test_stanza_xep_0033.py    [ 44%]
tests/test_stanza_xep_0047.py    [ 45%]
tests/test_stanza_xep_0050.py .. [ 46%]
tests/test_stanza_xep_0059.py ...[ 48%]
tests/test_stanza_xep_0060.py ...[ 53%]
tests/test_stanza_xep_0085.py .  [ 54%]
tests/test_stanza_xep_0122.py .  [ 55%]
tests/test_stanza_xep_0184.py .. [ 55%]
tests/test_stanza_xep_0300.py .. [ 56%]
tests/test_stanza_xep_0323.py .  [ 58%]
tests/test_stanza_xep_0325.py    [ 60%]
tests/test_stanza_xep_0380.py .  [ 60%]
tests/test_stream.py ... [ 61%]
tests/test_stream_exceptions.py  [ 62%]
tests/test_stream_filters.py ..  [ 62%]
tests/test_stream_handlers.py .. [ 64%]
tests/test_stream_presence.py ...[ 66%]
tests/test_stream_roster.py ..   [ 68%]
tests/test_stream_xep_0030.py .. [ 72%]
tests/test_stream_xep_0047.py ...[ 73%]
tests/test_stream_xep_0050.py ...[ 76%]
tests/test_stream_xep_0060.py ...[ 87%]
tests/test_stream_xep_0066.py .  [ 87%]
tests/test_stream_xep_0085.py .  [ 87%]
tests/test_stream_xep_0092.py .. [ 88%]
tests/test_stream_xep_0128.py .. [ 88%]
tests/test_stream_xep_0249.py .. [ 89%]
tests/test_stream_xep_0323.py s  [ 94%]
tests/test_stream_xep_0325.py .  [ 97%]
tests/test_tostring.py .

=== FAILURES ===
_ TestLiveStream.testClientConnection __

self = 

def testClientConnection(self):
"""Test that we can interact with a live ClientXMPP instance."""
self.stream_start(mode='client',
  socket='live',
  skip=False,
  jid='user@localhost/test',
  password='user')

# Use sid=None to ignore any id sent by the 

Re: Update: net/py-slixmpp 1.4.2 -> 1.5.2

2020-07-08 Thread Paco Esteban
On Tue, 07 Jul 2020, Stuart Henderson wrote:

> On 2020/07/07 22:49, Solene Rapenne wrote:
> > On Thu, 28 May 2020 22:49:07 -0400
> > Kurt Mosiejczuk :
> > 
> > > This updates py-slixmpp to 1.5.2
> > > 
> > > Sadly, there doesn't seem to be a changelog.
> > > 
> > > While here I moved it to the new way to of doing python3-only
> > > libraries.
> > > 
> > > All tests but one pass and that seems to be an interaction with pytest.
> > > 
> > > (The one consumer is poezio, which has an update coming right after this)
> > > 
> > > ok?
> > 
> > hi
> > 
> > Using your diff (I changed the REVISION to 3 to make it apply)
> > I get a conflict error at "make install" step.
> > 
> > Link to /home/build/usr/ports/packages/amd64/ftp/py3-slixmpp-1.5.2.tgz
> > ===> py3-slixmpp-1.5.2 depends on: py3-asn1-* -> py3-asn1-0.4.8p0v0
> > ===> py3-slixmpp-1.5.2 depends on: py3-asn1-modules-* -> 
> > py3-asn1-modules-0.2.7p0
> > ===> py3-slixmpp-1.5.2 depends on: py3-aiodns-* -> py3-aiodns-1.2.0p2
> > ===> py3-slixmpp-1.5.2 depends on: py3-aiohttp-* -> py3-aiohttp-3.5.4p3
> > ===>  Installing py3-slixmpp-1.5.2 from 
> > /home/build/usr/ports/packages/amd64/all/
> > Can't install py3-slixmpp-1.5.2 because of conflicts (py3-slixmpp-1.4.2p3)
> > --- py3-slixmpp-1.5.2 ---
> > Can't install py3-slixmpp-1.5.2: conflicts
> > Couldn't install py3-slixmpp-1.5.2
> > 
> > 
> > I have slixmpp installed because I use poezio from git,
> > I'll try your poezio update after this.
> > I don't understand why pkg_add reports a conflicts though.
> > 
> > $ pkg_info | grep slixmpp
> > py3-slixmpp-1.4.2p3 slixmpp is an elegant Python library for XMPP
> > 
> 
> "make install" / "make update" don't handle pkgpath changes, if you
> "make package" then something like "doas env
> TRUSTED_PKG_PATH=/usr/ports/packages/$arch/all pkg_add -r py3-slixmpp"
> should do the trick.

kmos and I were talking about this yesterday.  This is his original diff
+ bket suggestions.

I tried it and works fine with the example code on the repo.  True that
I did not have it installed before.

Comments/ok welcome.

Index: Makefile
===
RCS file: /home/cvs/ports/net/py-slixmpp/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile3 Jul 2020 21:13:02 -   1.18
+++ Makefile7 Jul 2020 18:43:02 -
@@ -2,11 +2,10 @@
 
 COMMENT =  slixmpp is an elegant Python library for XMPP
 
-MODPY_EGG_VERSION =1.4.2
+MODPY_EGG_VERSION =1.5.2
 DISTNAME = slixmpp-${MODPY_EGG_VERSION}
-PKGNAME =  py3-${DISTNAME}
+PKGNAME =  py-${DISTNAME}
 CATEGORIES =   net
-REVISION = 3
 
 MAINTAINER =   Kurt Mosiejczuk 
 
@@ -20,7 +19,8 @@ MODPY_SETUPTOOLS =Yes
 MODPY_PYTEST = Yes
 MODPY_PYTEST_ARGS =tests/*.py
 
-MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
+FLAVORS =  python3
+FLAVOR =   python3
 
 RUN_DEPENDS =  devel/py-asn1${MODPY_FLAVOR} \
devel/py-asn1-modules${MODPY_FLAVOR} \
Index: distinfo
===
RCS file: /home/cvs/ports/net/py-slixmpp/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo7 Feb 2019 21:31:32 -   1.8
+++ distinfo7 Jul 2020 18:39:28 -
@@ -1,2 +1,2 @@
-SHA256 (slixmpp-1.4.2.tar.gz) = wyBPvo3tFI4eymcgugOYKYwVnynsdt/G991+2ZmuF2c=
-SIZE (slixmpp-1.4.2.tar.gz) = 864608
+SHA256 (slixmpp-1.5.2.tar.gz) = ZJX7+fTuWqaonYVJxbXQfNCX+mqgNTP3c6V+w0omrzA=
+SIZE (slixmpp-1.5.2.tar.gz) = 886383
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/net/py-slixmpp/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST   7 Feb 2019 21:31:32 -   1.8
+++ pkg/PLIST   7 Jul 2020 18:42:49 -
@@ -1,5 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.8 2019/02/07 21:31:32 danj Exp $
-@pkgpath net/${MODPY_PY_PREFIX}slixmpp
+@pkgpath net/py-slixmpp
 lib/python${MODPY_VERSION}/site-packages/slixmpp/
 
lib/python${MODPY_VERSION}/site-packages/slixmpp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 
lib/python${MODPY_VERSION}/site-packages/slixmpp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@@ -8,7 +8,7 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/slixmpp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
 
lib/python${MODPY_VERSION}/site-packages/slixmpp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/slixmpp/__init__.py
-lib/python${MODPY_VERSION}/site-packages/slixmpp/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/slixmpp/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/slixmpp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 

Re: Update: net/py-slixmpp 1.4.2 -> 1.5.2

2020-07-07 Thread Solene Rapenne
On Thu, 28 May 2020 22:49:07 -0400
Kurt Mosiejczuk :

> This updates py-slixmpp to 1.5.2
> 
> Sadly, there doesn't seem to be a changelog.
> 
> While here I moved it to the new way to of doing python3-only
> libraries.
> 
> All tests but one pass and that seems to be an interaction with pytest.
> 
> (The one consumer is poezio, which has an update coming right after this)
> 
> ok?

hi

Using your diff (I changed the REVISION to 3 to make it apply)
I get a conflict error at "make install" step.

Link to /home/build/usr/ports/packages/amd64/ftp/py3-slixmpp-1.5.2.tgz
===> py3-slixmpp-1.5.2 depends on: py3-asn1-* -> py3-asn1-0.4.8p0v0
===> py3-slixmpp-1.5.2 depends on: py3-asn1-modules-* -> 
py3-asn1-modules-0.2.7p0
===> py3-slixmpp-1.5.2 depends on: py3-aiodns-* -> py3-aiodns-1.2.0p2
===> py3-slixmpp-1.5.2 depends on: py3-aiohttp-* -> py3-aiohttp-3.5.4p3
===>  Installing py3-slixmpp-1.5.2 from 
/home/build/usr/ports/packages/amd64/all/
Can't install py3-slixmpp-1.5.2 because of conflicts (py3-slixmpp-1.4.2p3)
--- py3-slixmpp-1.5.2 ---
Can't install py3-slixmpp-1.5.2: conflicts
Couldn't install py3-slixmpp-1.5.2


I have slixmpp installed because I use poezio from git,
I'll try your poezio update after this.
I don't understand why pkg_add reports a conflicts though.

$ pkg_info | grep slixmpp
py3-slixmpp-1.4.2p3 slixmpp is an elegant Python library for XMPP



Re: Update: net/py-slixmpp 1.4.2 -> 1.5.2

2020-07-07 Thread Stuart Henderson
On 2020/07/07 22:49, Solene Rapenne wrote:
> On Thu, 28 May 2020 22:49:07 -0400
> Kurt Mosiejczuk :
> 
> > This updates py-slixmpp to 1.5.2
> > 
> > Sadly, there doesn't seem to be a changelog.
> > 
> > While here I moved it to the new way to of doing python3-only
> > libraries.
> > 
> > All tests but one pass and that seems to be an interaction with pytest.
> > 
> > (The one consumer is poezio, which has an update coming right after this)
> > 
> > ok?
> 
> hi
> 
> Using your diff (I changed the REVISION to 3 to make it apply)
> I get a conflict error at "make install" step.
> 
> Link to /home/build/usr/ports/packages/amd64/ftp/py3-slixmpp-1.5.2.tgz
> ===> py3-slixmpp-1.5.2 depends on: py3-asn1-* -> py3-asn1-0.4.8p0v0
> ===> py3-slixmpp-1.5.2 depends on: py3-asn1-modules-* -> 
> py3-asn1-modules-0.2.7p0
> ===> py3-slixmpp-1.5.2 depends on: py3-aiodns-* -> py3-aiodns-1.2.0p2
> ===> py3-slixmpp-1.5.2 depends on: py3-aiohttp-* -> py3-aiohttp-3.5.4p3
> ===>  Installing py3-slixmpp-1.5.2 from 
> /home/build/usr/ports/packages/amd64/all/
> Can't install py3-slixmpp-1.5.2 because of conflicts (py3-slixmpp-1.4.2p3)
> --- py3-slixmpp-1.5.2 ---
> Can't install py3-slixmpp-1.5.2: conflicts
> Couldn't install py3-slixmpp-1.5.2
> 
> 
> I have slixmpp installed because I use poezio from git,
> I'll try your poezio update after this.
> I don't understand why pkg_add reports a conflicts though.
> 
> $ pkg_info | grep slixmpp
> py3-slixmpp-1.4.2p3 slixmpp is an elegant Python library for XMPP
> 

"make install" / "make update" don't handle pkgpath changes, if you
"make package" then something like "doas env
TRUSTED_PKG_PATH=/usr/ports/packages/$arch/all pkg_add -r py3-slixmpp"
should do the trick.



Re: Update: net/py-slixmpp 1.4.2 -> 1.5.2

2020-05-28 Thread Bjorn Ketelaars
On Thu 28/05/2020 22:49, Kurt Mosiejczuk wrote:
> This updates py-slixmpp to 1.5.2
> 
> Sadly, there doesn't seem to be a changelog.
> 
> While here I moved it to the new way to of doing python3-only
> libraries.
> 
> All tests but one pass and that seems to be an interaction with pytest.
> 
> (The one consumer is poezio, which has an update coming right after this)
> 
> ok?

> +MODPY_EGG_VERSION =  1.5.2
>  DISTNAME =   slixmpp-${MODPY_EGG_VERSION}
>  PKGNAME =py3-${DISTNAME}

PKGNAME can be set to py-*.

> --- distinfo  7 Feb 2019 21:31:32 -   1.8
> +++ distinfo  29 May 2020 02:04:16 -
> @@ -1,2 +1,2 @@

I think a pkgpath-marker should be added: @pkgpath net/slixmpp [0].

[0] https://marc.info/?l=openbsd-ports=158299219812085=2



Update: net/py-slixmpp 1.4.2 -> 1.5.2

2020-05-28 Thread Kurt Mosiejczuk
This updates py-slixmpp to 1.5.2

Sadly, there doesn't seem to be a changelog.

While here I moved it to the new way to of doing python3-only
libraries.

All tests but one pass and that seems to be an interaction with pytest.

(The one consumer is poezio, which has an update coming right after this)

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/net/py-slixmpp/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile1 Dec 2019 02:43:00 -   1.17
+++ Makefile29 May 2020 02:04:16 -
@@ -2,11 +2,10 @@
 
 COMMENT =  slixmpp is an elegant Python library for XMPP
 
-MODPY_EGG_VERSION =1.4.2
+MODPY_EGG_VERSION =1.5.2
 DISTNAME = slixmpp-${MODPY_EGG_VERSION}
 PKGNAME =  py3-${DISTNAME}
 CATEGORIES =   net
-REVISION = 2
 
 MAINTAINER =   Kurt Mosiejczuk 
 
@@ -20,7 +19,8 @@ MODPY_SETUPTOOLS =Yes
 MODPY_PYTEST = Yes
 MODPY_PYTEST_ARGS =tests/*.py
 
-MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
+FLAVORS =  python3
+FLAVOR =   python3
 
 RUN_DEPENDS =  devel/py-asn1${MODPY_FLAVOR} \
devel/py-asn1-modules${MODPY_FLAVOR} \
Index: distinfo
===
RCS file: /cvs/ports/net/py-slixmpp/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo7 Feb 2019 21:31:32 -   1.8
+++ distinfo29 May 2020 02:04:16 -
@@ -1,2 +1,2 @@
-SHA256 (slixmpp-1.4.2.tar.gz) = wyBPvo3tFI4eymcgugOYKYwVnynsdt/G991+2ZmuF2c=
-SIZE (slixmpp-1.4.2.tar.gz) = 864608
+SHA256 (slixmpp-1.5.2.tar.gz) = ZJX7+fTuWqaonYVJxbXQfNCX+mqgNTP3c6V+w0omrzA=
+SIZE (slixmpp-1.5.2.tar.gz) = 886383
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/py-slixmpp/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST   7 Feb 2019 21:31:32 -   1.8
+++ pkg/PLIST   29 May 2020 02:04:17 -
@@ -8,7 +8,7 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/slixmpp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
 
lib/python${MODPY_VERSION}/site-packages/slixmpp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/slixmpp/__init__.py
-lib/python${MODPY_VERSION}/site-packages/slixmpp/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/slixmpp/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/slixmpp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/slixmpp/${MODPY_PYCACHE}api.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/slixmpp/${MODPY_PYCACHE}basexmpp.${MODPY_PYC_MAGIC_TAG}pyc
@@ -25,11 +25,11 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/slixmpp/exceptions.py
 lib/python${MODPY_VERSION}/site-packages/slixmpp/features/
 lib/python${MODPY_VERSION}/site-packages/slixmpp/features/__init__.py
-lib/python${MODPY_VERSION}/site-packages/slixmpp/features/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/slixmpp/features/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/slixmpp/features/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_bind/
 
lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_bind/__init__.py
-lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_bind/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_bind/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_bind/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_bind/${MODPY_PYCACHE}bind.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_bind/${MODPY_PYCACHE}stanza.${MODPY_PYC_MAGIC_TAG}pyc
@@ -37,13 +37,13 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_bind/stanza.py
 lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_mechanisms/
 
lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_mechanisms/__init__.py
-lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_mechanisms/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_mechanisms/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_mechanisms/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_mechanisms/${MODPY_PYCACHE}mechanisms.${MODPY_PYC_MAGIC_TAG}pyc