Skip to content

Commit e9422ff

Browse files
authored
Merge pull request #161 from pebenito/force-pyqt6
pyproject.toml: Set pytest to explicitly use PyQt6.
2 parents e51eeae + c303481 commit e9422ff

3 files changed

Lines changed: 16 additions & 23 deletions

File tree

.github/workflows/tests.yml

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,25 +26,32 @@ jobs:
2626
fail-fast: false
2727

2828
matrix:
29-
build-opts:
30-
- {python: '3.10', tox: python3}
31-
- {python: '3.11', tox: python3}
32-
- {python: '3.12', tox: python3}
33-
- {python: '3.13', tox: python3}
29+
# unit tests
30+
python:
31+
- "3.10"
32+
- "3.11"
33+
- "3.12"
34+
- "3.13"
35+
- "3.14"
36+
tox:
37+
- "python3"
38+
include:
39+
# static analysis
3440
- {python: '3.11', tox: pep8}
3541
- {python: '3.11', tox: lint}
3642
- {python: '3.11', tox: mypy}
3743
- {python: '3.11', tox: coverage}
44+
# install test
3845
- {python: '3.11', tox: install}
3946

4047
steps:
4148
- uses: actions/checkout@v3
4249

4350
# This should be the minimum required Python version to build refpolicy.
44-
- name: Set up Python ${{ matrix.build-opts.python }}
51+
- name: Set up Python ${{ matrix.python }}
4552
uses: actions/setup-python@v6
4653
with:
47-
python-version: ${{ matrix.build-opts.python }}
54+
python-version: ${{ matrix.python }}
4855

4956
- name: Install dependencies
5057
run: |
@@ -90,6 +97,6 @@ jobs:
9097
run: |
9198
# confirm python version
9299
python --version
93-
python -m tox -e ${{ matrix.build-opts.tox }}
100+
python -m tox -e ${{ matrix.tox }}
94101
env:
95102
LD_LIBRARY_PATH: "${{env.SEPOL_SRC}}/src:${{env.SELINUX_SRC}}/src:${LD_LIBRARY_PATH}"

README.md

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -76,17 +76,6 @@ and perform the following at the root:
7676
This will compile the C portion of SETools locally, and then
7777
the tools can be ran from the current directory (e.g. `./seinfo`).
7878

79-
### Rebuilding the Apol Help File
80-
81-
For convenience, a prebuilt copy of the apol help data file is included.
82-
To rebuild this file, the Qt5 development tools are required
83-
(particularly, the `qcollectiongenerator` tool). At the root
84-
of the SETools sources, perform the following:
85-
86-
```bash
87-
$ python setup.py build_qhc
88-
```
89-
9079
### Installing SETools
9180

9281
Unpack the official distribution or check out the git repository,

pyproject.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -199,10 +199,6 @@ persistent = true
199199
# Discover python modules and packages in the file system subtree.
200200
# recursive =
201201

202-
# When enabled, pylint would attempt to guess common misconfiguration and emit
203-
# user-friendly hints instead of false-positive error messages.
204-
suggestion-mode = true
205-
206202
# Allow loading of arbitrary C extensions. Extensions are imported into the
207203
# active Python interpreter and may run arbitrary code.
208204
# unsafe-load-any-extension =
@@ -650,6 +646,7 @@ redefining-builtins-modules = ["six.moves", "past.builtins", "future.builtins",
650646
[tool.pytest.ini_options]
651647
addopts = ["--import-mode=importlib",]
652648
pythonpath = "."
649+
qt_api = "pyqt6"
653650
markers = [
654651
"obj_args"
655652
]

0 commit comments

Comments
 (0)