Rebase from main

Author: machawk1

.github/workflows/build.yml

@@ -5,11 +5,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-latest, macos-12, macos-13]
+        os: [macos-latest, macos-13]
         include:
           - os: macos-latest
           - os: macos-13
-          - os: macos-12
     steps:
     - uses: actions/checkout@v4
       with:

bundledApps/HeritrixJob.py

@@ -9,7 +9,7 @@
 
 
 class HeritrixJob:
-    def write(self):
+    def write(self) -> None:
         self.job_number = str(int(time.time()))
         path = self.job_path + self.job_number
         if not os.path.exists(path):
@@ -23,7 +23,7 @@ def write(self):
             f.write(self.sampleXML)
             # print beans_file_path+"crawler-beans.cxml"
 
-    def launch_heritrix_job(self):
+    def launch_heritrix_job(self) -> None:
         logging.basicConfig(level=logging.DEBUG)
         print('Launching Heritrix job')
         data = {"action": "launch"}
@@ -36,7 +36,7 @@ def launch_heritrix_job(self):
                 config.heritrix_credentials_password),
             data=data, headers=headers, verify=False, stream=True)
 
-    def build_heritrix_job(self):
+    def build_heritrix_job(self) -> None:
         logging.basicConfig(level=logging.DEBUG)
         print('Building Heritrix job')
         data = {"action": "build"}
@@ -49,7 +49,7 @@ def build_heritrix_job(self):
                           data=data, headers=headers,
                           verify=False, stream=True)
 
-    def __init__(self, h_job_path, uris, depth=1):
+    def __init__(self, h_job_path : str, uris : list, depth : int = 1) -> None:
         self.job_path = h_job_path
         self.sampleXML = '''<?xml version="1.0" encoding="UTF-8"?>
 <!--