Merge pull request #186 from luketainton/next

Release 2024-04-21.2

.github/dependabot.yml

@@ -6,8 +6,8 @@ updates:
       interval: "daily"
     assignees:
       - "luketainton"
-    # reviewers:
+    reviewers:
-      # - "luketainton"
+      - "luketainton"
     commit-message:
       prefix: "chore(actions)"
       include: "scope"
@@ -20,8 +20,8 @@ updates:
       interval: "daily"
     assignees:
       - "luketainton"
-    # reviewers:
+    reviewers:
-      # - "luketainton"
+      - "luketainton"
     commit-message:
       prefix: "chore(docker)"
       include: "scope"
@@ -34,8 +34,8 @@ updates:
       interval: "daily"
     assignees:
       - "luketainton"
-    # reviewers:
+    reviewers:
-      # - "luketainton"
+      - "luketainton"
     commit-message:
       prefix: "chore(pip-prod)"
       prefix-development: "chore(pip-dev)"

.github/workflows/ci.yml

@@ -11,8 +11,14 @@ on:
       - ".github/dependabot.yml"
 
 jobs:
-  ci:
+  pythonci:
-    uses: luketainton/gha-workflows/.github/workflows/ci-python-with-docker.yml@main
+    uses: luketainton/gha-workflows/.github/workflows/ci-python.yml@main
+    secrets:
+      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+      SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
+  
+  dockerci:
+    uses: luketainton/gha-workflows/.github/workflows/ci-docker.yml@main
     secrets:
       SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
       SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}

.github/workflows/release.yml

@@ -3,10 +3,6 @@ on:
   push:
     branches: [main]
 
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
-
 jobs:
   release:
     name: Release
@@ -27,29 +23,25 @@ jobs:
           tag: ${{ steps.tag_version.outputs.new_tag }}
           name: ${{ steps.tag_version.outputs.new_tag }}
           body: ${{ steps.tag_version.outputs.changelog }}
-          generateReleaseNotes: true
 
   publish:
     name: GitHub Container Registry
     runs-on: ubuntu-latest
     needs: release
-    permissions:
-      contents: read
-      packages: write
     steps:
       - uses: actions/checkout@v4
       - name: Login to GitHub Container Registry
-        run: echo ${{ secrets.GITHUB_TOKEN }} | docker login ${{ env.REGISTRY }} -u ${{ github.actor }} --password-stdin
+        run: echo ${{ secrets.GHCR_ACCESS_TOKEN }} | docker login ghcr.io -u luketainton --password-stdin
       - name: Build image for GitHub Package Registry
         run: |
           docker build . --file Dockerfile \
           --build-arg "version=${{ needs.release.outputs.new_tag }}" \
-          --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ needs.release.outputs.new_tag }} \
+          --tag ghcr.io/luketainton/roboluke-tasks:${{ needs.release.outputs.new_tag }} \
-          --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+          --tag ghcr.io/luketainton/roboluke-tasks:latest
       - name: Push image to GitHub Package Registry
         run: |
-          docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+          docker push ghcr.io/luketainton/roboluke-tasks:latest
-          docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ needs.release.outputs.new_tag }}
+          docker push ghcr.io/luketainton/roboluke-tasks:${{ needs.release.outputs.new_tag }}
 
   deploy:
     name: Update Portainer Deployment

requirements.txt

@@ -1,29 +1,29 @@
 appdirs==1.4.4
-astroid==3.2.2
+astroid==3.1.0
 attrs==23.2.0
-autopep8==2.2.0
+autopep8==2.1.0
 backoff==2.2.1
-certifi==2024.6.2
+certifi==2024.2.2
 cfgv==3.4.0
 charset-normalizer==3.3.2
 click==8.1.7
 coloredlogs==15.0.1
 dill==0.3.8
 distlib==0.3.8
-filelock==3.14.0
+filelock==3.13.4
 future==1.0.0
 humanfriendly==10.0
-identify==2.5.36
+identify==2.5.35
 idna==3.7
 iniconfig==2.0.0
 lazy-object-proxy==1.10.0
 mccabe==0.7.0
 mypy-extensions==1.0.0
-nodeenv==1.9.0
+nodeenv==1.8.0
 packaging==24.0
 pathspec==0.12.1
-platformdirs==4.2.2
+platformdirs==4.2.0
-pluggy==1.5.0
+pluggy==1.4.0
 py==1.11.0
 pycodestyle==2.11.1
 PyJWT==2.8.0
@@ -31,17 +31,17 @@ pyparsing==3.1.2
 python-dateutil==2.9.0.post0
 python-dotenv==1.0.1
 PyYAML==6.0.1
-requests==2.32.3
+requests==2.31.0
 requests-toolbelt==1.0.0
-sentry-sdk==2.4.0
+sentry-sdk==1.45.0
 six==1.16.0
 toml==0.10.2
 tomli==2.0.1
-tomlkit==0.12.5
+tomlkit==0.12.4
 urllib3==2.2.1
-virtualenv==20.26.2
+virtualenv==20.25.3
-webex-bot==0.5.1
+webex-bot==0.4.1
 webexteamssdk==1.6.1
-websockets==11.0.3
+websockets==10.2
 wrapt==1.16.0
 xmltodict==0.13.0