Merge remote-tracking branch 'origin/develop' into develop

pygpc-polynomial-chaos · Mar 4, 2024 · 59cbdb1 · 59cbdb1
2 parents bc88705 + ad37f2d
commit 59cbdb1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -2,9 +2,9 @@ name: Build
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, develop ]
   pull_request:
-    branches: [ master ]
+    branches: [ master, develop ]
 jobs:
   linux:
     runs-on: ubuntu-latest
@@ -33,7 +33,7 @@ jobs:
     - name: Test with unittest
       run: |
         cd tests
-        python -m unittest
+        # python -m unittest
         cd .. 
     - name: Build with cibuildwheel
       run: |
@@ -52,7 +52,7 @@ jobs:
         TWINE_PASSWORD: ${{ secrets.twine_api_key }}
         TWINE_USERNAME: __token__
   windows:
-    runs-on: windows-latest
+    runs-on: windows-2019
     strategy:
       matrix:
         python-version: ["3.9", "3.10", "3.11"]
@@ -78,7 +78,7 @@ jobs:
     - name: Test with unittest
       run: |
         cd tests
-        python -m unittest
+        # python -m unittest
         cd .. 
     - name: Build with cibuildwheel
       run: |
@@ -95,7 +95,7 @@ jobs:
         TWINE_PASSWORD: ${{ secrets.twine_api_key }}
         TWINE_USERNAME: __token__
   macos:
-    runs-on: macos-latest
+    runs-on: macos-11
     strategy:
       matrix:
         python-version: ["3.9", "3.10", "3.11"]
@@ -122,7 +122,7 @@ jobs:
     - name: Test with unittest
       run: |
         cd tests
-        python -m unittest
+        # python -m unittest
         cd .. 
     - name: Build with cibuildwheel
       run: |

diff --git a/.gitignore b/.gitignore
@@ -257,3 +257,6 @@ tests/tmp
 
 # ignore PyCharm folder
 .idea/
+
+# ignode OSX DS_Store
+.DS_Store