Update base to current pyang master (2.6.1 plus something)

.github/workflows/tests.yml

@@ -1,11 +1,15 @@
 name: tests
-on: [push]
+on:
+  push:
+  pull_request:
+    branches:
+      - main
 jobs:
   run-tests:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8.18", "3.9.21", "3.10.16", "3.11.11", "3.12.8", "3.13.1"]
 
     steps:
       - uses: actions/checkout@v3

CHANGELOG.md

@@ -1,3 +1,40 @@
+* 2.6.1 - 2024-05-23
+```
+       fix IEEE module name prefix expectation
+         thanks to Siddharth Sharma
+
+       #884 - tree module header not printed
+       #886 - crash on deviation of config
+       #887 - replace call to sys.exit with return
+       #907 - --check-update now checks for changes in ordered-by
+```
+
+* 2.6.0 - 2023-11-03
+```
+       lots of improvements to the UML plugin
+         thanks to Nick Hancock
+       lots of improvements to build and test
+         thanks to @ubaumann
+       fix invalid regular expression on Windows
+         thanks to Jan Kundrát
+       fix script issues on Windows
+         thanks to Jan Kundrát
+       fix validation of when expressions for 1.1 modules
+         thanks to Derek Ingrouville
+       fixes for revision-date in depend output
+         thanks to Slavomir Mazur
+
+       #845 - sid item status
+       #844 - tree max line length issue
+       #837 - test fixes
+       #821 - typo in jstree output
+       #818 - issue with decimal64 defaults in json2xml
+       #809 - revision-date parsed wrong if multiple "@" found in path
+              thanks to Michael Littlejohn
+       #729 - handle name scoping of 1.1 submodules in XPath expressions
+       #516 - crash in tree output
+```
+
 * 2.5.3 - 2022-03-30
 ```
        added support for checking 'ancestor' and 'ancestor-or-self' XPATH axes

CONTRIBUTORS

@@ -11,17 +11,22 @@ Fred Gan
 Joe Gladston
 Pravin Gohite
 Yan Gorelik
+Nick Hancock
 Giles Heron
+Derek Ingrouville
 Jozef Janitor
 Robin Jarry
 Mahesh Jethanandani
 Denys Knertser
 Mallikarjunarao Kosuri
 Miroslav Kovac
+Jan Kundrát
 Balázs Lengyel
+Michael Littlejohn
 Miroslav Los
 Ladislav Lhotka
 William Lupton
+Slavomir Mazur
 Glenn Matthews
 Paul Merlo
 Ganesh Nalawade
@@ -31,6 +36,7 @@ Erik Rask
 Michael Richardson
 Ralph Schmieder
 Juergen Schoenwaelder
+Siddharth Sharma
 Romanos Skiadas
 Stefan Vallin
 Norbert Varkonyi
@@ -40,6 +46,7 @@ Nick Weeds
 Jonathan Yang
 Quentin Young
 Huaian Zhou
+@cygnus2048
 @gribok
 @lemikev
-@cygnus2048
+@ubaumann

dev-requirements.txt

@@ -1,6 +1,7 @@
+setuptools
 coveralls
 pycodestyle
 pyflakes
 flake8
 pylint
-virtualenv
+virtualenv

doc/Makefile

@@ -1,19 +1,6 @@
-# ifeq ($(DBSS),)
-#   DBSS=$(wildcard /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl)
-# endif
-# ifeq ($(DBSS),)
-#   DBSS=$(wildcard /usr/share/sgml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl)
-# endif
-# ifeq ($(DBSS),)
-#   $(error docbook stylesheet not found)
-# endif
+MANPAGES=$(patsubst %.1.md,../man/man1/%.1,$(wildcard *.1.md))
 
-# NOTE: 1.79.1 generates bad man pages; they don't render properly
-#DBURI=http://docbook.sourceforge.net/release/xsl/current
-DBURI=http://docbook.sourceforge.net/release/xsl/1.78.1
-MANPAGES=../man/man1/yang2dsdl.1 ../man/man1/pyang.1 ../man/man1/json2xml.1
-
-PYANG_VERSION=$(shell grep __version__ ../pyang/__init__.py | \
+VERSION=$(shell grep __version__ ../pyang/__init__.py | \
 	        awk -F\' '{print $$2}')
 DATE=$(shell grep __date__ ../pyang/__init__.py | \
 	        awk -F\' '{print $$2}')
@@ -24,14 +11,8 @@ all: $(MANPAGES)
 clean:
 	rm -f $(MANPAGES)
 
-../man/man1/%.1: %.1.dbk
-	cat $< | \
-	  sed -e 's/%PYANG_VERSION%/$(PYANG_VERSION)/g' \
-	      -e 's/%DATE%/$(DATE)/g' | \
-	  xsltproc -o $@ $(DBURI)/manpages/docbook.xsl -
-
-%.1.html: %.1.dbk
+../man/man1/%.1: %.1.md
 	cat $< | \
-	  sed -e 's/%PYANG_VERSION%/$(PYANG_VERSION)/g' \
-	      -e 's/%DATE%/$(DATE)/g' | \
-	  xsltproc -o $@ $(DBURI)/xhtml/docbook.xsl -
+	  sed -e 's/_VERSION_/$(VERSION)/g' \
+	      -e 's/_DATE_/$(DATE)/g' | \
+	  pandoc - -s -t man -o $@