Merge branch 'main' into pyup-update-colorama-0.4.4-to-0.4.6

Author: furlongm

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: furlongm
+patreon: furlongm

.github/workflows/codeql-analysis.yml

@@ -2,19 +2,19 @@ name: "Code Scanning - Action"
 
 on:
   push:
-    branches: [master]
+    branches: [main]
   pull_request:
-    branches: [master]
+    branches: [main]
 
 jobs:
   CodeQL-Build:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
+        uses: github/codeql-action/init@v3
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v1
+        uses: github/codeql-action/autobuild@v3
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1
+        uses: github/codeql-action/analyze@v3

.github/workflows/create-release-and-upload-assets.yml

@@ -8,10 +8,10 @@ jobs:
   create-release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          ref: master
+          ref: main
       - name: git fetch --all
         run: |
           git fetch --all
@@ -29,18 +29,18 @@ jobs:
         run: |
           echo "${{ steps.create_release.outputs.upload_url }}" > upload_url.txt
       - name: Upload upload_url artifact
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: upload_url.txt
           path: upload_url.txt
   update-version-and-changelog:
     needs: create-release
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          ref: master
+          ref: main
       - name: git fetch --all
         run: |
           git fetch --all
@@ -50,6 +50,7 @@ jobs:
           git config user.name 'Marcus Furlong'
       - name: Install dependencies
         run: |
+          sudo apt update
           sudo apt -y install python3-setuptools debhelper dh-exec dh-python git-buildpackage
       - name: Update repo version if required
         env:
@@ -61,21 +62,22 @@ jobs:
           echo "${{ github.ref }}" | cut -dv -f2 > VERSION.txt
           git add VERSION.txt
           git diff --quiet && git diff --staged --quiet || git commit -m "${COMMIT_MSG}"
-          git push origin master
+          git push origin main
       - name: Update debian changelog
         env:
+          EMAIL: furlongm@gmail.com
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           COMMIT_MSG: |
             auto-commit to update debian changelog
             skip-checks: true
         run: |
           gbp dch --new-version=$(cat VERSION.txt)-1 --release --distribution=stable --spawn-editor=never --commit --commit-msg="${COMMIT_MSG}"
-          git push origin master
+          git push origin main
   build-and-upload-deb-assets:
     needs: update-version-and-changelog
     runs-on: ubuntu-latest
     container:
-      image: debian:buster
+      image: debian:bookworm
     steps:
       - name: Install build dependencies
         run: |
@@ -86,19 +88,20 @@ jobs:
         run: |
           rm /bin/sh
           ln -sf /bin/bash /bin/sh
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          ref: master
+          ref: main
       - name: git fetch --all
         run: |
+          git config --global --add safe.directory /__w/patchman/patchman
           git fetch --all
       - name: Get version
         run: |
           export version=$(echo "${{ github.ref }}" | cut -dv -f2)
           echo "version=${version}" >> $GITHUB_ENV
       - name: Download upload_url artifact
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v4
         with:
           name: upload_url.txt
           path: /home/runner/work/patchman/patchman
@@ -109,6 +112,7 @@ jobs:
           echo "upload_url=${upload_url}" >> $GITHUB_ENV
       - name: Build deb packages
         env:
+          EMAIL: furlongm@gmail.com
           COMMIT_MSG: |
             auto-commit
             skip-checks: true
@@ -122,7 +126,7 @@ jobs:
           git tag v${version}
           gbp buildpackage --git-upstream-tree=${{ github.ref }} -uc -us
       - name: Upload python3-patchman deb
-        uses: actions/upload-release-asset@v1.0.1
+        uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -131,7 +135,7 @@ jobs:
           asset_path: ../${{ format('python3-patchman_{0}-1_all.deb', env.version) }}
           asset_content_type: application/vnd.debian.binary-package
       - name: Upload patchman-client deb
-        uses: actions/upload-release-asset@v1.0.1
+        uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -143,25 +147,26 @@ jobs:
     needs: update-version-and-changelog
     runs-on: ubuntu-latest
     container:
-      image: quay.io/centos/centos:stream8
+      image: quay.io/centos/centos:stream9
     steps:
       - name: Install build dependencies
         run: |
           dnf -y install epel-release
           dnf -y install rpm-build python3 python3-setuptools git
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          ref: master
+          ref: main
       - name: git fetch --all
         run: |
+          git config --global --add safe.directory /__w/patchman/patchman
           git fetch --all
       - name: Get version
         run: |
           export version=$(echo "${{ github.ref }}" | cut -dv -f2)
           echo "version=${version}" >> $GITHUB_ENV
       - name: Download upload_url artifact
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v4
         with:
           name: upload_url.txt
           path: /home/runner/work/patchman/patchman
@@ -175,7 +180,7 @@ jobs:
           python3 setup.py bdist_rpm --python=/usr/bin/python3
           rpmbuild -bb patchman-client.spec
       - name: Upload patchman rpm
-        uses: actions/upload-release-asset@v1.0.1
+        uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -184,7 +189,7 @@ jobs:
           asset_path: ${{ format('dist/patchman-{0}-1.noarch.rpm', env.version) }}
           asset_content_type: application/x-rpm
       - name: Upload patchman-client rpm
-        uses: actions/upload-release-asset@v1.0.1
+        uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -196,9 +201,9 @@ jobs:
     needs: update-version-and-changelog
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up python
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
       - name: Set version

.github/workflows/lint-and-test.yml

@@ -8,18 +8,20 @@ jobs:
   lint-and-test:
     runs-on: ubuntu-latest
     strategy:
-      max-parallel: 4
+      max-parallel: 5
       matrix:
-        python-version: [3.6, 3.7, 3.8]
+        python-version: ['3.x']
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip
+          sudo apt update
+          sudo apt -y install libxslt-dev libxml2-dev
+          python -m pip install --upgrade pip setuptools
           pip install -r requirements.txt
       - name: Lint with flake8
         run: |
@@ -29,4 +31,6 @@ jobs:
       - name: Set secret key
         run: ./sbin/patchman-set-secret-key
       - name: Test with django
-        run: ./manage.py test
+        run: |
+          pip install legacy-cgi
+          ./manage.py test

.gitignore

@@ -9,3 +9,10 @@ tmp*
 .svn
 .tox
 patchman.egg-info
+build
+dist
+run
+pyvenv.cfg
+.vscode
+.venv
+*.xml

BUILD.md

@@ -11,7 +11,7 @@ git tag v${version}
 # Build DEB package
 
 ```shell
-sudo apt -y install python-setuptools debhelper dh-exec dh-python git-buildpackage
+sudo apt -y install python3-setuptools debhelper dh-exec dh-python git-buildpackage
 gbp dch --commit
 gbp buildpackage -uc -us
 ```