update tools / CI

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Install virtualenv from poetry
         uses: 20c/workflows/poetry@v1
       - name: deploy mkdocs gh-pages site

.github/workflows/release.yaml

@@ -25,18 +25,18 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Log in to the Container registry
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
@@ -47,7 +47,7 @@ jobs:
             type=sha
 
       - name: Build and push container image
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v5
         with:
           context: .
           push: true

.github/workflows/tests.yml

@@ -7,7 +7,7 @@ jobs:
   linting:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install virtualenv from poetry
         uses: 20c/workflows/poetry@v1
       - name: Run linters
@@ -24,31 +24,27 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Check out repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install requirements
         run: sudo apt-get install rrdtool librrd-dev fping traceroute
       - name: Install virtualenv from poetry
-        uses: grizz/workflows/poetry@v1
+        uses: 20c/workflows/poetry@v1
         with:
           python-version: ${{ matrix.python-version }}
           install-options: -Eall
       - name: Run tests
-        run: |
-          poetry run pytest -vv --cov-report=term-missing --cov=${{ github.event.repository.name }} --cov-report=xml tests/
-          poetry run coverage report
+        run: poetry run tox -e py
       # upload coverage stats
       - name: Upload coverage
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v3
         with:
-          file: ./coverage.xml
           fail_ci_if_error: true
 
-
   test_container:
     needs: test
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: run tests against tester
         run: ./Ctl/ci/run.sh vaping pytest -vv tests/

.pre-commit-config.yaml

@@ -5,37 +5,25 @@ exclude: |
     )$
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.6.0
     hooks:
       - id: check-toml
       - id: check-yaml
       - id: trailing-whitespace
-  - repo: local
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    # Ruff version.
+    rev: v0.1.14
     hooks:
-      - id: system
-        name: isort
-        entry: poetry run isort .
-        language: system
-        pass_filenames: false
+      # Run the linter.
+      - id: ruff
+        args: [--fix]
+      # Run the formatter.
+      - id: ruff-format
   - repo: local
     hooks:
-    -   id: pyupgrade
+      - id: pyupgrade
         name: pyupgrade
-        entry: poetry run pyupgrade --py36-plus
+        entry: poetry run pyupgrade --py38-plus
         language: python
         types: [python]
-        pass_filenames: true
-  - repo: local
-    hooks:
-      - id: system
-        name: Black
-        entry: poetry run black .
-        language: system
-        pass_filenames: false
-  - repo: local
-    hooks:
-      - id: system
-        name: flake8
-        entry: poetry run flake8 .
-        language: system
-        pass_filenames: false
+        pass_filenames: true

pyproject.toml

@@ -34,6 +34,7 @@ python = "^3.8"
 pid = ">=3"
 pluginmgr = ">=1"
 python-daemon = ">=2"
+# Package docutils (0.21.post1) not found.
 docutils = "<=0.21"
 munge = { extras = ["tomlkit", "yaml"], version = ">=1.2.0" }
 confu = ">=1.7.1"
@@ -72,12 +73,10 @@ pytest-filedata = "^0.4.0"
 tox = ">=3.20.1"
 
 # linting
-black = ">=20"
-isort = ">=5.7.0"
-flake8 = ">=3.8.4"
+ruff = ">=0.1"
+mypy = ">=0.950"
 pre-commit = ">=2.13"
-pyupgrade = ">=2.19.4"
-mypy = ">=0.812"
+pyupgrade = ">=2.19"
 
 # ctl
 ctl = ">=1"