CVS commit: pkgsrc/www/py-landslide

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/www/py-landslide
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Tue, 2 Jul 2019 04:20:00 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Jul  2 04:20:00 UTC 2019

Modified Files:
        pkgsrc/www/py-landslide: ALTERNATIVES Makefile PLIST distinfo
Added Files:
        pkgsrc/www/py-landslide/patches: patch-landslide_parser.py
            patch-setup.py
Removed Files:
        pkgsrc/www/py-landslide/patches: patch-src_landslide_parser.py

Log Message:
py-landslide: updated to 1.1.6

v1.1.6
Fix packaging again

v1.1.5
Fix packaging

v1.1.4
Setup Travis CI
Update Python versions in setup.py
Pin dependency versions to fix markdown issue


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/py-landslide/ALTERNATIVES \
    pkgsrc/www/py-landslide/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/py-landslide/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/py-landslide/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/py-landslide/patches/patch-landslide_parser.py \
    pkgsrc/www/py-landslide/patches/patch-setup.py
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/www/py-landslide/patches/patch-src_landslide_parser.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/py-landslide/ALTERNATIVES
diff -u pkgsrc/www/py-landslide/ALTERNATIVES:1.1 pkgsrc/www/py-landslide/ALTERNATIVES:1.2
--- pkgsrc/www/py-landslide/ALTERNATIVES:1.1    Sat Feb 25 14:53:49 2017
+++ pkgsrc/www/py-landslide/ALTERNATIVES        Tue Jul  2 04:19:59 2019
@@ -1 +1 @@
-bin/landslide @PREFIX@/bin/landslide
+bin/landslide @PREFIX@/bin/landslide-@PYVERSSUFFIX@
Index: pkgsrc/www/py-landslide/PLIST
diff -u pkgsrc/www/py-landslide/PLIST:1.1 pkgsrc/www/py-landslide/PLIST:1.2
--- pkgsrc/www/py-landslide/PLIST:1.1   Sat Feb 25 14:53:49 2017
+++ pkgsrc/www/py-landslide/PLIST       Tue Jul  2 04:19:59 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2017/02/25 14:53:49 kamil Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/07/02 04:19:59 adam Exp $
 bin/landslide-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_FILE}/PKG-INFO
 ${PYSITELIB}/${EGG_FILE}/SOURCES.txt
@@ -28,9 +28,6 @@ ${PYSITELIB}/landslide/parser.pyo
 ${PYSITELIB}/landslide/rst.py
 ${PYSITELIB}/landslide/rst.pyc
 ${PYSITELIB}/landslide/rst.pyo
-${PYSITELIB}/landslide/tests.py
-${PYSITELIB}/landslide/tests.pyc
-${PYSITELIB}/landslide/tests.pyo
 ${PYSITELIB}/landslide/themes/default/base.html
 ${PYSITELIB}/landslide/themes/default/css/print.css
 ${PYSITELIB}/landslide/themes/default/css/screen.css

Index: pkgsrc/www/py-landslide/Makefile
diff -u pkgsrc/www/py-landslide/Makefile:1.3 pkgsrc/www/py-landslide/Makefile:1.4
--- pkgsrc/www/py-landslide/Makefile:1.3        Sat May 11 22:07:01 2019
+++ pkgsrc/www/py-landslide/Makefile    Tue Jul  2 04:19:59 2019
@@ -1,29 +1,29 @@
-# $NetBSD: Makefile,v 1.3 2019/05/11 22:07:01 kamil Exp $
+# $NetBSD: Makefile,v 1.4 2019/07/02 04:19:59 adam Exp $
 
-GITHUB_PROJECT=        landslide
-DISTNAME=      landslide-1.1.3
-PKGREVISION=   1
+DISTNAME=      landslide-1.1.6
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=    www
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=adamzap/}
-GITHUB_TAG=    v${PKGVERSION_NOREV}
+CATEGORIES=    www python
+MASTER_SITES=  ${MASTER_SITE_PYPI:=l/landslide/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://github.com/adamzap/landslide/
+HOMEPAGE=      https://github.com/adamzap/landslide
 COMMENT=       Generate HTML5 slideshows from markdown, ReST, or textile
 LICENSE=       apache-2.0
 
-DEPENDS+=      ${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2
-DEPENDS+=      ${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments
-DEPENDS+=      ${PYPKGPREFIX}-markdown-[0-9]*:../../textproc/py-markdown
-DEPENDS+=      ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils
-DEPENDS+=      ${PYPKGPREFIX}-textile-[0-9]*:../../textproc/py-textile
-DEPENDS+=      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
+DEPENDS+=      ${PYPKGPREFIX}-docutils>=0.14:../../textproc/py-docutils
+DEPENDS+=      ${PYPKGPREFIX}-jinja2>=2.10:../../textproc/py-jinja2
+DEPENDS+=      ${PYPKGPREFIX}-markdown>=2.6.11:../../textproc/py-markdown
+DEPENDS+=      ${PYPKGPREFIX}-pygments>=2.2.0:../../textproc/py-pygments
+DEPENDS+=      ${PYPKGPREFIX}-six>=1.11.0:../../lang/py-six
+
+USE_LANGUAGES= # none
 
 post-install:
-       ${MV} ${DESTDIR}${PREFIX}/bin/landslide \
-               ${DESTDIR}${PREFIX}/bin/landslide-${PYVERSSUFFIX}
+       cd ${DESTDIR}${PREFIX}/bin && \
+       ${MV} landslide landslide-${PYVERSSUFFIX} || ${TRUE}
 
+do-test:
+       cd ${WRKSRC} && ${PYTHONBIN} tests.py
 
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/py-landslide/distinfo
diff -u pkgsrc/www/py-landslide/distinfo:1.2 pkgsrc/www/py-landslide/distinfo:1.3
--- pkgsrc/www/py-landslide/distinfo:1.2        Sat May 11 22:07:01 2019
+++ pkgsrc/www/py-landslide/distinfo    Tue Jul  2 04:19:59 2019
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2019/05/11 22:07:01 kamil Exp $
+$NetBSD: distinfo,v 1.3 2019/07/02 04:19:59 adam Exp $
 
-SHA1 (landslide-1.1.3.tar.gz) = 07e5adbe9c0264a66c348a92aebea1d64f2baea2
-RMD160 (landslide-1.1.3.tar.gz) = 03eb20ea51997234a50b0aac0995f8b3ec286bd7
-SHA512 (landslide-1.1.3.tar.gz) = ba46dca4a93630ef700b2d5a6e1871d5ffbeb9943c165a00874ed9d931693c4b8d824658105792ca05e4d17d017066d4075b04c2a82d565749ee21670f8dc240
-Size (landslide-1.1.3.tar.gz) = 150998 bytes
-SHA1 (patch-src_landslide_parser.py) = 918b96e85298c2631422f7ce099ca4b05436ce14
+SHA1 (landslide-1.1.6.tar.gz) = a714a0bdff7b049fa2d610c7595e2ab003de2fbf
+RMD160 (landslide-1.1.6.tar.gz) = 3a0b9e717b352e93480aa8162b0fd7857b14718f
+SHA512 (landslide-1.1.6.tar.gz) = 944d958432ac3564bf292aa354d7b4122d060d4bcb49445531a01041407886e24fd80fabacf52d18d8c2915c703e8935c76899182b2cf967b19abf6f505f881e
+Size (landslide-1.1.6.tar.gz) = 148250 bytes
+SHA1 (patch-landslide_parser.py) = 0ada02373749cde3d953e17dbaa791a0008ea28e
+SHA1 (patch-setup.py) = 94b7fcc7039b80a1b912c82a24132c1f5571f4f8

Added files:

Index: pkgsrc/www/py-landslide/patches/patch-landslide_parser.py
diff -u /dev/null pkgsrc/www/py-landslide/patches/patch-landslide_parser.py:1.1
--- /dev/null   Tue Jul  2 04:20:00 2019
+++ pkgsrc/www/py-landslide/patches/patch-landslide_parser.py   Tue Jul  2 04:19:59 2019
@@ -0,0 +1,16 @@
+$NetBSD: patch-landslide_parser.py,v 1.1 2019/07/02 04:19:59 adam Exp $
+
+Fix for py-markdown >= 3.0.0
+https://github.com/adamzap/landslide/pull/211
+
+--- landslide/parser.py.orig   2015-03-12 03:47:59.000000000 +0000
++++ landslide/parser.py
+@@ -58,7 +58,7 @@ class Parser(object):
+             if text.startswith(u'\ufeff'):  # check for unicode BOM
+                 text = text[1:]
+ 
+-            return markdown.markdown(text, self.md_extensions)
++            return markdown.markdown(text, extensions=self.md_extensions)
+         elif self.format == 'restructuredtext':
+             try:
+                 from landslide.rst import html_body
Index: pkgsrc/www/py-landslide/patches/patch-setup.py
diff -u /dev/null pkgsrc/www/py-landslide/patches/patch-setup.py:1.1
--- /dev/null   Tue Jul  2 04:20:00 2019
+++ pkgsrc/www/py-landslide/patches/patch-setup.py      Tue Jul  2 04:19:59 2019
@@ -0,0 +1,23 @@
+$NetBSD: patch-setup.py,v 1.1 2019/07/02 04:19:59 adam Exp $
+
+Relax dependencies.
+
+--- setup.py.orig      2019-07-02 04:14:10.000000000 +0000
++++ setup.py
+@@ -23,11 +23,11 @@ setup(
+         'textile'
+     ],
+     install_requires=[
+-        'Jinja2==2.10',
+-        'Markdown==2.6.11',
+-        'Pygments==2.2.0',
+-        'docutils==0.14',
+-        'six==1.11.0'
++        'Jinja2>=2.10',
++        'Markdown>=2.6.11',
++        'Pygments>=2.2.0',
++        'docutils>=0.14',
++        'six>=1.11.0'
+     ],
+     classifiers=[
+         'Programming Language :: Python',

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/security/py-paramiko
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/security/py-paramiko
Indexes:

Home | Main Index | Thread Index | Old Index