Merge pull request #45 from pebenito/master

Fix CI errors.

.travis.yml

@@ -6,7 +6,7 @@ env:
   global:
     # LIBSEPOLA needed by the Makefiles.
     - USERSPACE_SRC=$TRAVIS_BUILD_DIR/selinux-src
-    - SELINUX_USERSPACE_VERSION=libsepol-2.8
+    - SELINUX_USERSPACE_VERSION=libsepol-3.0
     - SEPOL_SRC=$USERSPACE_SRC/libsepol
     - LIBSEPOLA=$SEPOL_SRC/src/libsepol.a
     - SELINUX_SRC=$USERSPACE_SRC/libselinux

README.md

@@ -17,7 +17,7 @@ To run SETools command line tools, the following packages are required:
 * NetworkX 2.0+
 * setuptools
 * libselinux
-* libsepol 2.8+
+* libsepol 3.0+
 
 To run SETools graphical tools, the following packages are also required:
 * PyQt5

setools/dta.py

@@ -115,7 +115,8 @@ class DomainTransitionAnalysis:
             # NodeNotFound: the type is valid but not in graph, e.g. excluded
             # NetworkXNoPath: no paths or the target type is
             # not in the graph
-            yield self.__generate_steps(nx.shortest_path(self.subG, s, t))
+            # pylint: disable=unexpected-keyword-arg, no-value-for-parameter
+            yield self.__generate_steps(nx.shortest_path(self.subG, source=s, target=t))
 
     def all_paths(self, source, target, maxlen=2):
         """

setools/infoflow.py

@@ -129,7 +129,8 @@ class InfoFlowAnalysis:
             # excluded or disconnected due to min weight
             # NetworkXNoPath: no paths or the target type is
             # not in the graph
-            yield self.__generate_steps(nx.shortest_path(self.subG, s, t))
+            # pylint: disable=unexpected-keyword-arg, no-value-for-parameter
+            yield self.__generate_steps(nx.shortest_path(self.subG, source=s, target=t))
 
     def all_paths(self, source, target, maxlen=2):
         """