pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/textproc/asciidoc asciidoc: update to 10.1.2.
details: https://anonhg.NetBSD.org/pkgsrc/rev/8e012f9d9869
branches: trunk
changeset: 374292:8e012f9d9869
user: wiz <wiz%pkgsrc.org@localhost>
date: Fri Feb 18 09:16:32 2022 +0000
description:
asciidoc: update to 10.1.2.
Version 10.1.2 (2022-02-17)
---------------------------
.Bug fixes
- DESTDIR passed to pip as part of make install
- Add number of missing files to release tarballs
- Fix parsing asciidoc_opt values with spaces for a2x
.Miscellaneous
- Cleanup unused parts of Makefile
- Website files removed from main asciidoc-py repo
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
diffstat:
textproc/asciidoc/Makefile | 57 ++------
textproc/asciidoc/PLIST | 260 +++++++++++++++++++++++++++-----------------
textproc/asciidoc/distinfo | 8 +-
3 files changed, 178 insertions(+), 147 deletions(-)
diffs (truncated from 365 to 300 lines):
diff -r c537bfff8bad -r 8e012f9d9869 textproc/asciidoc/Makefile
--- a/textproc/asciidoc/Makefile Fri Feb 18 09:11:57 2022 +0000
+++ b/textproc/asciidoc/Makefile Fri Feb 18 09:16:32 2022 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.64 2022/01/24 11:04:09 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2022/02/18 09:16:32 wiz Exp $
-DISTNAME= asciidoc-9.1.1
-PKGREVISION= 1
+DISTNAME= asciidoc-10.1.2
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GITHUB:=asciidoc/}
GITHUB_PROJECT= asciidoc-py3
@@ -13,57 +12,35 @@
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-/}
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_SED.ad= -e 's,^\(CONF_DIR\).*=.*,\1="${PREFIX}/share/asciidoc",'
+USE_PKG_RESOURCES= yes
-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.2
+# 84 passed, 26 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"
diff -r c537bfff8bad -r 8e012f9d9869 textproc/asciidoc/PLIST
--- a/textproc/asciidoc/PLIST Fri Feb 18 09:11:57 2022 +0000
+++ b/textproc/asciidoc/PLIST Fri Feb 18 09:16:32 2022 +0000
@@ -1,105 +1,159 @@
-@comment $NetBSD: PLIST,v 1.22 2022/01/24 11:04:09 wiz Exp $
+@comment $NetBSD: PLIST,v 1.23 2022/02/18 09:16:32 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/blocks/__init__.py
+${PYSITELIB}/asciidoc/blocks/__init__.pyc
+${PYSITELIB}/asciidoc/blocks/__init__.pyo
+${PYSITELIB}/asciidoc/blocks/table.py
+${PYSITELIB}/asciidoc/blocks/table.pyc
+${PYSITELIB}/asciidoc/blocks/table.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/message.py
+${PYSITELIB}/asciidoc/message.pyc
+${PYSITELIB}/asciidoc/message.pyo
+${PYSITELIB}/asciidoc/plugin.py
+${PYSITELIB}/asciidoc/plugin.pyc
+${PYSITELIB}/asciidoc/plugin.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
Home |
Main Index |
Thread Index |
Old Index