modified workflows

Author: kshitij-maths

.github/workflows/ci.yml

@@ -8,32 +8,31 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-12]
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.9", "3.10", "3.11"]
 
     steps:
-    - uses: actions/checkout@v4
+      - uses: actions/checkout@v4
 
-    - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: ${{ matrix.python-version }}
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
 
-    - name: Install Python dependencies
-      run: |
-        python3 -m pip install --upgrade pip
-        python3 -m pip install numpy scipy matplotlib pytest pytest-cov
-
-    - name: Test with pytest
-      env:
-        CODACY_API_TOKEN: ${{ secrets.CODACY_API_TOKEN }}
-      run: |
-        if [ -z "$CODACY_API_TOKEN" ]
-        then
-          python3 -m pytest
-        else
-          python3 -m pytest --cov-report term --cov-report xml:cobertura.xml --cov=pygem
-          curl -s https://coverage.codacy.com/get.sh -o CodacyCoverageReporter.sh
-          chmod +x CodacyCoverageReporter.sh
-          ./CodacyCoverageReporter.sh report -r cobertura.xml  -t $CODACY_API_TOKEN
-        fi
+      - name: Install Python dependencies
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install numpy scipy matplotlib pytest pytest-cov
 
+      - name: Run tests with pytest
+        env:
+          CODACY_API_TOKEN: ${{ secrets.CODACY_API_TOKEN }}
+        run: |
+          if [ -z "$CODACY_API_TOKEN" ]
+          then
+            python -m pytest
+          else
+            python -m pytest --cov-report term --cov-report xml:cobertura.xml --cov=pygem
+            curl -s https://coverage.codacy.com/get.sh -o CodacyCoverageReporter.sh
+            chmod +x CodacyCoverageReporter.sh
+            ./CodacyCoverageReporter.sh report -r cobertura.xml -t $CODACY_API_TOKEN
+          fi

.github/workflows/testing_pr.yml

@@ -5,39 +5,39 @@ on:
     branches:
       - "master"
 
-
 jobs:
   build:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest, macos-latest, ubuntu-latest]
-        python-version: [3.7, 3.8]
-        
+        os: [windows-latest, macos-12, ubuntu-latest]
+        python-version: ["3.9", "3.10", "3.11"]
+
     steps:
-    - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
 
-    - name: Set up Python
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
+      - name: Setup Conda
+        if: matrix.os == 'macos-12' || matrix.os == 'ubuntu-latest'
+        uses: s-weigand/setup-conda@v1
+        with:
+          auto-update-conda: true
+          conda-channels: conda-forge
 
-    - name: Setup conda
-      uses: s-weigand/setup-conda@v1
-      with:
-        update-conda: true
-        python-version: ${{ matrix.python-version }}
-        conda-channels: anaconda, conda-forge
-  
-    - name: Install Python dependencies
-      run: |
-        conda install --yes pythonocc-core=7.4.0
-        python3 -m pip install --upgrade pip
-        python3 -m pip install smithers[vtk]
-        python3 -m pip install .[test]
+      - name: Install Python dependencies
+        run: |
+          if [[ "${{ matrix.os }}" == "macos-12" || "${{ matrix.os }}" == "ubuntu-latest" ]]; then
+              conda install --yes pythonocc-core=7.4.0
+          fi
+          python -m pip install --upgrade pip
+          python -m pip install smithers[vtk]
+          python -m pip install .[test]
 
-    - name: Test with pytest
-      run: |
-        python3 -m pytest
+      - name: Run tests with pytest
+        run: |
+          python -m pytest