merge release into develop

.github/workflows/gh-pages.yml

@@ -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
 

.github/workflows/unit-test.yml

@@ -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}

build/docker/compose.env

@@ -1,2 +1,2 @@
 OPENBBTERMINAL_DOCKER_REGISTRY="ghcr.io"
-OPENBBTERMINAL_DOCKER_RELEASE_VERSION="2.4.1"
+OPENBBTERMINAL_DOCKER_RELEASE_VERSION="2.5.0"

build/docker/docker-compose.yaml

@@ -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

build/nsis/setup.nsi

@@ -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}"
 
 ;--------------------------------

build/pyinstaller/.env

@@ -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

openbb_terminal/economy/nasdaq_model.py

@@ -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
@@ -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:

openbb_terminal/feature_flags.py

@@ -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

openbb_terminal/forex/polygon_model.py

@@ -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
@@ -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()}

openbb_terminal/stocks/options/options_controller.py

@@ -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 (
@@ -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:
@@ -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,

openbb_terminal/stocks/tradinghours/tradinghours_controller.py

@@ -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:
@@ -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: