Merge branch 'Taxel:main' into main

.github/workflows/automerge.yml

@@ -0,0 +1,24 @@
+on:
+  workflow_call:
+    secrets:
+      github-token:
+        required: true
+
+jobs:
+  # https://github.com/fastify/github-action-merge-dependabot
+  automerge:
+    name: Dependabot auto-merge
+    runs-on: ubuntu-20.04
+    if: ${{ github.actor == 'dependabot[bot]' && github.event_name == 'pull_request' }}
+
+    permissions:
+      pull-requests: write
+      contents: write
+
+    steps:
+      - uses: fastify/[email protected]
+        with:
+          target: minor
+          github-token: ${{ secrets.github-token }}
+
+# vim:ft=yaml:et:ts=2:sw=2

.github/workflows/ci.yml

@@ -0,0 +1,29 @@
+name: "CI"
+
+on:
+  push:
+    branches:
+      - main
+    tags:
+      - "*.*.*"
+  pull_request:
+
+jobs:
+  docker:
+    uses: ./.github/workflows/docker-image.yml
+    secrets:
+      github-token: ${{ secrets.GITHUB_TOKEN }}
+
+  test:
+    uses: ./.github/workflows/test.yml
+    if: ${{ github.event_name == 'pull_request' }}
+
+  automerge:
+    uses: ./.github/workflows/automerge.yml
+    needs:
+      - docker
+      - test
+    secrets:
+      github-token: ${{ secrets.GITHUB_TOKEN }}
+
+# vim:ft=yaml:et:ts=2:sw=2

.github/workflows/docker-image.yml

@@ -6,20 +6,18 @@
 name: Publish Docker image
 
 on:
-  push:
-    branches:
-      - main
-    tags:
-      - "*.*.*"
-  pull_request:
+  workflow_call:
+    secrets:
+      github-token:
+        required: true
 
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
   TEST_IMAGE: plextraktsync:ci-test
 
 jobs:
-  build-and-push-image:
+  docker:
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -51,7 +49,7 @@ jobs:
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          password: ${{ secrets.github-token }}
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta

.github/workflows/test.yml

@@ -1,15 +1,14 @@
 name: Test
 
 on:
-  - pull_request
+  workflow_call:
 
 env:
   DEFAULT_PYTHON: 3.8
 
 jobs:
   test:
     runs-on: ubuntu-latest
-    name: Test
     steps:
       - name: Check out source repository
         uses: actions/checkout@v4

Pipfile

@@ -15,13 +15,13 @@ click = "==8.1.7"
 decorator = "==5.1.1"
 deprecated = "==1.2.14"
 humanize = "==4.10.0"
-idna = {version="==3.8", python_version=">='3.5'"}
+idna = {version="==3.10", python_version=">='3.5'"}
 inquirerpy = "==0.3.4"
 markdown-it-py = {version="==3.0.0", python_version=">='3.7'"}
 mdurl = {version="==0.1.2", python_version=">='3.7'"}
 oauthlib = "==3.2.2"
 pfzy = {version="==0.3.4", markers="python_version >= '3.7' and python_version < '4.0'"}
-platformdirs = {version="==4.3.2", python_version=">='3.7'"}
+platformdirs = {version="==4.3.3", python_version=">='3.7'"}
 plexapi = "==4.15.16"
 pluggy = "==1.5.0"
 prompt-toolkit = "==3.0.47"

requirements.txt

@@ -9,13 +9,13 @@ decorator==5.1.1
 deprecated==1.2.14
 exceptiongroup==1.2.2; python_version >= '3.7'
 humanize==4.10.0; python_version >= '3.8'
-idna==3.8; python_version >= '3.6'
+idna==3.10; python_version >= '3.6'
 inquirerpy==0.3.4
 markdown-it-py==3.0.0; python_version >= '3.7' and python_version >= '3.8'
 mdurl==0.1.2; python_version >= '3.7'
 oauthlib==3.2.2
 pfzy==0.3.4; python_version >= '3.7' and python_version < '4.0'
-platformdirs==4.3.2; python_version >= '3.8'
+platformdirs==4.3.3; python_version >= '3.8'
 plexapi==4.15.16; python_version >= '3.8'
 pluggy==1.5.0
 prompt-toolkit==3.0.47; python_full_version >= '3.7.0'