Unpin deps (#187)

* unpin deps * unpin deps, fix confu circular import * container to py3.11 * update tools / CI * update pytest command * don't fail on codecov fail * add codecov key * add py3.12 * lock to new pluginmgr * update pytest-filedata * poetry lock * prep v1.5.4
20c · Apr 29, 2024 · 7db7d0a · 7db7d0a
1 parent 122869b
commit 7db7d0a
Show file tree

Hide file tree

Showing 11 changed files with 955 additions and 923 deletions.
diff --git a/.github/workflows/ci.yml b/.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

diff --git a/.github/workflows/release.yaml b/.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

diff --git a/.github/workflows/tests.yml b/.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
@@ -20,35 +20,32 @@ jobs:
       fail-fast: false
       matrix:
         os: [ "ubuntu-latest" ]
-        python-version: [ "3.8", "3.9", "3.10", "3.11" ]
+        python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12" ]
     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
-
+          fail_ci_if_error: false
+          token: ${{ secrets.CODECOV_TOKEN }}
 
   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/
diff --git a/.pre-commit-config.yaml b/.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
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,16 @@
 ## Unreleased
 
 
+## 1.5.4
+### Added
+- py3.11 support
+- py3.12 support
+### Fixed
+- new confu circular import
+### Removed
+- py3.7 support
+
+
 ## 1.5.3
 ### Fixed
 - pin Flask to < 2.2 until compatibility isuses are resolved

diff --git a/CHANGELOG.yaml b/CHANGELOG.yaml
@@ -1,12 +1,18 @@
 Unreleased:
-  added:
-  - py3.11 support
+  added: []
   fixed: []
   changed: []
   deprecated: []
+  removed: []
+  security: []
+1.5.4:
+  added:
+  - py3.11 support
+  - py3.12 support
+  fixed:
+  - new confu circular import
   removed:
   - py3.7 support
-  security: []
 1.5.3:
   fixed:
   - pin Flask to < 2.2 until compatibility isuses are resolved

diff --git a/Dockerfile b/Dockerfile
@@ -13,15 +13,17 @@ ARG build_packages="\
     rrdtool-dev \
     "
 
-ARG runtime_packages="fping librrd \
+ARG runtime_packages="\
+    fping \
+    librrd \
     zeromq \
     "
 # vaping extras to be installed
 ARG vaping_extras=all
 
 ARG poetry_pin=">=1,<=2"
 
-FROM python:3.9-alpine as base
+FROM python:3.11-alpine as base
 
 ARG runtime_packages
 ARG virtual_env=/venv