Feature/gitflow (#3900)

OpenBB-finance · Jan 9, 2023 · 2a0c0c0 · 2a0c0c0
1 parent 54188fd
commit 2a0c0c0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -5,6 +5,7 @@ env:
   OPENBB_USE_ION: false
   OPENBB_USE_PROMPT_TOOLKIT: false
   PIP_DEFAULT_TIMEOUT: 100
+
 on: [workflow_dispatch]
 
 jobs:

diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -13,6 +13,10 @@ on:
       - develop
       - main
     types: [opened, synchronize]
+  push:
+    branches:
+      - develop
+      - main
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -97,7 +101,7 @@ jobs:
     name: Vanilla Python Tests - ${{ matrix.python-version }}
     needs: [python-changes, base-test]
     runs-on: ${{ matrix.os }}
-    if: needs.python-changes.outputs.python-changes == 'true' && github.event.pull_request.base.ref == 'develop'
+    if: needs.python-changes.outputs.python-changes == 'true' && github.event.pull_request.base.ref == 'develop' && github.event.pull_request.merged != true
     strategy:
       fail-fast: true
       matrix:

diff --git a/tests/test_helpers.py b/tests/test_helpers.py
@@ -8,4 +8,4 @@ def no_dfs(args: list, kwargs: dict) -> bool:
     for item in kwargs.values():
         if isinstance(item, pd.DataFrame):
             return False
-    return True
+    return True