Merge pull request #216 from unthreaded/feature/upgrade-python

NOGH: Upgrade python and a number of dependencies

Author: lcombs15

.github/workflows/actionlint.yml

@@ -8,12 +8,14 @@ on:
 # https://github.com/rhysd/actionlint/blob/main/README.md
 
 jobs:
-  lint:
+  actionlint:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Install actionlint
+      - uses: actions/checkout@v4
+      - name: Download actionlint
+        id: get_actionlint
         run: bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash)
-      - name: run
-        run: ./actionlint
+        shell: bash
+      - name: Check workflow files
+        run: ${{ steps.get_actionlint.outputs.executable }} -color
+        shell: bash

.github/workflows/build.yml

@@ -16,14 +16,14 @@ jobs:
       fail-fast: false
       matrix:
         # We want the oldest possible version of MacOS for backwards compatibility 
-        os: [ubuntu-latest, macos-11, windows-latest]
+        os: [ubuntu-latest, macos-13, windows-latest]
 
     steps:
-    - uses: actions/checkout@v1
-    - name: Set up Python 3.7
-      uses: actions/setup-python@v1
+    - uses: actions/checkout@v5
+    - name: Set up Python
+      uses: actions/setup-python@v5
       with:
-        python-version: 3.7
+        python-version: 3.13
     - name: Install dependencies
       run: |
         python scripts/os_specific_requirements.py
@@ -45,8 +45,8 @@ jobs:
         python scripts/package.py
     - uses: actions/upload-artifact@master
       with:
-        name: githooks
-        path: dist/
+        name: ${{ runner.os }}
+        path: ./dist/*
     - name: Integration
       run: |
         pytest src/integration

.github/workflows/tag.yml

@@ -2,7 +2,7 @@ name: Tag
 
 on:
   pull_request:
-    types: closed
+    types: [closed]
 
 jobs:
   build:

requirements.txt

@@ -1,5 +1,5 @@
-PyInstaller==5.13.2
-pytest==7.4.4
-pylint==2.17.6
+PyInstaller==6.15.0
+pytest==8.4.1
+pylint==3.3.8
 codecov==2.1.13
-pytest-cov==4.1.0
+pytest-cov==6.2.1

scripts/package.py

@@ -20,7 +20,7 @@
         OS_ALIAS = "mac"
 
     EXE_NAME: str = "commit-msg"
-    EXE_FILE_FOLDER = os.path.join('dist', OS_ALIAS)
+    EXE_FILE_FOLDER = 'dist'
 
     # Hidden import mends PyInstaller moduleNotFound errors
     PyInstaller.__main__.run([

src/integration/test_integration.py

@@ -23,7 +23,7 @@ class TestIntegration(unittest.TestCase):
 
     def setUp(self):
         # Dist should only have one other folder in it - grab that one
-        self.abs_dist_path = os.path.join('dist', os.listdir('dist')[0])
+        self.abs_dist_path = 'dist'
 
         # Convert relative path to absolute
         self.abs_dist_path = os.path.abspath(self.abs_dist_path)