Merge pull request #114 from pebenito/ci-update-py-versions

Update CI Python versions.
SELinuxProject · Dec 6, 2023 · 7d0b69b · 7d0b69b
2 parents 14d0312 + 0e379f9
commit 7d0b69b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -27,17 +27,14 @@ jobs:
 
       matrix:
         build-opts:
-          - {python: '3.6', tox: python3.6}
-          - {python: '3.7', tox: python3.7}
-          - {python: '3.8', tox: python3.8}
           - {python: '3.9', tox: python3.9}
           - {python: '3.10', tox: python3.10}
           - {python: '3.11', tox: python3.11}
-          - {python: '3.6', tox: pep8}
-          - {python: '3.6', tox: lint}
-          - {python: '3.6', tox: mypy}
-          - {python: '3.6', tox: coverage}
-          - {python: '3.6', tox: install}
+          - {python: '3.11', tox: pep8}
+          - {python: '3.11', tox: lint}
+          - {python: '3.11', tox: mypy}
+          - {python: '3.11', tox: coverage}
+          - {python: '3.11', tox: install}
 
     steps:
     - uses: actions/checkout@v3

diff --git a/setools/diff/difference.py b/setools/diff/difference.py
@@ -137,8 +137,9 @@ class Wrapper(ABC, Generic[T]):
 
     __slots__ = ("origin", "key")
 
-    def __init__(self, symbol: T) -> None:
-        pass
+    def __init__(self, origin: T, key: int) -> None:
+        self.origin = origin
+        self.key = key
 
     def __repr__(self):
         # pylint: disable=no-member
@@ -176,9 +177,8 @@ class SymbolWrapper(Wrapper[S]):
     __slots__ = ("name",)
 
     def __init__(self, symbol: S) -> None:
-        self.origin = symbol
-        self.name = str(symbol)
-        self.key = hash(self.name)
+        super().__init__(symbol, hash(symbol.name))
+        self.name = symbol.name
 
     def __hash__(self):
         return self.key

diff --git a/setoolsgui/apol/defaultquery.py b/setoolsgui/apol/defaultquery.py
@@ -166,7 +166,8 @@ def run(self, button):
         self.query.default = self.default_value.currentData(Qt.ItemDataRole.UserRole)
 
         if self.default_range_value.isEnabled():
-            self.query.default_range = self.default_range_value.currentData(Qt.ItemDataRole.UserRole)
+            self.query.default_range = self.default_range_value.currentData(
+                Qt.ItemDataRole.UserRole)
         else:
             self.query.default_range = None
 

diff --git a/setoolsgui/tableview.py b/setoolsgui/tableview.py
@@ -76,7 +76,9 @@ def save_csv(self, filename):
             # write headers
             csv_row = []
             for col in range(col_count):
-                csv_row.append(datamodel.headerData(col, Qt.Orientation.Horizontal, Qt.ItemDataRole.DisplayRole))
+                csv_row.append(datamodel.headerData(col,
+                                                    Qt.Orientation.Horizontal,
+                                                    Qt.ItemDataRole.DisplayRole))
 
             writer.writerow(csv_row)