Reenable master

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        coq_version: ['8.4', '8.5', '8.6', '8.7', '8.8', '8.9', '8.10', '8.11', '8.12', '8.13', '8.14', '8.15', 'master']
+        coq_version: ['8.4', '8.5', '8.6', '8.7', '8.8', '8.9', '8.10', '8.11', '8.12', '8.13', '8.14', '8.15', '8.16', 'master']
         py_version: [3.6]
     steps:
       - uses: actions/checkout@v2

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased ([master])
 
+### Added
+- Support for Coq 8.16.
+  (PR #264)
+
 ### Fixed
 - Highlight hypotheses separated by a comma on the first line of the hypotheses
   block in the Goal panel as `coqIdent`.

README.md

@@ -9,7 +9,7 @@ Coqtail enables interactive Coq proof development in Vim similar to [CoqIDE] or
 [ProofGeneral].
 
 It supports:
-- [Coq 8.4 - 8.15]
+- [Coq 8.4 - 8.16]
 - Python >=3.6 (see [here](#python-2-support) for older versions)
 - Vim >=7.4 and Neovim >=0.3
 - Simultaneous Coq sessions in different buffers
@@ -46,7 +46,7 @@ Requirements:
 - Vim/Neovim compiled with `+python3` (3.6 or later)
 - Vim configuration options `filetype plugin on`, and optionally `filetype
   indent on` and `syntax on` (e.g. in `.vimrc`)
-- [Coq 8.4 - 8.15]
+- [Coq 8.4 - 8.16]
 
 Newer versions of Coq have not yet been tested, but should still work as long as
 there are no major changes made to the [XML protocol].
@@ -245,7 +245,7 @@ See [YouCompleteMe] for help building Vim with Python 3 support.
 If you cannot upgrade Vim, the [python2] branch still supports older Pythons.
 
 [python2]: https://github.com/whonore/Coqtail/tree/python2
-[Coq 8.4 - 8.15]: https://coq.inria.fr/download
+[Coq 8.4 - 8.16]: https://coq.inria.fr/download
 [CoqIDE]: https://coq.inria.fr/refman/practical-tools/coqide.html
 [ProofGeneral]: https://proofgeneral.github.io/
 [XML protocol]: https://github.com/coq/coq/blob/master/dev/doc/xml-protocol.md

ci/coq.nix

@@ -11,15 +11,5 @@ let
     (filter (s: s != "") (match "coq([0-9]|master)([0-9]*)-.*" tox_version));
 in if dot_version == "8.4" then
   (import (fetchTarball url_8_4) { }).coq_8_4
-else if dot_version == "master" then
-  # NOTE: Temporary workaround until
-  # https://github.com/coq-community/coq-nix-toolbox/issues/95 is resolved
-  (pkgs.coq.override { version = dot_version; }).overrideAttrs (old: {
-    postInstall = old.postInstall + ''
-      for prog in $out/bin/coq*; do
-        wrapProgram $prog --prefix OCAMLPATH : $OCAMLPATH
-      done
-    '';
-  })
 else
   pkgs.coq.override ({ version = dot_version; })

python/xmlInterface.py

@@ -1804,6 +1804,10 @@ def _standardize_add(self, res: Result) -> Result:
         return res
 
 
+class XMLInterface816(XMLInterface815):
+    """The version 8.16.* XML interface."""
+
+
 XMLInterfaces = (
     ((8, 4, 0), (8, 5, 0), XMLInterface84),
     ((8, 5, 0), (8, 6, 0), XMLInterface85),
@@ -1817,6 +1821,7 @@ def _standardize_add(self, res: Result) -> Result:
     ((8, 13, 0), (8, 14, 0), XMLInterface813),
     ((8, 14, 0), (8, 15, 0), XMLInterface814),
     ((8, 15, 0), (8, 16, 0), XMLInterface815),
+    ((8, 16, 0), (8, 17, 0), XMLInterface816),
 )
 
 XMLInterfaceLatest = XMLInterfaces[-1][2]

tox.ini

@@ -14,7 +14,7 @@ setenv = {[pybase]setenv}
 deps = {[pybase]deps}
 commands = python -m pytest -q tests/unit {posargs}
 
-[testenv:coq{,84,85,86,87,88,89,810,811,812,813,814,815,master}-py{36}]
+[testenv:coq{,84,85,86,87,88,89,810,811,812,813,814,815,816,master}-py{36}]
 description = Coq integration tests
 setenv =
     {[pybase]setenv}