Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change installation from pip to poetry #4731

Merged
merged 41 commits into from
Apr 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
15de34b
Change installation from pip to poetry
jmaslek Apr 10, 2023
87cdc7c
Change env name to obb
jmaslek Apr 10, 2023
2313887
Change shell for mac build
jmaslek Apr 10, 2023
bc0eb7e
Activate the env
jmaslek Apr 10, 2023
c189294
Shell again
jmaslek Apr 10, 2023
b450c0d
Shell from bash to bash -l {0}
jmaslek Apr 10, 2023
27527a6
windows poetry
andrewkenreich Apr 10, 2023
74dbf78
fix
andrewkenreich Apr 10, 2023
cdc42a6
provactive fix
andrewkenreich Apr 10, 2023
088a615
fix
andrewkenreich Apr 10, 2023
ef9bcba
venv
andrewkenreich Apr 10, 2023
7c86356
removing pathex
andrewkenreich Apr 10, 2023
48c53ac
artifact to v2.2.4
andrewkenreich Apr 11, 2023
66a1823
v3
andrewkenreich Apr 11, 2023
21bfc7e
zip and unzip test
andrewkenreich Apr 11, 2023
deda5f3
fuzz fix
andrewkenreich Apr 11, 2023
d57f3fd
numpy stupid
andrewkenreich Apr 11, 2023
ccd3683
asdf
andrewkenreich Apr 11, 2023
414b88e
cmd line
andrewkenreich Apr 11, 2023
1942e82
forgot to activate
andrewkenreich Apr 11, 2023
221400f
asdf
andrewkenreich Apr 11, 2023
e75861f
asdf
andrewkenreich Apr 11, 2023
1a6d13e
i dunno anymore
andrewkenreich Apr 11, 2023
942b8e6
back to old faithful
andrewkenreich Apr 11, 2023
b77e7ca
fix spec
andrewkenreich Apr 11, 2023
1227ade
fixing zip maybe
andrewkenreich Apr 11, 2023
196c9c4
path fix
luqmanbello Apr 11, 2023
62a5103
fix path
luqmanbello Apr 11, 2023
5cf46bd
Merge branch 'develop' into hotfix/package
luqmanbello Apr 11, 2023
0489355
Merge branch 'develop' into hotfix/package
luqmanbello Apr 11, 2023
6acc90c
code cleanup
luqmanbello Apr 11, 2023
2817404
change artifact back
andrewkenreich Apr 12, 2023
14f6656
test new nsis info
andrewkenreich Apr 12, 2023
72e31db
didnt like my version
andrewkenreich Apr 12, 2023
2e46e3d
add start program to end of install
andrewkenreich Apr 12, 2023
38cb2ba
adding launch button to installer
andrewkenreich Apr 12, 2023
bf1fe6e
testing version file
andrewkenreich Apr 12, 2023
fe7281b
Merge branch 'develop' into hotfix/package
andrewkenreich Apr 12, 2023
db6dafc
Copy over mac os
jmaslek Apr 12, 2023
3fd54a4
poetry
jmaslek Apr 12, 2023
031550c
reqs
jmaslek Apr 12, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ jobs:
trigger-macos-build:
runs-on: ubuntu-latest
steps:
- name: Trigger MacOs Build
- name: Trigger Intel & M1 MacOs Build
uses: aurelien-baudet/workflow-dispatch@v2
with:
workflow: macos_-uild.yml
workflow: macos-build.yml
token: ${{ secrets.GITHUB_TOKEN }}
wait-for-completion-timeout: 2h

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,5 @@ jobs:
- name: Trigger PyPI Build
uses: aurelien-baudet/workflow-dispatch@v2
with:
workflow: nightly-pypi.yml
workflow: pypi-nightly.yml
token: ${{ secrets.GITHUB_TOKEN }}
21 changes: 15 additions & 6 deletions .github/workflows/windows10_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,24 @@ jobs:
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-full.txt
python -m pip uninstall papermill -y
python -m pip install git+https://github.com/nteract/papermill.git@main
python -m PyInstaller build/pyinstaller/terminal.spec --clean

pwd
shell: bash

- name: zip the file
run: |
Get-Location
Compress-Archive dist release.zip
shell: pwsh

- name: Upload Artifact
uses: actions/upload-artifact@v3
with:
name: OpenBB-Windows10-ENV
path: dist
path: release.zip


Build-Exe:
Expand All @@ -69,10 +74,14 @@ jobs:
uses: actions/checkout@v3

- name: Download Artifact
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: OpenBB-Windows10-ENV
path: dist
path: .

- name: unzip artifact for deployment
run: Expand-Archive release.zip -DestinationPath .
shell: pwsh

- name: Move Files into App Folder
run: cp -r .\dist\OpenBBTerminal\ .\build\nsis\app\
Expand Down Expand Up @@ -100,7 +109,7 @@ jobs:
dist\OpenBBTerminal\OpenBBTerminal.exe -t -s forecast cryptocurrency reports alternative economy futures econometrics dashboards portfolio stocks/test_stocks_options_screen.openbb stocks/test_stocks_options.openbb forex etf stocks/test_stocks_fa.openbb > result.txt
cat result.txt
Select-String "================================ integration test summary ================================" result.txt -Context 0,100 | Select-Object -Last 2000 | Out-File failed_tests.txt

- name: Upload summary to Slack
uses: adrey/slack-file-upload-action@master
with:
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/windows_ml.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
show-channel-urls: true
channel-priority: flexible
environment-file: build/conda/conda-3-9-env.yaml
activate-environment: testing
activate-environment: obb
# Needed for caching
use-only-tar-bz2: true

Expand Down Expand Up @@ -87,8 +87,9 @@ jobs:
shell: bash -l {0}
run: |
conda info
pip install --requirement requirements-full.txt
build\conda\cleanup_artifacts.bat
pip install docstring_parser
poetry install -E all -E installer

- name: List installed packages (Bash)
shell: bash -l {0}
Expand Down
21 changes: 21 additions & 0 deletions build/nsis/setup.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,17 @@
!define VERSION "3.0.0rc1"
!define SLUG "${NAME} v${VERSION}"

;--------------------------------
; Info for Installer.exe
VIProductVersion 3.0.0.0
VIAddVersionKey ProductName "OpenBB Terminal"
VIAddVersionKey Comments "An installer for OpenBB Terminal. For additional details, visit OpenBB.co"
VIAddVersionKey CompanyName OpenBB.co
VIAddVersionKey FileDescription "OpenBB Terminal Program"
VIAddVersionKey FileVersion 3.0.0.0
VIAddVersionKey ProductVersion 3.0.0.0
VIAddVersionKey InternalName "OpenBB Terminal"

;--------------------------------
; General
Name "${NAME}"
Expand All @@ -31,6 +42,10 @@
!define MUI_ABORTWARNING
!define MUI_WELCOMEPAGE_TITLE "${SLUG} Setup"
!define UninstId "OpenBBTerminal" ; You might want to use a GUID here
!define MUI_FINISHPAGE_RUN
!define MUI_FINISHPAGE_RUN_NOTCHECKED
!define MUI_FINISHPAGE_RUN_TEXT "Start OpenBB Terminal"
!define MUI_FINISHPAGE_RUN_FUNCTION "StartOpenBB"

;--------------------------------
; Pages
Expand Down Expand Up @@ -73,6 +88,12 @@ Var STR_CONTAINS_VAR_3
Var STR_CONTAINS_VAR_4
Var STR_RETURN_VAR


Function StartOpenBB
Exec "$InstDir\OpenBBTerminal.exe"
FunctionEnd


Function StrContains
Exch $STR_NEEDLE
Exch 1
Expand Down
1 change: 1 addition & 0 deletions build/pyinstaller/terminal.spec
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ exe_kwargs = dict(
codesign_identity=None,
entitlements_file=None,
icon=exe_icon,
version='version.rc'
)


Expand Down
42 changes: 42 additions & 0 deletions build/pyinstaller/version.rc
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# UTF-8
#
# For more details about fixed file info 'ffi' see:
# http://msdn.microsoft.com/en-us/library/ms646997.aspx
VSVersionInfo(
ffi=FixedFileInfo(
# filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4)
# Set not needed items to zero 0.
filevers=(3, 0, 0, 0),
prodvers=(3, 0, 0, 0),
# Contains a bitmask that specifies the valid bits 'flags'r
mask=0x0,
# Contains a bitmask that specifies the Boolean attributes of the file.
flags=0x0,
# The operating system for which this file was designed.
# 0x4 - NT and there is no need to change it.
OS=0x4,
# The general type of file.
# 0x1 - the file is an application.
fileType=0x1,
# The function of the file.
# 0x0 - the function is not defined for this fileType
subtype=0x0,
# Creation date and time stamp.
date=(0, 0)
),
kids=[
StringFileInfo(
[
StringTable(
'040904b0',
[StringStruct('Comments', 'The OpenBB Terminal. For additional details, visit OpenBB.co'),
StringStruct('CompanyName', 'OpenBB'),
StringStruct('FileDescription', 'OpenBB Terminal Program'),
StringStruct('FileVersion', '3.0.0.0'),
StringStruct('InternalName', 'OpenBB Terminal'),
StringStruct('ProductName', 'OpenBB Terminal'),
StringStruct('ProductVersion', '3.0.0.0')])
]),
VarFileInfo([VarStruct('Translation', [1033, 1200])])
]
)
Loading