asciidoc: update to 10.1.1.

Version 10.1.1 (2021-12-20)
---------------------------
.Bug fixes
- Fix RuntimeWarning when executing asciidoc or a2x within repository
- Fix index out of range error in a2x (thanks @osmith42)


Version 10.1.0 (2021-12-17)
---------------------------
.Features
- Add top-level `__version__` and `VERSION` module exports (thanks
@tbpassin)

.Bug fixes
- Fix self reference errors in AsciiDocApi (thanks @tbpassin)
- Add back asciidoc execute print in a2x verbose

Version 10.0.2 (2021-11-12)
---------------------------
.Bug fixes
- Fix errors not displaying when called via a2x (thanks @osmith42)
- Fix incorrect parsing of asciidoc_opts in a2x (thanks @lmarz)

.Miscellaneous
- Fix automating homebrew release updates

Version 10.0.1 (2021-10-28)
---------------------------
.Bug fixes
- Fix running make docs
- Fix warning in music filter when using GraphicsMagick
- Fix handling escaped attributes inside of macros
- Include *.xsl and *.sty files in pip installations

Version 10.0.0 (2021-10-16)
---------------------------
.Breaking Changes
AsciiDoc.py has been rewritten to be a
https://pypi.org/project/asciidoc/[proper Python package], installable
via pip. Downloading and running asciidoc from the repo is not
recommended, but can be done through `python3 -m asciidoc` or
`python3 -m asciidoc.a2x`. CLI usage should remain the same where
both `asciidoc` and `a2x` CLI commands are available after pip
installation. Support for overriding the bundled *.conf files is
done through CLI flags, environment variables, etc., and not through
directly editing the files within the installation. Importing
asciidoc should no longer require the `asciidocapi.py` script, and
can be done through regular python import, e.g. `import asciidoc;
asciidoc.execute(...)`.

The APIs of the asciidoc and a2x scripts are now considered
"provisional" with no guarantee of BC between releases with the
exception of the `asciidoc.execute` method. Please post an issue
on our tracker for any method you directly rely on and would like
to have BC for.

.Features
- Install using `pip install asciidoc`

.Miscellaneous
- Changed website domain to https://asciidoc-py.github.io/. The
old domain will redirect for a period of time, but will be updated
at some point to point at website created by the
https://asciidoc-wg.eclipse.org/[AsciiDoc Working Group].

.Testing
- Test against 3.10 stable
This commit is contained in:
wiz 2022-01-24 09:58:21 +00:00
parent ffd82642b5
commit 4e06b0e950
3 changed files with 167 additions and 143 deletions

View file

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.62 2021/12/08 16:06:43 adam Exp $
# $NetBSD: Makefile,v 1.63 2022/01/24 09:58:21 wiz Exp $
DISTNAME= asciidoc-9.1.1
PKGREVISION= 1
DISTNAME= asciidoc-10.1.1
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GITHUB:=asciidoc/}
GITHUB_PROJECT= asciidoc-py3
@ -13,6 +12,8 @@ LICENSE= gnu-gpl-v2
DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
DEPENDS+= getopt-[0-9]*:../../misc/getopt
TEST_DEPENDS+= ${PYPKGPREFIX}-test-mock-[0-9]*:../../devel/py-test-mock
TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
WRKSRC= ${WRKDIR}/${DISTNAME:S/-/-py-/}
@ -21,49 +22,29 @@ USE_TOOLS+= pax
SUBST_CLASSES+= ad
SUBST_STAGE.ad= pre-configure
SUBST_MESSAGE.ad= Fixing hard-coded config file paths.
SUBST_FILES.ad= a2x.py asciidoc.py
SUBST_FILES.ad= asciidoc/a2x.py asciidoc/asciidoc.py
SUBST_SED.ad= -e 's,^\(CONF_DIR\).*=.*,\1="${PREFIX}/share/asciidoc",'
REPLACE_PYTHON+= a2x.py
REPLACE_PYTHON+= asciidoc.py
REPLACE_PYTHON+= asciidocapi.py
REPLACE_PYTHON+= filters/code/code-filter.py
REPLACE_PYTHON+= filters/latex/latex2img.py
REPLACE_PYTHON+= filters/music/music2png.py
REPLACE_PYTHON+= filters/graphviz/graphviz2png.py
REPLACE_PYTHON+= filters/unwraplatex.py
REPLACE_PYTHON+= asciidoc/a2x.py
REPLACE_PYTHON+= asciidoc/asciidoc.py
REPLACE_PYTHON+= asciidoc/resources/filters/code/code-filter.py
REPLACE_PYTHON+= asciidoc/resources/filters/latex/latex2img.py
REPLACE_PYTHON+= asciidoc/resources/filters/music/music2png.py
REPLACE_PYTHON+= asciidoc/resources/filters/graphviz/graphviz2png.py
REPLACE_PYTHON+= asciidoc/resources/filters/unwraplatex.py
REPLACE_PYTHON+= tests/testasciidoc.py
PYTHON_VERSIONS_INCOMPATIBLE= 27
INSTALLATION_DIRS= bin share/asciidoc share/asciidoc/filters \
share/asciidoc/docbook-xsl share/asciidoc/stylesheets \
share/asciidoc/javascripts \
share/asciidoc/images/icons/callouts \
${PKGMANDIR}/man1 ${DOCDIR}
DOCDIR= ${PREFIX}/share/doc/asciidoc
.include "options.mk"
do-build:
cd ${WRKSRC} && \
${PYTHONBIN} a2x.py -f manpage doc/a2x.1.txt && \
${PYTHONBIN} a2x.py -f manpage doc/asciidoc.1.txt
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/asciidoc.py ${DESTDIR}${PREFIX}/bin/asciidoc
${INSTALL_SCRIPT} ${WRKSRC}/a2x.py ${DESTDIR}${PREFIX}/bin/a2x
${INSTALL_MAN} ${WRKSRC}/doc/asciidoc.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
${INSTALL_MAN} ${WRKSRC}/doc/a2x.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
${INSTALL_DATA} ${WRKSRC}/doc/asciidoc.txt ${DESTDIR}${DOCDIR}
cd ${WRKSRC} && pax -wr -pma *.conf filters docbook-xsl/*.xsl \
stylesheets/*.css javascripts/*.js images/* dblatex/* themes/* \
${DESTDIR}${PREFIX}/share/asciidoc/.
# as of 10.1.1
# 10 failed, 37 passed, 4 warnings
TEST_ENV+= PYTHONPATH=${WRKSRC}/build/lib
do-test:
cd ${WRKSRC} && ${PYTHONBIN} asciidoc.py -v doc/asciidoc.txt
cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX}
.include "../../lang/python/application.mk"
.include "../../lang/python/egg.mk"
.include "../../textproc/libxslt/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

View file

@ -1,105 +1,148 @@
@comment $NetBSD: PLIST,v 1.20 2021/05/01 10:03:33 nia Exp $
@comment $NetBSD: PLIST,v 1.21 2022/01/24 09:58:21 wiz Exp $
bin/a2x
bin/asciidoc
man/man1/a2x.1
man/man1/asciidoc.1
share/asciidoc/asciidoc.conf
share/asciidoc/dblatex/asciidoc-dblatex.sty
share/asciidoc/dblatex/asciidoc-dblatex.xsl
share/asciidoc/dblatex/dblatex-readme.txt
share/asciidoc/docbook-xsl/chunked.xsl
share/asciidoc/docbook-xsl/common.xsl
share/asciidoc/docbook-xsl/epub.xsl
share/asciidoc/docbook-xsl/fo.xsl
share/asciidoc/docbook-xsl/htmlhelp.xsl
share/asciidoc/docbook-xsl/manpage.xsl
share/asciidoc/docbook-xsl/text.xsl
share/asciidoc/docbook-xsl/xhtml.xsl
share/asciidoc/docbook45.conf
share/asciidoc/docbook5.conf
share/asciidoc/filters/code/code-filter-readme.txt
share/asciidoc/filters/code/code-filter-test.txt
share/asciidoc/filters/code/code-filter.conf
share/asciidoc/filters/code/code-filter.py
share/asciidoc/filters/graphviz/asciidoc-graphviz-sample.txt
share/asciidoc/filters/graphviz/graphviz-filter.conf
share/asciidoc/filters/graphviz/graphviz2png.py
share/asciidoc/filters/latex/latex-filter.conf
share/asciidoc/filters/latex/latex2img.py
share/asciidoc/filters/music/music-filter-test.txt
share/asciidoc/filters/music/music-filter.conf
share/asciidoc/filters/music/music2png.py
share/asciidoc/filters/source/source-highlight-filter-test.txt
share/asciidoc/filters/source/source-highlight-filter.conf
share/asciidoc/filters/unwraplatex.py
share/asciidoc/help.conf
share/asciidoc/html4.conf
share/asciidoc/html5.conf
share/asciidoc/images/highlighter.png
share/asciidoc/images/icons/README
share/asciidoc/images/icons/callouts/1.png
share/asciidoc/images/icons/callouts/10.png
share/asciidoc/images/icons/callouts/11.png
share/asciidoc/images/icons/callouts/12.png
share/asciidoc/images/icons/callouts/13.png
share/asciidoc/images/icons/callouts/14.png
share/asciidoc/images/icons/callouts/15.png
share/asciidoc/images/icons/callouts/2.png
share/asciidoc/images/icons/callouts/3.png
share/asciidoc/images/icons/callouts/4.png
share/asciidoc/images/icons/callouts/5.png
share/asciidoc/images/icons/callouts/6.png
share/asciidoc/images/icons/callouts/7.png
share/asciidoc/images/icons/callouts/8.png
share/asciidoc/images/icons/callouts/9.png
share/asciidoc/images/icons/caution.png
share/asciidoc/images/icons/example.png
share/asciidoc/images/icons/home.png
share/asciidoc/images/icons/important.png
share/asciidoc/images/icons/next.png
share/asciidoc/images/icons/note.png
share/asciidoc/images/icons/prev.png
share/asciidoc/images/icons/tip.png
share/asciidoc/images/icons/up.png
share/asciidoc/images/icons/warning.png
share/asciidoc/images/smallnew.png
share/asciidoc/images/tiger.png
share/asciidoc/javascripts/ASCIIMathML.js
share/asciidoc/javascripts/LaTeXMathML.js
share/asciidoc/javascripts/asciidoc.js
share/asciidoc/javascripts/slidy.js
share/asciidoc/javascripts/toc.js
share/asciidoc/lang-ca.conf
share/asciidoc/lang-cs.conf
share/asciidoc/lang-de.conf
share/asciidoc/lang-el.conf
share/asciidoc/lang-en.conf
share/asciidoc/lang-es.conf
share/asciidoc/lang-fi.conf
share/asciidoc/lang-fr.conf
share/asciidoc/lang-hu.conf
share/asciidoc/lang-id.conf
share/asciidoc/lang-it.conf
share/asciidoc/lang-ja.conf
share/asciidoc/lang-nl.conf
share/asciidoc/lang-pl.conf
share/asciidoc/lang-pt-BR.conf
share/asciidoc/lang-ro.conf
share/asciidoc/lang-ru.conf
share/asciidoc/lang-sv.conf
share/asciidoc/lang-uk.conf
share/asciidoc/lang-zh-CN.conf
share/asciidoc/latex.conf
share/asciidoc/slidy.conf
share/asciidoc/stylesheets/asciidoc.css
share/asciidoc/stylesheets/docbook-xsl.css
share/asciidoc/stylesheets/pygments.css
share/asciidoc/stylesheets/slidy.css
share/asciidoc/stylesheets/toc2.css
share/asciidoc/stylesheets/xhtml11-quirks.css
share/asciidoc/text.conf
share/asciidoc/themes/flask/flask.css
share/asciidoc/themes/volnitsky/volnitsky.css
share/asciidoc/xhtml11-quirks.conf
share/asciidoc/xhtml11.conf
share/doc/asciidoc/asciidoc.txt
${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
${PYSITELIB}/${EGG_INFODIR}/top_level.txt
${PYSITELIB}/asciidoc/__init__.py
${PYSITELIB}/asciidoc/__init__.pyc
${PYSITELIB}/asciidoc/__init__.pyo
${PYSITELIB}/asciidoc/__main__.py
${PYSITELIB}/asciidoc/__main__.pyc
${PYSITELIB}/asciidoc/__main__.pyo
${PYSITELIB}/asciidoc/__metadata__.py
${PYSITELIB}/asciidoc/__metadata__.pyc
${PYSITELIB}/asciidoc/__metadata__.pyo
${PYSITELIB}/asciidoc/a2x.py
${PYSITELIB}/asciidoc/a2x.pyc
${PYSITELIB}/asciidoc/a2x.pyo
${PYSITELIB}/asciidoc/api.py
${PYSITELIB}/asciidoc/api.pyc
${PYSITELIB}/asciidoc/api.pyo
${PYSITELIB}/asciidoc/asciidoc.py
${PYSITELIB}/asciidoc/asciidoc.pyc
${PYSITELIB}/asciidoc/asciidoc.pyo
${PYSITELIB}/asciidoc/collections.py
${PYSITELIB}/asciidoc/collections.pyc
${PYSITELIB}/asciidoc/collections.pyo
${PYSITELIB}/asciidoc/exceptions.py
${PYSITELIB}/asciidoc/exceptions.pyc
${PYSITELIB}/asciidoc/exceptions.pyo
${PYSITELIB}/asciidoc/resources/asciidoc.conf
${PYSITELIB}/asciidoc/resources/dblatex/asciidoc-dblatex.sty
${PYSITELIB}/asciidoc/resources/dblatex/asciidoc-dblatex.xsl
${PYSITELIB}/asciidoc/resources/dblatex/dblatex-readme.txt
${PYSITELIB}/asciidoc/resources/docbook-xsl/asciidoc-docbook-xsl.txt
${PYSITELIB}/asciidoc/resources/docbook-xsl/chunked.xsl
${PYSITELIB}/asciidoc/resources/docbook-xsl/common.xsl
${PYSITELIB}/asciidoc/resources/docbook-xsl/epub.xsl
${PYSITELIB}/asciidoc/resources/docbook-xsl/fo.xsl
${PYSITELIB}/asciidoc/resources/docbook-xsl/htmlhelp.xsl
${PYSITELIB}/asciidoc/resources/docbook-xsl/manpage.xsl
${PYSITELIB}/asciidoc/resources/docbook-xsl/text.xsl
${PYSITELIB}/asciidoc/resources/docbook-xsl/xhtml.xsl
${PYSITELIB}/asciidoc/resources/docbook45.conf
${PYSITELIB}/asciidoc/resources/docbook5.conf
${PYSITELIB}/asciidoc/resources/filters/code/code-filter-readme.txt
${PYSITELIB}/asciidoc/resources/filters/code/code-filter-test.txt
${PYSITELIB}/asciidoc/resources/filters/code/code-filter.conf
${PYSITELIB}/asciidoc/resources/filters/code/code-filter.py
${PYSITELIB}/asciidoc/resources/filters/code/code-filter.pyc
${PYSITELIB}/asciidoc/resources/filters/code/code-filter.pyo
${PYSITELIB}/asciidoc/resources/filters/graphviz/asciidoc-graphviz-sample.txt
${PYSITELIB}/asciidoc/resources/filters/graphviz/graphviz-filter.conf
${PYSITELIB}/asciidoc/resources/filters/graphviz/graphviz2png.py
${PYSITELIB}/asciidoc/resources/filters/graphviz/graphviz2png.pyc
${PYSITELIB}/asciidoc/resources/filters/graphviz/graphviz2png.pyo
${PYSITELIB}/asciidoc/resources/filters/latex/latex-filter.conf
${PYSITELIB}/asciidoc/resources/filters/latex/latex2img.py
${PYSITELIB}/asciidoc/resources/filters/latex/latex2img.pyc
${PYSITELIB}/asciidoc/resources/filters/latex/latex2img.pyo
${PYSITELIB}/asciidoc/resources/filters/music/music-filter-test.txt
${PYSITELIB}/asciidoc/resources/filters/music/music-filter.conf
${PYSITELIB}/asciidoc/resources/filters/music/music2png.py
${PYSITELIB}/asciidoc/resources/filters/music/music2png.pyc
${PYSITELIB}/asciidoc/resources/filters/music/music2png.pyo
${PYSITELIB}/asciidoc/resources/filters/source/source-highlight-filter-test.txt
${PYSITELIB}/asciidoc/resources/filters/source/source-highlight-filter.conf
${PYSITELIB}/asciidoc/resources/filters/unwraplatex.py
${PYSITELIB}/asciidoc/resources/filters/unwraplatex.pyc
${PYSITELIB}/asciidoc/resources/filters/unwraplatex.pyo
${PYSITELIB}/asciidoc/resources/help.conf
${PYSITELIB}/asciidoc/resources/html4.conf
${PYSITELIB}/asciidoc/resources/html5.conf
${PYSITELIB}/asciidoc/resources/icons/callouts/1.png
${PYSITELIB}/asciidoc/resources/icons/callouts/10.png
${PYSITELIB}/asciidoc/resources/icons/callouts/11.png
${PYSITELIB}/asciidoc/resources/icons/callouts/12.png
${PYSITELIB}/asciidoc/resources/icons/callouts/13.png
${PYSITELIB}/asciidoc/resources/icons/callouts/14.png
${PYSITELIB}/asciidoc/resources/icons/callouts/15.png
${PYSITELIB}/asciidoc/resources/icons/callouts/2.png
${PYSITELIB}/asciidoc/resources/icons/callouts/3.png
${PYSITELIB}/asciidoc/resources/icons/callouts/4.png
${PYSITELIB}/asciidoc/resources/icons/callouts/5.png
${PYSITELIB}/asciidoc/resources/icons/callouts/6.png
${PYSITELIB}/asciidoc/resources/icons/callouts/7.png
${PYSITELIB}/asciidoc/resources/icons/callouts/8.png
${PYSITELIB}/asciidoc/resources/icons/callouts/9.png
${PYSITELIB}/asciidoc/resources/icons/caution.png
${PYSITELIB}/asciidoc/resources/icons/example.png
${PYSITELIB}/asciidoc/resources/icons/home.png
${PYSITELIB}/asciidoc/resources/icons/important.png
${PYSITELIB}/asciidoc/resources/icons/next.png
${PYSITELIB}/asciidoc/resources/icons/note.png
${PYSITELIB}/asciidoc/resources/icons/prev.png
${PYSITELIB}/asciidoc/resources/icons/tip.png
${PYSITELIB}/asciidoc/resources/icons/up.png
${PYSITELIB}/asciidoc/resources/icons/warning.png
${PYSITELIB}/asciidoc/resources/javascripts/ASCIIMathML.js
${PYSITELIB}/asciidoc/resources/javascripts/LaTeXMathML.js
${PYSITELIB}/asciidoc/resources/javascripts/asciidoc.js
${PYSITELIB}/asciidoc/resources/javascripts/slidy.js
${PYSITELIB}/asciidoc/resources/javascripts/toc.js
${PYSITELIB}/asciidoc/resources/lang-ca.conf
${PYSITELIB}/asciidoc/resources/lang-cs.conf
${PYSITELIB}/asciidoc/resources/lang-de.conf
${PYSITELIB}/asciidoc/resources/lang-el.conf
${PYSITELIB}/asciidoc/resources/lang-en.conf
${PYSITELIB}/asciidoc/resources/lang-es.conf
${PYSITELIB}/asciidoc/resources/lang-fi.conf
${PYSITELIB}/asciidoc/resources/lang-fr.conf
${PYSITELIB}/asciidoc/resources/lang-hu.conf
${PYSITELIB}/asciidoc/resources/lang-id.conf
${PYSITELIB}/asciidoc/resources/lang-it.conf
${PYSITELIB}/asciidoc/resources/lang-ja.conf
${PYSITELIB}/asciidoc/resources/lang-nl.conf
${PYSITELIB}/asciidoc/resources/lang-pl.conf
${PYSITELIB}/asciidoc/resources/lang-pt-BR.conf
${PYSITELIB}/asciidoc/resources/lang-ro.conf
${PYSITELIB}/asciidoc/resources/lang-ru.conf
${PYSITELIB}/asciidoc/resources/lang-sv.conf
${PYSITELIB}/asciidoc/resources/lang-uk.conf
${PYSITELIB}/asciidoc/resources/lang-zh-CN.conf
${PYSITELIB}/asciidoc/resources/latex.conf
${PYSITELIB}/asciidoc/resources/slidy.conf
${PYSITELIB}/asciidoc/resources/stylesheets/asciidoc.css
${PYSITELIB}/asciidoc/resources/stylesheets/docbook-xsl.css
${PYSITELIB}/asciidoc/resources/stylesheets/pygments.css
${PYSITELIB}/asciidoc/resources/stylesheets/slidy.css
${PYSITELIB}/asciidoc/resources/stylesheets/toc2.css
${PYSITELIB}/asciidoc/resources/stylesheets/xhtml11-quirks.css
${PYSITELIB}/asciidoc/resources/text.conf
${PYSITELIB}/asciidoc/resources/themes/flask/flask.css
${PYSITELIB}/asciidoc/resources/themes/volnitsky/volnitsky.css
${PYSITELIB}/asciidoc/resources/xhtml11-quirks.conf
${PYSITELIB}/asciidoc/resources/xhtml11.conf
${PYSITELIB}/asciidoc/utils.py
${PYSITELIB}/asciidoc/utils.pyc
${PYSITELIB}/asciidoc/utils.pyo
@pkgdir share/doc/asciidoc
@pkgdir share/asciidoc/stylesheets
@pkgdir share/asciidoc/javascripts
@pkgdir share/asciidoc/images/icons/callouts
@pkgdir share/asciidoc/filters
@pkgdir share/asciidoc/docbook-xsl
@pkgdir man/man1

View file

@ -1,5 +1,5 @@
$NetBSD: distinfo,v 1.29 2021/10/26 11:21:34 nia Exp $
$NetBSD: distinfo,v 1.30 2022/01/24 09:58:21 wiz Exp $
BLAKE2s (asciidoc-9.1.1.tar.gz) = 38dbbc90f4b1399b4dd833b0a1fd0b1c661093ba16e246ce8cd8d99c5031348e
SHA512 (asciidoc-9.1.1.tar.gz) = 444de69e3b87af984327873d5be1162157db5f7fb353e1fbbd24b4938ce0238fd474a67c9d3461fb7b069e7b029c63fbaf1ba8dd9cf7b91fbfa81e5429db404c
Size (asciidoc-9.1.1.tar.gz) = 1130652 bytes
BLAKE2s (asciidoc-10.1.1.tar.gz) = cef4bd747f873dd25aa145ad66f70eef1001598276fdeb8697103d2a58df6e89
SHA512 (asciidoc-10.1.1.tar.gz) = 110d26dc9cb9a009c86918447ec40a0f0daabbaeb4707679aa6840982d5058cf7b0ce16167cf4148a54ed0f61a59ca1d9aa3254db51c3409d22cd19ea27a88c4
Size (asciidoc-10.1.1.tar.gz) = 1132934 bytes