Merge branch 'main' into temp

Author: dd-jy

.github/workflows/pull-request.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       matrix:
         python-version: [3.8, 3.11]
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
@@ -32,6 +32,27 @@ jobs:
     - name: Run Tox
       run: |
         tox -e release
+  build_macos:
+    strategy:
+      matrix:
+        python-version: [3.8, 3.11]
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        brew install openssl
+        brew install libmagic
+        brew install postgresql
+        python -m pip install --upgrade pip
+        pip install tox
+    - name: Run Tox
+      run: |
+        tox -e release
 
   reuse:
     runs-on: ubuntu-latest

requirements.txt

@@ -1,9 +1,11 @@
 pyparsing
-scancode-toolkit>=32.2.0
 scanoss
 XlsxWriter
-fosslight_util>=2.1.0
+fosslight_util>=2.1.1
 PyYAML
 wheel>=0.38.1
 intbitset
 fosslight_binary>=5.0.0
+scancode-toolkit==32.0.*;sys_platform=="darwin"
+scancode-toolkit==32.2.*;sys_platform!="darwin"
+psycopg2-binary==2.9.9

tests/test_tox.py

@@ -39,8 +39,8 @@ def test_run():
 
 
 def test_help_command():
-    success, _ = run_command("fosslight_source -h")
-    assert success is True, "Test Release: Help command failed "
+    success, msg = run_command("fosslight_source -h")
+    assert success is True, f"Test Release: Help command failed :{msg}"
 
 
 def test_scan_command():