panvimwiki 0.5__tar.gz → 0.7__tar.gz

panvimwiki-0.7/.editorconfig

@@ -0,0 +1,47 @@
+
+EditorrConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.{js,py,html,html5}]
+charset = utf-8
+
+[*.{md,mdpp,diff,vim}]
+trim_trailing_whitespace = false
+
+[{vimrc,gvimrc}]
+trim_trailing_whitespace = false
+
+[*.py]
+indent_style = space
+indent_size = 4
+
+[Makefile]
+indent_style = tab
+
+[*.{json,yml}]
+indent_style = space
+indent_size = 2
+
+[*.{cs}]
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.{json}]
+indent_size = 2
+trim_trailing_whitespace = true
+
+[*.{ps1,psm1,psd1}]
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.{ps1xml,props,xml,yaml}]
+indent_size = 2

panvimwiki-0.7/.github/workflows/ci.yml

@@ -0,0 +1,200 @@
+# GitHub Actions configuration **EXAMPLE**,
+# MODIFY IT ACCORDING TO YOUR NEEDS!
+# Reference: https://docs.github.com/en/actions
+
+name: Test and Publish Python 🐍 distribution 📦 to PyPI and TestPyPI
+
+on:
+  push:
+    # Avoid using all the resources/limits available by checking only
+    # relevant branches and tags. Other branches can be checked via PRs.
+    branches: [main]
+    tags: ["v[0-9]*", "[0-9]+.[0-9]+*"] # Match tags that resemble a version
+  pull_request: # Run in every PR
+  workflow_dispatch: # Allow manually triggering the workflow
+  schedule:
+    # Run roughly every 15 days at 00:00 UTC
+    # (useful to check if updates on dependencies break the package)
+    - cron: "0 0 1,16 * *"
+
+permissions:
+  contents: read
+
+concurrency:
+  group: >-
+    ${{ github.workflow }}-${{ github.ref_type }}-
+    ${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
+jobs:
+  prepare:
+    runs-on: ubuntu-latest
+    outputs:
+      wheel-distribution: ${{ steps.wheel-distribution.outputs.path }}
+    steps:
+      - uses: actions/checkout@v4
+        with: { fetch-depth: 0 } # deep clone for setuptools-scm
+      - uses: actions/setup-python@v5
+        id: setup-python
+        with: { python-version: "3.11" }
+      - name: Run static analysis and format checkers
+        run: pipx run pre-commit run --all-files --show-diff-on-failure
+      - name: Build package distribution files 📦
+        run: >-
+          pipx run --python '${{ steps.setup-python.outputs.python-path }}'
+          tox -e clean,build
+      - name: Record the path of wheel distribution
+        id: wheel-distribution
+        run: echo "path=$(ls dist/*.whl)" >> $GITHUB_OUTPUT
+      - name: Store the distribution files for use in other stages
+        # `tests` and `publish` will use the same pre-built distributions,
+        # so we make sure to release the exact same package that was tested
+        uses: actions/upload-artifact@v3
+        with:
+          name: python-distribution-files
+          path: dist/
+          retention-days: 1
+
+  test:
+    needs: prepare
+    strategy:
+      matrix:
+        python:
+          # - "3.8" # oldest Python supported by PSF
+          - "3.10" # Required by rhysd/action-setup-vim@v1 on ubuntu-latest
+          # - "3.11" # newest Python that is stable
+        platform:
+          - ubuntu-latest
+        # - macos-latest
+        # - windows-latest
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: nikeee/setup-pandoc@v1
+        with:
+          pandoc-version: '3.1.3' # Compatible with tests for reference_citation.py
+      - uses: actions/setup-python@v5
+        id: setup-python
+        with:
+          python-version: ${{ matrix.python }}
+      - uses: rhysd/action-setup-vim@v1
+      - name: Retrieve pre-built distribution files
+        uses: actions/download-artifact@v3
+        with: { name: python-distribution-files, path: dist/ }
+      - name: Run tests
+        run: >-
+          pipx run --python '${{ steps.setup-python.outputs.python-path }}'
+          tox --installpkg '${{ needs.prepare.outputs.wheel-distribution }}'
+          -- -rFEx --durations 10 --color yes -vv # pytest args
+      - name: Generate coverage report
+        run: pipx run coverage lcov -o coverage.lcov
+      - name: Upload partial coverage report
+        uses: coverallsapp/github-action@master
+        with:
+          path-to-lcov: coverage.lcov
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          flag-name: ${{ matrix.platform }} - py${{ matrix.python }}
+          parallel: true
+
+  finalize:
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Finalize coverage report
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          parallel-finished: true
+
+  publish-to-testpypi:
+    name: Publish Python 🐍 distribution 📦 to TestPyPI
+    needs: finalize
+    runs-on: ubuntu-latest
+
+    environment:
+      name: testpypi
+      url: https://test.pypi.org/p/panvimwiki
+
+    permissions:
+      id-token: write # IMPORTANT: mandatory for trusted publishing
+
+    steps:
+      - name: Retrieve pre-built distribution files
+        uses: actions/download-artifact@v3
+        with: { name: python-distribution-files, path: dist/ }
+      - name: Publish distribution 📦 to TestPyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          repository-url: https://test.pypi.org/legacy/
+
+  publish-to-pypi:
+    name: >-
+      Publish Python 🐍 distribution 📦 to PyPI
+    needs: [finalize, publish-to-testpypi]
+    if: ${{ github.event_name == 'push' && contains(github.ref, 'refs/tags/') }}
+    runs-on: ubuntu-latest
+    environment:
+      name: pypi
+      url: https://pypi.org/p/panvimwiki # Replace <package-name> with your PyPI project name
+    permissions:
+      # contents: write
+      id-token: write # IMPORTANT: mandatory for trusted publishing
+    steps:
+      # - uses: actions/checkout@v4
+      # - uses: actions/setup-python@v5
+      #   with: {python-version: "3.11"}
+      - name: Retrieve pre-built distribution files
+        uses: actions/download-artifact@v3
+        with: { name: python-distribution-files, path: dist/ }
+      - name: Publish distribution 📦 to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+      # - name: Publish Package
+      #   env:
+      #     # TODO: Set your PYPI_TOKEN as a secret using GitHub UI
+      #     # - https://pypi.org/help/#apitoken
+      #     # - https://docs.github.com/en/actions/security-guides/encrypted-secrets
+      #     TWINE_REPOSITORY: pypi
+      #     TWINE_USERNAME: __token__
+      #     TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
+      #   run: pipx run tox -e publish
+
+  github-release:
+    name: >-
+      Sign the Python 🐍 distribution 📦 with Sigstore
+      and upload them to GitHub Release
+    needs:
+      - publish-to-pypi
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write # IMPORTANT: mandatory for making GitHub Releases
+      id-token: write # IMPORTANT: mandatory for sigstore
+
+    steps:
+      - name: Download all the dists
+        uses: actions/download-artifact@v3
+        with: { name: python-distribution-files, path: dist/ }
+      - name: Sign the dists with Sigstore
+        uses: sigstore/gh-action-sigstore-python@v2.1.0
+        with:
+          inputs: >-
+            ./dist/*.tar.gz
+            ./dist/*.whl
+      - name: Create GitHub Release
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        run: >-
+          gh release create
+          '${{ github.ref_name }}'
+          --repo '${{ github.repository }}'
+          --notes ""
+      - name: Upload artifact signatures to GitHub Release
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        # Upload to GitHub Release using the `gh` CLI.
+        # `dist/` contains the built packages, and the
+        # sigstore-produced signatures and certificates.
+        run: >-
+          gh release upload
+          '${{ github.ref_name }}' dist/**
+          --repo '${{ github.repository }}'

{panvimwiki-0.5 → panvimwiki-0.7}/CHANGELOG.md

@@ -1,6 +1,22 @@
 # Changelog
 
-## Version 0.6 (development)
+## Version 0.8 (development)
+
+## Version 0.7 (2024-01-13)
+
+- `:VimwikiReference` no longer converts to reference-links, preferring
+  compatibility with pandoc conversion to `HTML`.
+- DOCS: Update `:help panvimwiki`.
+- DOCS: Host at http://panvimwiki.readthedocs.io/
+
+## Version 0.6 (2024-01-01)
+
+- Vim command `:VimwikiReference` converts
+  [Pandoc Citations](https://pandoc.org/MANUAL.html#citation-syntax)
+  to [reference links](https://pandoc.org/MANUAL.html#reference-links),
+  e.g.,`[anchor:]`, replacing the current file.
+- DOCS: Update `:help`.
+- BUILD: Use pre-commit to remove trailing spaces from Vim help.
 
 ## Version 0.5 (2023-12-04)
 

{panvimwiki-0.5 → panvimwiki-0.7}/CONTRIBUTING.md

@@ -73,13 +73,21 @@ and use Python's built-in web server for a preview in your web browser
 python3 -m http.server --directory 'docs/_build/html' --bind localhost
 ```
 
+Tox runs `make` and `pre-commit` to build Vim help documentation in
+`doc/panvimwiki.txt`; you may need to run tox twice to resolve the following
+`pre-commit` error message:
+
+:::{error}
+trim trailing whitespace.................................................Failed
+:::
+
 ## Code Contributions
 
 Pandoc filters rely on [Panflute](http://scorreia.com/software/panflute/) and
 use the template
 [located here](https://github.com/sergiocorreia/panflute/blob/master/docs/source/_static/template.py).
 
-Plain text pre-filters follow a similar format but does not use panflute.
+Plain text pre-filters follow a similar format but do not use panflute.
 
 ### Submit an issue
 
@@ -150,7 +158,7 @@ conda activate panvimwiki
 2. Start your work on this branch. Don't forget to add [docstrings] to new
    functions, modules and classes, especially if they are part of public APIs.
 
-3. Add yourself to the list of contributors in `AUTHORS.rst`.
+3. Add yourself to the list of contributors in `AUTHORS.md`.
 
 4. When you’re done editing, do:
 
@@ -268,9 +276,8 @@ on [PyPI], the following steps can be used to release a new version for
 `panvimwiki`:
 
 1. Make sure all unit tests are successful.
-2. Tag the current commit on the main branch with a release tag, e.g., `v1.2.3`.
-3. Push the new tag to the upstream [repository],
-   e.g., `git push upstream v1.2.3`
+2. Make sure Vim help is up to date, e.g., `tox -e docs`
+3. Tag the current commit on the main branch with a release tag, e.g., `v1.2.3`.
 4. Clean up the `dist` and `build` folders with `tox -e clean`
    (or `rm -rf dist build`)
    to avoid confusion with old builds and Sphinx docs.
@@ -278,8 +285,10 @@ on [PyPI], the following steps can be used to release a new version for
    the correct version (no `.dirty` or [git] hash) according to the [git] tag.
    Also check the sizes of the distributions, if they are too big (e.g., >
    500KB), unwanted clutter may have been accidentally included.
-6. Run `tox -e publish -- --repository pypi` and check that everything was
-   uploaded to [PyPI] correctly.
+6. Push the new tag to the upstream [repository],
+   e.g., `git push upstream v1.2.3`
+7. [GitHub Actions] should run tests, upload to TestPyPI and [PyPI], and create
+   a signed [release][releases].
 
 [^contrib1]: Even though, these resources focus on open source projects and
     communities, the general ideas behind collaborating with other developers
@@ -310,3 +319,5 @@ on [PyPI], the following steps can be used to release a new version for
 [virtualenv]: https://virtualenv.pypa.io/en/stable/
 [repository]: https://github.com/jfishe/panvimwiki
 [issue tracker]: https://github.com/jfishe/panvimwiki/issues
+[gitHub actions]: https://github.com/jfishe/panvimwiki/actions
+[releases]: https://github.com/jfishe/panvimwiki/releases

{panvimwiki-0.5 → panvimwiki-0.7}/Makefile

@@ -60,8 +60,9 @@ ${vimdoc_targets}: | ${lua-filter}/include-files.lua ${lua-filter}/panvimdoc.lua
 		--lua-filter=${lua-filter}/include-files.lua \
 		--lua-filter=${lua-filter}/skip-blocks.lua \
 		--to=${lua-filter}/panvimdoc.lua \
-		--output=doc/panvimwiki.txt \
+		--output=$@ \
 		$<
+	pipx run pre-commit run --files $@
 
 ${lua-filter}/include-files.lua ${lua-filter}/panvimdoc.lua ${lua-filter}/skip-blocks.lua: | build/
 	cd build && \

{panvimwiki-0.5/src/panvimwiki.egg-info → panvimwiki-0.7}/PKG-INFO

@@ -1,11 +1,14 @@
 Metadata-Version: 2.1
 Name: panvimwiki
-Version: 0.5
+Version: 0.7
 Summary: Filter and convert Vimwiki notes using pandoc.
 Home-page: https://github.com/jfishe/panvimwiki
 Author: John D. Fisher
 Author-email: jdfenw@gmail.com
 License: MIT
+Project-URL: Documentation, http://panvimwiki.readthedocs.io/
+Project-URL: Source, https://github.com/jfishe/panvimwiki
+Project-URL: Tracker, https://github.com/jfishe/panvimwiki/issues
 Keywords: panvimwiki,vimwiki,pandoc
 Platform: any
 Classifier: Development Status :: 4 - Beta
@@ -55,6 +58,9 @@ description: Filter and convert Vimwiki notes using pandoc.
 [![Twitter](https://img.shields.io/twitter/url/http/shields.io.svg?style=social&label=Twitter)](https://twitter.com/panvimwiki)
 -->
 
+[![Documentation Status](https://readthedocs.org/projects/panvimwiki/badge/?version=latest)](https://panvimwiki.readthedocs.io/en/latest/?badge=latest)
+[![PyPI-Server](https://img.shields.io/pypi/v/panvimwiki.svg)](https://pypi.org/project/panvimwiki/)
+[![Test and Publish Python 🐍 distribution 📦 to PyPI and TestPyPI](https://github.com/jfishe/panvimwiki/actions/workflows/ci.yml/badge.svg)](https://github.com/jfishe/panvimwiki/actions/workflows/ci.yml)
 [![Project generated with PyScaffold](https://img.shields.io/badge/-PyScaffold-005CA0?logo=pyscaffold)](https://pyscaffold.org/)
 
 # Filter and convert Vimwiki notes using pandoc
@@ -71,8 +77,10 @@ concatenate and convert Diary Notes or convert any Vimwiki note.
 
 Panvimwiki requires
 [Pandoc](https://pandoc.org/ "Pandoc a universal document converter").
-Installation with conda is recommended because the system version, e.g., with
+Installation with `conda` is recommended because the system version, e.g., with
 Ubuntu, may be too old. Or download from the website.
+[Pypandoc](https://github.com/JessicaTegner/pypandoc?tab=readme-ov-file#installing-via-pip)
+supports binary installation of pandoc using `pip`.
 
 Using the Vim 8 native packages, panvimwiki should install in
 `pack/*/opt/panvimwiki` because it depends on [:python3](https://neovim.io/doc/user/if_pyth.html#python3)
@@ -89,6 +97,8 @@ git clone https://github.com/jfishe/panvimwiki.git "$dest"
 # Activate the python environment used by Vim.
 # Then install panvimwiki in that python environment.
 python -m pip install "$dest"
+# Or to install from pypi:
+python -m pip install panvimwiki
 ```
 
 Panvimwiki requires Vim compiled with Python 3, so add the following to
@@ -189,6 +199,25 @@ delete_task_pending
 - [.] Bulleted list done1 item 1 should appear
 ```
 
+#### Pandoc Filters
+
+Panvimwiki provides plain text pre-filters, pandoc filters and post-filters for
+use from the command line.
+
+##### delete_tag_lines
+
+Delete lines which only contain Vimwiki tags, e.g., ':tag1:tag2:'
+
+##### delete_empty_heading
+
+Remove headings that do not have any children or paragraphs. Remove tag lines
+first, [delete_tag_lines](#delete_tag_lines) or the heading is not considered
+empty.
+
+##### delete_taskwiki_heading
+
+#### Post-Filters
+
 ##### reference_citation
 
 Convert citations to a reference list.
@@ -196,6 +225,7 @@ Convert citations to a reference list.
 `Example.md`:
 
 ```markdown
+
 ::: {#refs .references .csl-bib-body .hanging-indent}
 ::: {#ref-bloggs-jones .csl-entry}
 Bloggs, A. J., and X. Y. Jones. 1959. "Title Title Title Title Title Title
@@ -221,23 +251,6 @@ Winston.
     New York: Holt, Rinehart & Winston.
 ```
 
-#### Pandoc Filters
-
-Panvimwiki provides plain text pre-filters and pandoc filters for use from
-the command line.
-
-##### delete_tag_lines
-
-Delete lines which only contain Vimwiki tags, e.g., ':tag1:tag2:'
-
-##### delete_empty_heading
-
-Remove headings that do not have any children or paragraphs. Remove tag lines
-first, [delete_tag_lines](#delete_tag_lines) or the heading is not considered
-empty.
-
-##### delete_taskwiki_heading
-
 ### Commands
 
 #### Local Commands
@@ -274,10 +287,16 @@ After concatenating DiaryNotes for the week, behave as [VimwikiConvert](#vimwiki
 
 ##### VimwikiReference
 
-If in markdown format, pandoc reads the current buffer, with citeproc
-references to a BibLaTeX or other supported database, and appends references
-links and the complete citation, according to the default citation style
-language (CSL).
+If in markdown format, expand
+[Pandoc Citations](https://pandoc.org/MANUAL.html#citation-syntax)
+in the current file and append to the end of the file. The Yaml metadata should
+[specify the bibliographic data](https://pandoc.org/MANUAL.html#specifying-bibliographic-data)
+and the
+[Citation Style Language (CSL)](https://pandoc.org/MANUAL.html#specifying-a-citation-style).
+
+`VimwikiReference` overwrites the file, so Vim may prompt to
+reload the buffer (cf. Warning `:h W12`). If you choose not to reload the
+buffer, `:h :DiffOrig` facilitate review of the changes.
 
 ### Settings
 
@@ -299,22 +318,17 @@ let g:panvimwiki_settings = {
 
 ## Development and Testing
 
-Because pandoc is required, a conda environment called `pyscaffold` is created.
+Because pandoc is required, a conda environment called `panvimwiki` is created.
 The default name may be overridden with the `--name <environment name>`
 parameter.
 
 ```bash
 git clone https://github.com/jfishe/panvimwiki.git
 cd panvimwiki
-conda env create --file environment.yml --name pyscaffold
-conda activate pyscaffold
-pipx install covimerage
+conda env create --file environment.yml
+conda activate panvimwiki
 ```
 
-Covimerage has conflicting dependencies, so pipx creates an isolated
-executable in `~/.local/bin`. You may want to run `pipx uninstall covimerage`
-to avoid cluttering `$PATH`.
-
 ```bash
 tox -av # List tox commands and descriptions.
 tox --recreate # Build the package and run tests with python and Vader.

{panvimwiki-0.5 → panvimwiki-0.7}/README.md

@@ -16,6 +16,9 @@ description: Filter and convert Vimwiki notes using pandoc.
 [![Twitter](https://img.shields.io/twitter/url/http/shields.io.svg?style=social&label=Twitter)](https://twitter.com/panvimwiki)
 -->
 
+[![Documentation Status](https://readthedocs.org/projects/panvimwiki/badge/?version=latest)](https://panvimwiki.readthedocs.io/en/latest/?badge=latest)
+[![PyPI-Server](https://img.shields.io/pypi/v/panvimwiki.svg)](https://pypi.org/project/panvimwiki/)
+[![Test and Publish Python 🐍 distribution 📦 to PyPI and TestPyPI](https://github.com/jfishe/panvimwiki/actions/workflows/ci.yml/badge.svg)](https://github.com/jfishe/panvimwiki/actions/workflows/ci.yml)
 [![Project generated with PyScaffold](https://img.shields.io/badge/-PyScaffold-005CA0?logo=pyscaffold)](https://pyscaffold.org/)
 
 # Filter and convert Vimwiki notes using pandoc
@@ -32,8 +35,10 @@ concatenate and convert Diary Notes or convert any Vimwiki note.
 
 Panvimwiki requires
 [Pandoc](https://pandoc.org/ "Pandoc a universal document converter").
-Installation with conda is recommended because the system version, e.g., with
+Installation with `conda` is recommended because the system version, e.g., with
 Ubuntu, may be too old. Or download from the website.
+[Pypandoc](https://github.com/JessicaTegner/pypandoc?tab=readme-ov-file#installing-via-pip)
+supports binary installation of pandoc using `pip`.
 
 Using the Vim 8 native packages, panvimwiki should install in
 `pack/*/opt/panvimwiki` because it depends on [:python3](https://neovim.io/doc/user/if_pyth.html#python3)
@@ -50,6 +55,8 @@ git clone https://github.com/jfishe/panvimwiki.git "$dest"
 # Activate the python environment used by Vim.
 # Then install panvimwiki in that python environment.
 python -m pip install "$dest"
+# Or to install from pypi:
+python -m pip install panvimwiki
 ```
 
 Panvimwiki requires Vim compiled with Python 3, so add the following to
@@ -150,6 +157,25 @@ delete_task_pending
 - [.] Bulleted list done1 item 1 should appear
 ```
 
+#### Pandoc Filters
+
+Panvimwiki provides plain text pre-filters, pandoc filters and post-filters for
+use from the command line.
+
+##### delete_tag_lines
+
+Delete lines which only contain Vimwiki tags, e.g., ':tag1:tag2:'
+
+##### delete_empty_heading
+
+Remove headings that do not have any children or paragraphs. Remove tag lines
+first, [delete_tag_lines](#delete_tag_lines) or the heading is not considered
+empty.
+
+##### delete_taskwiki_heading
+
+#### Post-Filters
+
 ##### reference_citation
 
 Convert citations to a reference list.
@@ -157,6 +183,7 @@ Convert citations to a reference list.
 `Example.md`:
 
 ```markdown
+
 ::: {#refs .references .csl-bib-body .hanging-indent}
 ::: {#ref-bloggs-jones .csl-entry}
 Bloggs, A. J., and X. Y. Jones. 1959. "Title Title Title Title Title Title
@@ -182,23 +209,6 @@ Winston.
     New York: Holt, Rinehart & Winston.
 ```
 
-#### Pandoc Filters
-
-Panvimwiki provides plain text pre-filters and pandoc filters for use from
-the command line.
-
-##### delete_tag_lines
-
-Delete lines which only contain Vimwiki tags, e.g., ':tag1:tag2:'
-
-##### delete_empty_heading
-
-Remove headings that do not have any children or paragraphs. Remove tag lines
-first, [delete_tag_lines](#delete_tag_lines) or the heading is not considered
-empty.
-
-##### delete_taskwiki_heading
-
 ### Commands
 
 #### Local Commands
@@ -235,10 +245,16 @@ After concatenating DiaryNotes for the week, behave as [VimwikiConvert](#vimwiki
 
 ##### VimwikiReference
 
-If in markdown format, pandoc reads the current buffer, with citeproc
-references to a BibLaTeX or other supported database, and appends references
-links and the complete citation, according to the default citation style
-language (CSL).
+If in markdown format, expand
+[Pandoc Citations](https://pandoc.org/MANUAL.html#citation-syntax)
+in the current file and append to the end of the file. The Yaml metadata should
+[specify the bibliographic data](https://pandoc.org/MANUAL.html#specifying-bibliographic-data)
+and the
+[Citation Style Language (CSL)](https://pandoc.org/MANUAL.html#specifying-a-citation-style).
+
+`VimwikiReference` overwrites the file, so Vim may prompt to
+reload the buffer (cf. Warning `:h W12`). If you choose not to reload the
+buffer, `:h :DiffOrig` facilitate review of the changes.
 
 ### Settings
 
@@ -260,22 +276,17 @@ let g:panvimwiki_settings = {
 
 ## Development and Testing
 
-Because pandoc is required, a conda environment called `pyscaffold` is created.
+Because pandoc is required, a conda environment called `panvimwiki` is created.
 The default name may be overridden with the `--name <environment name>`
 parameter.
 
 ```bash
 git clone https://github.com/jfishe/panvimwiki.git
 cd panvimwiki
-conda env create --file environment.yml --name pyscaffold
-conda activate pyscaffold
-pipx install covimerage
+conda env create --file environment.yml
+conda activate panvimwiki
 ```
 
-Covimerage has conflicting dependencies, so pipx creates an isolated
-executable in `~/.local/bin`. You may want to run `pipx uninstall covimerage`
-to avoid cluttering `$PATH`.
-
 ```bash
 tox -av # List tox commands and descriptions.
 tox --recreate # Build the package and run tests with python and Vader.

{panvimwiki-0.5 → panvimwiki-0.7}/after/ftplugin/vimwiki.vim

@@ -1,11 +1,12 @@
 " Panvimwiki ftplugin
 " File: vimwiki.vim
 " Description: Panvimwiki additions to filetype vimwiki
-" Maintainer: John D. Fisher
-" Last Change: 2023-12-03
+" Home: https://github.com/jfishe/panvimwiki
+" Maintainer: John D. Fisher <jdfenw@gmail.com>
+" Last Change: 2024-01-01
 
 if exists('b:did_ftplugin_panvimwiki') || &compatible
-            \ || !executable('pandoc') || !has('patch-8.2.0578h')
+      \ || !executable('pandoc') || !has('patch-8.2.0578h')
   finish
 endif
 let b:did_ftplugin_panvimwiki = 1  " Don't load another plugin for this buffer
@@ -13,28 +14,30 @@ let b:did_ftplugin_panvimwiki = 1  " Don't load another plugin for this buffer
 let s:save_cpo = &cpo
 set cpo&vim
 
+let b:undo_ftplugin = get(b:, 'undo_ftplugin', '')
+if !empty('b:undo_ftplugin')
+  let b:undo_ftplugin ..=  " | unlet b:did_ftplugin_panvimwiki"
+else
+  let b:undo_ftplugin = "unlet b:did_ftplugin_panvimwiki"
+endif
+
 if !exists(":VimwikiConvert")
   command -buffer -bang -nargs=0 VimwikiConvert
         \ call panvimwiki#convert(<bang>0)
+  let b:undo_ftplugin ..= " | delcommand VimwikiConvert"
 endif
 if !exists(":VimwikiConvertWeek")
   command -buffer -bang -nargs=0 VimwikiConvertWeek
         \ call panvimwiki#convert(<bang>0, 1)
+  let b:undo_ftplugin ..= " | delcommand VimwikiConvertWeek"
 endif
+
 if vimwiki#vars#get_wikilocal('syntax') ==# 'markdown' && !exists(":VimwikiReference")
   command -buffer -nargs=0 VimwikiReference
         \ call panvimwiki#expand_citeproc()
-else
-
-endif
-let b:undo_ftplugin = get(b:, 'undo_ftplugin', '')
-if !empty('b:undo_ftplugin')
-  let b:undo_ftplugin ..= " | "
+  let b:undo_ftplugin ..= " | delcommand VimwikiReference"
 endif
-let b:undo_ftplugin ..= "delcommand VimwikiConvertWeek"
-      \ .. " | delcommand VimwikiConvert"
-      \ .. " | unlet b:did_ftplugin_panvimwiki"
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
-" vim:tabstop=4:shiftwidth=4:expandtab:textwidth=99:foldmethod=marker
+" vim:tabstop=2:shiftwidth=2:expandtab:textwidth=99:foldmethod=marker