Skip to content

Commit

Permalink
merge release into develop (#4359)
Browse files Browse the repository at this point in the history
* Update trailmap.py (#4300)

* Fixes Failing AutoDocs (#4304)

* Fixes Failing AutoDocs

* Update test_print_help.txt

* Release time

* Revert papermill and update gh pages action

* Fix shortname (#4356)

* uninstall brotli on conda test

* Fix issue 4316 (#4357)

* Fix issue 4316

* Updating polygon_model + options_controller

* Tests : FRED

* ruff

---------

Co-authored-by: teh_coderer <me@tehcoderer.com>
Co-authored-by: Jeroen Bouma <jer.bouma@gmail.com>
Co-authored-by: Chavithra <chavithra@gmail.com>
Co-authored-by: hjoaquim <h.joaquim@campus.fct.unl.pt>
  • Loading branch information
5 people authored Mar 1, 2023
1 parent 14e5b18 commit 437607c
Show file tree
Hide file tree
Showing 17 changed files with 10,190 additions and 10,215 deletions.
1 change: 1 addition & 0 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ jobs:

- run: |
source $VENV
pip uninstall Brotli -y
pytest tests/website --autodoc
python website/generate_sdk_markdown.py && python website/generate_terminal_markdown.py
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,7 @@ jobs:
shell: bash -l {0}
run: |
pip install --requirement requirements-full.txt
pip uninstall Brotli -y
- name: List installed packages (Bash)
shell: bash -l {0}
Expand Down
2 changes: 1 addition & 1 deletion build/docker/compose.env
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
OPENBBTERMINAL_DOCKER_REGISTRY="ghcr.io"
OPENBBTERMINAL_DOCKER_RELEASE_VERSION="2.4.1"
OPENBBTERMINAL_DOCKER_RELEASE_VERSION="2.5.0"
2 changes: 1 addition & 1 deletion build/docker/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ services:
- ~/OpenBBUserData:/home/python/OpenBBUserData
- ~/.openbb_terminal:/home/python/.openbb_terminal
platform: linux/amd64
image: ghcr.io/openbb-finance/openbbterminal/openbb:2.4.1
image: ghcr.io/openbb-finance/openbbterminal/openbb:2.5.0
stdin_open: true # docker run -i
tty: true # docker run -t
2 changes: 1 addition & 1 deletion build/nsis/setup.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
!define NAME "OpenBB Terminal"
!define COMPANY "OpenBB"
!define APPFILE "OpenBBTerminal.exe"
!define VERSION "2.4.1"
!define VERSION "2.5.0"
!define SLUG "${NAME} v${VERSION}"

;--------------------------------
Expand Down
2 changes: 1 addition & 1 deletion build/pyinstaller/.env
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
OPENBB_LOGGING_APP_NAME=gst_packaged
OPENBB_LOGGING_COMMIT_HASH=sha:bbeaef4
OPENBB_LOGGING_COMMIT_HASH=sha:14e5b18
OPENBB_ENABLE_PREDICT=false
OPENBB_ENABLE_CHECK_API=true
OPENBB_ENABLE_THOUGHTS_DAY=false
Expand Down
4 changes: 2 additions & 2 deletions openbb_terminal/economy/nasdaq_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

import pandas as pd

from openbb_terminal.config_terminal import API_KEY_QUANDL
import openbb_terminal.config_terminal as cfg
from openbb_terminal.decorators import check_api_key, log_start_end
from openbb_terminal.helper_funcs import request
from openbb_terminal.rich_config import console
Expand Down Expand Up @@ -177,7 +177,7 @@ def get_big_mac_index(country_code: str = "USA") -> pd.DataFrame:
Dataframe with Big Mac index converted to USD equivalent.
"""
URL = f"https://data.nasdaq.com/api/v3/datasets/ECONOMIST/BIGMAC_{country_code}"
URL += f"?column_index=3&api_key={API_KEY_QUANDL}"
URL += f"?column_index=3&api_key={cfg.API_KEY_QUANDL}"
try:
r = request(URL)
except Exception:
Expand Down
2 changes: 1 addition & 1 deletion openbb_terminal/feature_flags.py
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
else:
raise Exception("Using git")
except Exception:
version = "2.4.1"
version = "2.5.0"
VERSION = str(os.getenv("OPENBB_VERSION", version))

# Select the terminal translation language
Expand Down
4 changes: 2 additions & 2 deletions openbb_terminal/forex/polygon_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import pandas as pd

from openbb_terminal.config_terminal import API_POLYGON_KEY as api_key
import openbb_terminal.config_terminal as cfg
from openbb_terminal.decorators import check_api_key
from openbb_terminal.helper_funcs import get_user_agent, request
from openbb_terminal.rich_config import console
Expand Down Expand Up @@ -48,7 +48,7 @@ def get_historical(

request_url = (
f"https://api.polygon.io/v2/aggs/ticker/C:{fx_pair}/range"
f"/{multiplier}/{timespan}/{start_date}/{end_date}?adjusted=true&sort=desc&limit=50000&apiKey={api_key}"
f"/{multiplier}/{timespan}/{start_date}/{end_date}?adjusted=true&sort=desc&limit=50000&apiKey={cfg.API_POLYGON_KEY}"
)
json_response = request(
request_url, headers={"User-Agent": get_user_agent()}
Expand Down
6 changes: 3 additions & 3 deletions openbb_terminal/stocks/options/options_controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

import pandas as pd

import openbb_terminal.config_terminal as cfg
from openbb_terminal import feature_flags as obbff
from openbb_terminal.config_terminal import API_TRADIER_TOKEN
from openbb_terminal.custom_prompt_toolkit import NestedCompleter
from openbb_terminal.decorators import log_start_end
from openbb_terminal.helper_funcs import (
Expand Down Expand Up @@ -141,7 +141,7 @@ def __init__(
self.source = ""

if ticker:
if API_TRADIER_TOKEN == "REPLACE_ME": # nosec
if cfg.API_TRADIER_TOKEN == "REPLACE_ME": # nosec
console.print("Loaded expiry dates from Yahoo Finance")
self.expiry_dates = yfinance_model.option_expirations(self.ticker)
else:
Expand Down Expand Up @@ -844,7 +844,7 @@ def call_hist(self, other_args: List[str]):
)

if (
ns_parser.source == "Tradier" and API_TRADIER_TOKEN != "REPLACE_ME"
ns_parser.source == "Tradier" and cfg.API_TRADIER_TOKEN != "REPLACE_ME"
): # nosec
tradier_view.display_historical(
symbol=self.ticker,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def __init__(self, ticker: str = "", queue: Optional[List[str]] = None):
if ticker:
if ticker in self.equities.index:
self.symbol = ticker
self.symbol_name = self.equities.loc[ticker]["short_name"]
self.symbol_name = self.equities.loc[ticker]["name"]
self.exchange = self.equities.loc[ticker]["exchange"]
open_ex = get_open()
if self.exchange in open_ex.index:
Expand Down Expand Up @@ -133,7 +133,7 @@ def call_symbol(self, other_args: List[str]):
if ns_parser:
self.symbol = ns_parser.symbol
if ns_parser.symbol in self.equities.index:
self.symbol_name = self.equities.loc[self.symbol]["short_name"]
self.symbol_name = self.equities.loc[self.symbol]["name"]
self.exchange = self.equities.loc[self.symbol]["exchange"]
open_ex = get_open()
if self.exchange in open_ex.index:
Expand Down
Loading

0 comments on commit 437607c

Please sign in to comment.