Fix Makefile and tox configuration

nicolasmorini · rjarry · commit dc9675b80ef8 · 2021-09-16T22:39:08.000+02:00
* Adapt to target branch "libyang1" of libyang dependency

* Address two new pylint warnings when using latest pylint's
  version (2.10.2)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -38,9 +38,7 @@ jobs:
           - python: pypy3
             toxenv: pypy3
           - python: 3.x
-            toxenv: py3-master
-          - python: 3.x
-            toxenv: py3-devel
+            toxenv: py3-libyang1
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ lint:
 	tox -e lint
 
 tests:
-	tox -e py3-devel
+	tox -e py3-libyang1
 
 format:
 	tox -e format
diff --git a/cffi/build.py b/cffi/build.py
@@ -11,7 +11,7 @@
 HERE = os.path.dirname(__file__)
 
 BUILDER = cffi.FFI()
-with open(os.path.join(HERE, "cdefs.h")) as f:
+with open(os.path.join(HERE, "cdefs.h"), encoding="utf-8") as f:
     BUILDER.cdef(f.read())
 
 
@@ -30,7 +30,7 @@ def search_paths(env_var: str) -> List[str]:
 EXTRA_CFLAGS += shlex.split(os.environ.get("LIBYANG_EXTRA_CFLAGS", ""))
 EXTRA_LDFLAGS = shlex.split(os.environ.get("LIBYANG_EXTRA_LDFLAGS", ""))
 
-with open(os.path.join(HERE, "source.c")) as f:
+with open(os.path.join(HERE, "source.c"), encoding="utf-8") as f:
     BUILDER.set_source(
         "_libyang",
         f.read(),
diff --git a/libyang/keyed_list.py b/libyang/keyed_list.py
@@ -140,7 +140,7 @@ def __deepcopy__(self, memo) -> "KeyedList":
         return k
 
     # unsupported list API methods
-    def __unsupported(self, *args, **kwargs):
+    def __unsupported(self, *args, **kwargs):  # pylint: disable=unused-private-member
         raise TypeError("unsupported operation for non-ordered lists")
 
     index = __unsupported
diff --git a/tox-install.sh b/tox-install.sh
@@ -32,7 +32,7 @@ download()
 # build and install libyang into the virtualenv
 src="${LIBYANG_SRC:-$venv/.src}"
 if ! [ -d "$src" ]; then
-	libyang_branch="${LIBYANG_BRANCH:-devel}"
+	libyang_branch="${LIBYANG_BRANCH:-libyang1}"
 	download "https://github.com/CESNET/libyang" "$libyang_branch" "$src"
 fi
 
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = format,lint,py{35,36,37,38,py3},py3-{master,devel},coverage
+envlist = format,lint,py{35,36,37,38,py3},py3-libyang1,coverage
 skip_missing_interpreters = true
 isolated_build = true
 distdir = {toxinidir}/dist
@@ -11,8 +11,7 @@ basepython = python3
 description = Compile extension and run tests against {envname}.
 changedir = tests/
 setenv =
-	master: LIBYANG_BRANCH=master
-	devel: LIBYANG_BRANCH=devel
+	libyang1: LIBYANG_BRANCH=libyang1
 install_command = {toxinidir}/tox-install.sh {envdir} {opts} {packages}
 commands = python -Wd -m unittest discover -c
 
