Merging latest changes and updating Windows/Mac actions

.github/workflows/intel_macos_build.yml

@@ -65,7 +65,7 @@ jobs:
       # This is basically the same as build4mac.sh
       - name: Build Bundle
         run: |
-          pyinstaller build/pyinstaller/terminal.spec --clean
+          python -m PyInstaller build/pyinstaller/terminal.spec --clean
           osascript build/pyinstaller/setup_icons.applescript
           mkdir DMG
           cp -r build/pyinstaller/macOS_package_assets/* DMG/

.github/workflows/m1_macos_build.yml

@@ -71,7 +71,7 @@ jobs:
       # This is basically the same as build4mac.sh
       - name: Build Bundle
         run: |
-          pyinstaller build/pyinstaller/terminal.spec --clean
+          python -m PyInstaller build/pyinstaller/terminal.spec --clean
           osascript build/pyinstaller/setup_icons.applescript
           mkdir DMG
           cp -r build/pyinstaller/macOS_package_assets/* DMG/

.github/workflows/windows10_build.yml

@@ -16,42 +16,64 @@ concurrency:
 
 jobs:
   Windows-Build:
-    name: Windows10 Build
-    runs-on: [self-hosted, Windows, x64]
+    name: Windows10 Build ENV
+    runs-on: windows-latest
     # Configuring -------------
     steps:
       - name: Setup Windows Git Configuration # This is under the assumption that git is already installed on the system
         run: |
           Set-ItemProperty 'HKLM:\System\CurrentControlSet\Control\FileSystem' -Name 'LongPathsEnabled' -value 1
           git config --system core.longpaths true
+
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Activate Base & Create OpenBB Environment
+
+      - name: Set up Python & Create OpenBB Environment
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.9'
+
+      - name: Create and start virtual environment
         run: |
-          conda activate base
-          conda env remove -n obb
-          conda env create -n obb --file build/conda/conda-3-9-windows.yaml
-          conda init
-          conda activate obb
-          conda env list
-          python -m poetry --version
-      - name: Requirements Install
-        # Conda activate needs to be run every time because of the way that the workflow steps work
-        # on powershell where it creates a new shell every time for every step
-        run: |
-          conda activate obb
+          python -m venv venv
+          source venv/Scripts/activate
+          python -m pip install --upgrade pip
+          python -m pip install setuptools==64.0.2 wheel
+          python -m pip install charset_normalizer==2.1.1
           python -m pip install -r requirements-win.txt
-      - name: Install Specific Papermill
-        run: |
-          conda activate obb
           python -m pip uninstall papermill -y
           python -m pip install git+https://github.com/nteract/papermill.git@main
-      # Building ------------
-      - name: Build Terminal.spec file
-        run: |
-          conda activate obb
-          python -m pip list
           python -m PyInstaller build/pyinstaller/terminal.spec --clean
+
+        shell: bash
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: OpenBB-Windows10-ENV
+          path: dist
+
+
+  Build-Exe:
+    name: Windows10 Build-Exe
+    runs-on: [self-hosted, Windows, x64]
+    needs: Windows-Build
+    # Configuring -------------
+    steps:
+      - name: Setup Windows Git Configuration # This is under the assumption that git is already installed on the system
+        run: |
+          Set-ItemProperty 'HKLM:\System\CurrentControlSet\Control\FileSystem' -Name 'LongPathsEnabled' -value 1
+          git config --system core.longpaths true
+
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Download Artifact
+        uses: actions/download-artifact@v2
+        with:
+          name: OpenBB-Windows10-ENV
+          path: dist
+
       - name: Move Files into App Folder
         run: cp -r .\dist\OpenBBTerminal\ .\build\nsis\app\
       # don't need this because log collection is turned off
@@ -59,16 +81,18 @@ jobs:
       #   run: Remove-Item .\build\nsis\app\openbb_terminal\logs\ -Recurse
       - name: Build Exe File
         run: |
-          conda activate obb
           C:\'.\Program Files (x86)\'\nsis\makensis.exe .\build\nsis\setup.nsi
+
       - name: Save Build Artifact
         uses: actions/upload-artifact@v3
         with:
           name: Windows EXE Artifact
           path: '.\build\nsis\OpenBB Terminal Setup.exe'
-      # - name: Run Integration Tests
-      #   run: |
-      #     dist\OpenBBTerminal\OpenBBTerminal.exe -t
+
+      - name: Run Integration Tests
+        run: |
+          dist\OpenBBTerminal\OpenBBTerminal.exe -t
+
       # Cleaning ------------------------
       # Make sure to add Remove-Item C:\Users\Administrator\Desktop\OPENBB-exports -Recurse whenever integration tests get fixed
       - name: Remove Previous Build
@@ -76,10 +100,3 @@ jobs:
           Remove-Item '.\build\nsis\OpenBB Terminal Setup.exe' -Recurse
           Remove-Item .\build\nsis\app\ -Recurse
           Remove-Item .\dist\ -Recurse
-          Remove-Item .\build\terminal\ -Recurse
-      - name: Deactivate & Remove Conda Environment
-        run: |
-          conda deactivate obb
-          conda deactivate base
-          conda env remove -n obb
-          Remove-Item C:\Users\Administrator\miniconda3\envs\obb\ -Recurse