update py-commonmark and py-recommonmark and make them python3 only

These ports are on the update path for py-sphinx so making them python3
only helps. Both jca and I built ports llvm with this update.

ok jca@, sebastia@ (maintainers of these ports)
This commit is contained in:
daniel 2021-01-18 00:15:37 +00:00
parent 5b8bde3918
commit 8eb2b064a3
12 changed files with 91 additions and 129 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.1123 2021/01/17 19:34:51 jasper Exp $
# $OpenBSD: Makefile,v 1.1124 2021/01/18 00:15:37 daniel Exp $
COMMENT = exceptions to pkg_add rules
CATEGORIES = devel databases
DISTFILES =
# API.rev
PKGNAME = quirks-3.511
PKGNAME = quirks-3.512
PKG_ARCH = *
MAINTAINER = Marc Espie <espie@openbsd.org>

View File

@ -1,7 +1,7 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
# $OpenBSD: Quirks.pm,v 1.1139 2021/01/17 19:34:51 jasper Exp $
# $OpenBSD: Quirks.pm,v 1.1140 2021/01/18 00:15:37 daniel Exp $
#
# Copyright (c) 2009 Marc Espie <espie@openbsd.org>
#
@ -530,6 +530,8 @@ my $stem_extensions = {
'py-tzlocal' => 'py3-tzlocal',
'py-sphinx-notfound-page' => 'py3-sphinx-notfound-page',
'py-mulpyplexer' => 'py3-mulpyplexer',
'py-commonmark' => 'py3-commonmark',
'py-recommonmark' => 'py3-recommonmark',
};
my $obsolete_reason = {

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.657 2021/01/15 01:00:15 daniel Exp $
# $OpenBSD: Makefile,v 1.658 2021/01/18 00:15:37 daniel Exp $
SUBDIR =
SUBDIR += TclXML
@ -381,7 +381,6 @@
SUBDIR += py-chardet,python3
SUBDIR += py-colored
SUBDIR += py-colored,python3
SUBDIR += py-commonmark
SUBDIR += py-commonmark,python3
SUBDIR += py-css-parser,python3
SUBDIR += py-cssselect
@ -444,7 +443,6 @@
SUBDIR += py-pygments,python3
SUBDIR += py-pykwalify
SUBDIR += py-pykwalify,python3
SUBDIR += py-recommonmark
SUBDIR += py-recommonmark,python3
SUBDIR += py-ruamel.yaml
SUBDIR += py-ruamel.yaml,python3

View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.7 2020/07/03 21:13:13 sthen Exp $
# $OpenBSD: Makefile,v 1.8 2021/01/18 00:15:37 daniel Exp $
COMMENT= parser for the CommonMark markdown spec
MODPY_EGG_VERSION= 0.7.5
DISTNAME= CommonMark-${MODPY_EGG_VERSION}
PKGNAME= py-commonmark-${MODPY_EGG_VERSION}
MODPY_EGG_VERSION= 0.9.1
DISTNAME= commonmark-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
CATEGORIES= textproc
REVISION= 1
MAINTAINER= Sebastian Reitenbach <sebastia@openbsd.org>
@ -14,17 +13,15 @@ MAINTAINER= Sebastian Reitenbach <sebastia@openbsd.org>
PERMIT_PACKAGE= Yes
MODULES= lang/python
MODPY_PI= Yes
MODPY_SETUPTOOLS= Yes
FLAVORS= python3
FLAVOR?=
FLAVOR = python3
MODPY_PI= Yes
MODPY_SETUPTOOLS= Yes
RUN_DEPENDS= devel/py-future${MODPY_FLAVOR}
TEST_DEPENDS= devel/flake8 \
devel/py-hypothesis${MODPY_FLAVOR}
post-install:
mv ${PREFIX}/bin/cmark ${PREFIX}/bin/commonmark${MODPY_BIN_SUFFIX}
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (CommonMark-0.7.5.tar.gz) = Tfu9HbxmmptxoBUDKyu+XEsBnKi2ykENic9wIN5G0sA=
SIZE (CommonMark-0.7.5.tar.gz) = 88702
SHA256 (commonmark-0.9.1.tar.gz) = RS+dyFm+fwZjHdyzKLaRnGeYSsplTl/vs5FNVGka7WA=
SIZE (commonmark-0.9.1.tar.gz) = 95764

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-CommonMark_tests_run_spec_tests_py,v 1.1.1.1 2017/11/02 09:32:36 sebastia Exp $
$OpenBSD: patch-commonmark_tests_run_spec_tests_py,v 1.1 2021/01/18 00:15:38 daniel Exp $
The UTF chars break the test
Index: CommonMark/tests/run_spec_tests.py
--- CommonMark/tests/run_spec_tests.py.orig
+++ CommonMark/tests/run_spec_tests.py
Index: commonmark/tests/run_spec_tests.py
--- commonmark/tests/run_spec_tests.py.orig
+++ commonmark/tests/run_spec_tests.py
@@ -185,7 +185,7 @@ def main():
passed += 1
catStats[current_section][0] += 1

View File

@ -1,51 +1,53 @@
@comment $OpenBSD: PLIST,v 1.2 2018/09/17 10:35:51 sthen Exp $
bin/commonmark${MODPY_BIN_SUFFIX}
lib/python${MODPY_VERSION}/site-packages/CommonMark/
lib/python${MODPY_VERSION}/site-packages/CommonMark-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/CommonMark-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/CommonMark-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/CommonMark-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/CommonMark-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
lib/python${MODPY_VERSION}/site-packages/CommonMark-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
lib/python${MODPY_VERSION}/site-packages/CommonMark-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/CommonMark/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/CommonMark/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/CommonMark/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/CommonMark/${MODPY_PYCACHE}blocks.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/CommonMark/${MODPY_PYCACHE}cmark.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/CommonMark/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/CommonMark/${MODPY_PYCACHE}dump.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/CommonMark/${MODPY_PYCACHE}entitytrans.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/CommonMark/${MODPY_PYCACHE}inlines.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/CommonMark/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/CommonMark/${MODPY_PYCACHE}node.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/CommonMark/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/CommonMark/blocks.py
lib/python${MODPY_VERSION}/site-packages/CommonMark/cmark.py
lib/python${MODPY_VERSION}/site-packages/CommonMark/common.py
lib/python${MODPY_VERSION}/site-packages/CommonMark/dump.py
lib/python${MODPY_VERSION}/site-packages/CommonMark/entitytrans.py
lib/python${MODPY_VERSION}/site-packages/CommonMark/inlines.py
lib/python${MODPY_VERSION}/site-packages/CommonMark/main.py
lib/python${MODPY_VERSION}/site-packages/CommonMark/node.py
lib/python${MODPY_VERSION}/site-packages/CommonMark/render/
lib/python${MODPY_VERSION}/site-packages/CommonMark/render/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/CommonMark/render/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/CommonMark/render/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/CommonMark/render/${MODPY_PYCACHE}html.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/CommonMark/render/${MODPY_PYCACHE}renderer.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/CommonMark/render/${MODPY_PYCACHE}rst.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/CommonMark/render/html.py
lib/python${MODPY_VERSION}/site-packages/CommonMark/render/renderer.py
lib/python${MODPY_VERSION}/site-packages/CommonMark/render/rst.py
lib/python${MODPY_VERSION}/site-packages/CommonMark/tests/
lib/python${MODPY_VERSION}/site-packages/CommonMark/tests/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/CommonMark/tests/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/CommonMark/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/CommonMark/tests/${MODPY_PYCACHE}rst_tests.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/CommonMark/tests/${MODPY_PYCACHE}run_spec_tests.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/CommonMark/tests/${MODPY_PYCACHE}unit_tests.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/CommonMark/tests/rst_tests.py
lib/python${MODPY_VERSION}/site-packages/CommonMark/tests/run_spec_tests.py
lib/python${MODPY_VERSION}/site-packages/CommonMark/tests/unit_tests.py
lib/python${MODPY_VERSION}/site-packages/CommonMark/utils.py
@comment $OpenBSD: PLIST,v 1.3 2021/01/18 00:15:38 daniel Exp $
@conflict py-commonmark-*
@pkgpath textproc/py-commonmark
bin/cmark
lib/python${MODPY_VERSION}/site-packages/commonmark/
lib/python${MODPY_VERSION}/site-packages/commonmark-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/commonmark-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/commonmark-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/commonmark-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/commonmark-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
lib/python${MODPY_VERSION}/site-packages/commonmark-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
lib/python${MODPY_VERSION}/site-packages/commonmark-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/commonmark/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/commonmark/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/commonmark/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/commonmark/${MODPY_PYCACHE}blocks.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/commonmark/${MODPY_PYCACHE}cmark.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/commonmark/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/commonmark/${MODPY_PYCACHE}dump.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/commonmark/${MODPY_PYCACHE}entitytrans.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/commonmark/${MODPY_PYCACHE}inlines.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/commonmark/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/commonmark/${MODPY_PYCACHE}node.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/commonmark/${MODPY_PYCACHE}normalize_reference.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/commonmark/blocks.py
lib/python${MODPY_VERSION}/site-packages/commonmark/cmark.py
lib/python${MODPY_VERSION}/site-packages/commonmark/common.py
lib/python${MODPY_VERSION}/site-packages/commonmark/dump.py
lib/python${MODPY_VERSION}/site-packages/commonmark/entitytrans.py
lib/python${MODPY_VERSION}/site-packages/commonmark/inlines.py
lib/python${MODPY_VERSION}/site-packages/commonmark/main.py
lib/python${MODPY_VERSION}/site-packages/commonmark/node.py
lib/python${MODPY_VERSION}/site-packages/commonmark/normalize_reference.py
lib/python${MODPY_VERSION}/site-packages/commonmark/render/
lib/python${MODPY_VERSION}/site-packages/commonmark/render/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/commonmark/render/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/commonmark/render/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/commonmark/render/${MODPY_PYCACHE}html.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/commonmark/render/${MODPY_PYCACHE}renderer.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/commonmark/render/${MODPY_PYCACHE}rst.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/commonmark/render/html.py
lib/python${MODPY_VERSION}/site-packages/commonmark/render/renderer.py
lib/python${MODPY_VERSION}/site-packages/commonmark/render/rst.py
lib/python${MODPY_VERSION}/site-packages/commonmark/tests/
lib/python${MODPY_VERSION}/site-packages/commonmark/tests/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/commonmark/tests/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/commonmark/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/commonmark/tests/${MODPY_PYCACHE}rst_tests.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/commonmark/tests/${MODPY_PYCACHE}run_spec_tests.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/commonmark/tests/${MODPY_PYCACHE}unit_tests.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/commonmark/tests/rst_tests.py
lib/python${MODPY_VERSION}/site-packages/commonmark/tests/run_spec_tests.py
lib/python${MODPY_VERSION}/site-packages/commonmark/tests/unit_tests.py

View File

@ -1,15 +1,14 @@
# $OpenBSD: Makefile,v 1.3 2020/07/03 21:13:15 sthen Exp $
# $OpenBSD: Makefile,v 1.4 2021/01/18 00:15:38 daniel Exp $
COMMENT = markdown parser for docutils
MODPY_EGG_VERSION = 0.5.0
MODPY_EGG_VERSION = 0.7.1
# Using github autogenerated tarball because pypi tarballs don't ship
# files needed by tests.
GH_ACCOUNT = readthedocs
GH_PROJECT = recommonmark
GH_TAGNAME = ${MODPY_EGG_VERSION}
PKGNAME = py-recommonmark-${MODPY_EGG_VERSION}
REVISION = 0
CATEGORIES = textproc devel
@ -19,19 +18,15 @@ MAINTAINER = Jeremie Courreges-Anglas <jca@wxcvbn.org>
PERMIT_PACKAGE = Yes
MODULES = lang/python
FLAVORS = python3
FLAVOR = python3
MODPY_SETUPTOOLS = Yes
MODPY_PYTEST = Yes
RUN_DEPENDS = textproc/py-commonmark${MODPY_FLAVOR} \
RUN_DEPENDS = textproc/py-commonmark${MODPY_FLAVOR}>=0.8.1 \
textproc/py-docutils${MODPY_FLAVOR} \
textproc/py-sphinx${MODPY_FLAVOR}
FLAVORS = python3
FLAVOR ?=
post-install:
for script in ${PREFIX}/bin/cm2*; do \
mv "$$script" "$$script"${MODPY_BIN_SUFFIX}; \
done
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (recommonmark-0.5.0.tar.gz) = J7fMK4HCl+ggOd8gsCkf3t3BC3GwTJ8YtdRu+s0C8vI=
SIZE (recommonmark-0.5.0.tar.gz) = 22356
SHA256 (recommonmark-0.7.1.tar.gz) = 5fsPOWW4YBCXZIhYmkXkjpq7lRAfLdwrPDHKhtUmERI=
SIZE (recommonmark-0.7.1.tar.gz) = 24720

View File

@ -1,17 +0,0 @@
$OpenBSD: patch-recommonmark_parser_py,v 1.1.1.1 2019/07/01 10:02:50 jca Exp $
Index: recommonmark/parser.py
--- recommonmark/parser.py.orig
+++ recommonmark/parser.py
@@ -6,7 +6,10 @@ from os.path import splitext
from docutils import parsers, nodes
from sphinx import addnodes
-from commonmark import Parser
+try:
+ from commonmark import Parser
+except ImportError:
+ from CommonMark import Parser
from warnings import warn

View File

@ -1,17 +0,0 @@
$OpenBSD: patch-tests_test_basic_py,v 1.1.1.1 2019/07/01 10:02:50 jca Exp $
Index: tests/test_basic.py
--- tests/test_basic.py.orig
+++ tests/test_basic.py
@@ -8,7 +8,10 @@ from docutils.utils import new_document
from docutils.readers import Reader
from docutils.core import publish_parts
-from commonmark import Parser
+try:
+ from commonmark import Parser
+except ImportError:
+ from CommonMark import Parser
from recommonmark.parser import CommonMarkParser

View File

@ -1,10 +1,12 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2019/07/01 10:02:50 jca Exp $
bin/cm2html${MODPY_BIN_SUFFIX}
bin/cm2latex${MODPY_BIN_SUFFIX}
bin/cm2man${MODPY_BIN_SUFFIX}
bin/cm2pseudoxml${MODPY_BIN_SUFFIX}
bin/cm2xetex${MODPY_BIN_SUFFIX}
bin/cm2xml${MODPY_BIN_SUFFIX}
@comment $OpenBSD: PLIST,v 1.2 2021/01/18 00:15:38 daniel Exp $
@conflict py-recommonmark-*
@pkgpath textproc/py-recommonmark
bin/cm2html
bin/cm2latex
bin/cm2man
bin/cm2pseudoxml
bin/cm2xetex
bin/cm2xml
lib/python${MODPY_VERSION}/site-packages/recommonmark/
lib/python${MODPY_VERSION}/site-packages/recommonmark-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/recommonmark-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO