Update the freebsd_sysctl and jail dependencies

.github/workflows/ci.yml

@@ -17,10 +17,8 @@ jobs:
           python-version: "3.13"
       - name: Install toolchain
         run: |
-          pip install setuptools wheel
           pip install -r requirements-dev.txt
-          pip install gitpython freebsd_sysctl==0.0.7
-          pip install --no-build-isolation jail==0.0.12
+          pip install -r requirements.txt
       - name: Run static checks
         run: sh scripts/check.sh
 
@@ -34,10 +32,7 @@ jobs:
           python-version: "3.13"
       - name: Install dependencies
         run: |
-          pip install setuptools wheel
-          pip install -r requirements-test.txt
-          pip install gitpython freebsd_sysctl==0.0.7
-          pip install --no-build-isolation jail==0.0.12
+          pip install -r requirements.txt -r requirements-test.txt
       - name: Run the platform-independent tests
         run: pytest --cov=libioc --cov-report=term
 
@@ -76,6 +71,6 @@ jobs:
         uses: gronke/freebsd-ci/.github/actions/run@main
         with:
           run: |
-            /root/venv/bin/pip install -q --no-build-isolation -r requirements.txt -r requirements-test.txt
-            /root/venv/bin/pip install -q --no-build-isolation -e .
+            /root/venv/bin/pip install -q -r requirements.txt -r requirements-test.txt
+            /root/venv/bin/pip install -q -e .
             /root/venv/bin/pytest tests --zpool ioc-test

libioc/JailParams.py

@@ -160,8 +160,11 @@ def __update_sysctl_jail_params(self) -> None:
             self.__base_class(prefix).children
         )
         # permanently store the queried sysctl in the singleton class
+        # cast for mypy: Sysctl.children constructs type(self), so the
+        # items are JailParam instances at runtime while the upstream
+        # annotation stays with the base class
         JailParams.__sysctl_params = dict([
-            (x.name.rstrip("."), x,)
+            (x.name.rstrip("."), typing.cast(JailParam, x),)
             for x in jail_params
         ])
 

requirements.txt

@@ -1,3 +1,3 @@
 gitpython
-freebsd_sysctl==0.0.7
-jail==0.0.12
+freebsd_sysctl @ git+https://github.com/gronke/py-freebsd_sysctl.git@92f6cf5dd4cab3a9b7e4ef04c4ca0dbeec74e181
+jail @ git+https://github.com/gronke/py-jail.git@8f935ed34e447216599e4f8964c64c89c708ad40

tools/vm/50-run-tests.sh

@@ -29,8 +29,8 @@ rsync -a --delete \
     "${REPO_DIR}/" root@127.0.0.1:/root/libioc/
 
 echo "Installing libioc into the guest venv."
-run_guest 'cd /root/libioc && /root/venv/bin/pip install -q --no-build-isolation -r requirements.txt -r requirements-test.txt'
-run_guest 'cd /root/libioc && /root/venv/bin/pip install -q --no-build-isolation -e .'
+run_guest 'cd /root/libioc && /root/venv/bin/pip install -q -r requirements.txt -r requirements-test.txt'
+run_guest 'cd /root/libioc && /root/venv/bin/pip install -q -e .'
 
 case "${TIER}" in
     tier0)