Merge branch 'develop' into feature/login

.github/workflows/linting.yml

@@ -9,6 +9,8 @@ env:
   PIP_DEFAULT_TIMEOUT: 100
 
 on:
+  pull_request:
+    types: [opened, synchronize, edited]
   push:
     branches:
       - 'feature/*'
@@ -17,7 +19,7 @@ on:
 
 # Cancel previous runs that are not yet completed.
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.event_name }}-${{ github.repository }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:

build/conda/conda-3-9-env-full.yaml

@@ -6,4 +6,3 @@ dependencies:
   - pip
   - poetry=1.1.13
   - lightgbm=3.3.3
-  - charset-normalizer=2.1.1

openbb_terminal/reports/templates/equity.ipynb

@@ -1350,12 +1350,13 @@
     "        + scorr_similar\n",
     "    ]\n",
     ")\n",
-    "htmlcode += widgets.row(\n",
-    "    [\n",
-    "        widgets.h(3, f\"Income data for similar companies to {symbol}\")\n",
-    "        + income_comparison.to_html()\n",
-    "    ]\n",
-    ")\n",
+    "if isinstance(income_comparison, pd.DataFrame):\n",
+    "    htmlcode += widgets.row(\n",
+    "        [\n",
+    "            widgets.h(3, f\"Income data for similar companies to {symbol}\")\n",
+    "            + income_comparison.to_html()\n",
+    "        ]\n",
+    "    )\n",
     "htmlcode += widgets.row(\n",
     "    [\n",
     "        widgets.p(\n",

openbb_terminal/stocks/screener/screener_controller.py

@@ -92,7 +92,10 @@ class ScreenerController(BaseController):
         See `BaseController.parse_input()` for details.
         """
         # Filtering out sorting parameters with forward slashes like P/E
-        sort_filter = r"((\ -s |\ --sort ).*?(P\/E|Fwd P\/E|P\/S|P\/B|P\/C|P\/FCF)*)"
+        f0 = r"(p\/e|fwd p\/e|p\/s|p\/b|p\/c|p\/fcf)"
+        f1 = r"(P\/E|Fwd P\/E|P\/S|P\/B|P\/C|P\/FCF)"
+
+        sort_filter = r"((\ -s |\ --sort ).*?" + r"(" + f0 + r"|" + f1 + r")" + r"*)"
 
         custom_filters = [sort_filter]
 

website/content/terminal/guides/basics/index.md

@@ -18,7 +18,6 @@ Throughout the entire terminal, the same set of colors are used which all share
 - <b><span style={{color:"#FCED00"}}>Yellow</span></b>: represents descriptions of a parameter or variable.
 - <b>White</b>: represents text, usually in combination with a description that is in Yellow.
 
-
 ### Explanation of Menus
 
 Menus, depicted in <b><span style={{color:"#005CA9"}}>Dark Blue</span></b>, take you to a new section of the terminal referred to as a menu. For example, if you wish to view information about stocks, you can do so by typing `stocks` and pressing `ENTER` (⏎). This opens a new menu as depicted below.
@@ -27,7 +26,7 @@ Menus, depicted in <b><span style={{color:"#005CA9"}}>Dark Blue</span></b>, take
 
 Depending on the menu you are in, you are presented with a new set of commands and menus you can select. There are interactions in place between each menu. For example, when selecting a company within the `stocks` menu, the terminal will remember your selection when you visit the `fa` or `options` menu. See [Introduction to Stocks](/terminal/guides/intros/stocks).
 
-:::note **Pro tip:** you can quickly jump between menus by using a forward slash (`/`). For example, if I want to access the options menu, You can type `/stocks/options` to instantly arrive at this menu. You can do this from any location within theOpenBB Terminal!
+:::note **Pro tip:** you can quickly jump between menus by using a forward slash (`/`). For example, if I want to access the options menu, You can type `/stocks/options` to instantly arrive at this menu. You can do this from any location within the OpenBB Terminal!
 :::
 
 ### Explanation of Commands
@@ -109,7 +108,6 @@ We can check that this period has changed by looking into the <a href="https://w
 
 As mentioned in the <a href="#explanation-of-menus">Explanation of Menus</a>, some information also transfers over to other menus and this includes the loaded market data from <a href="/terminal/reference/stocks/load" target="_blank" rel="noreferrer noopener">load</a>. So, if you would visit the `ta` menu (which stands for <a href="https://www.investopedia.com/terms/t/technicalanalysis.asp" target="_blank" rel="noreferrer noopener">Technical Analysis</a>) you will see that, by running any command, the selected period above is depicted again. Return to the Stocks menu again by using `q` and use it again to return to the home screen which can be shown with `?`.
 
-
 ### Defining your own source of data
 
 The OpenBB Terminal is built on a lot of different data sources. The example above collects data from Yahoo Finance. This could be undesirable and therefore we allow for a variety of different data sources. Think of Polygon, IEX Cloud, Alpha Vantage and Binance to name a few.