From 851f9ca53c53cd6a167d4fa754a2c9cb85a26f60 Mon Sep 17 00:00:00 2001 From: James Maslek Date: Mon, 23 Jan 2023 11:43:42 -0500 Subject: [PATCH 1/4] Add back pull request to linting action (#4032) --- .github/workflows/linting.yml | 4 +++- build/conda/conda-3-9-env-full.yaml | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index d6edf443d61..76d2adcc6ea 100644 --- a/.github/workflows/linting.yml +++ b/.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: diff --git a/build/conda/conda-3-9-env-full.yaml b/build/conda/conda-3-9-env-full.yaml index 65e559f63a6..33392f4c800 100644 --- a/build/conda/conda-3-9-env-full.yaml +++ b/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 From 56005782d8ca43b9c768319a54602075e98b3d2f Mon Sep 17 00:00:00 2001 From: montezdesousa <79287829+montezdesousa@users.noreply.github.com> Date: Mon, 23 Jan 2023 22:10:40 +0000 Subject: [PATCH 2/4] Fix terminal exit after `--sort p/e` (#4013) * fix scr sort exit * rewrite unit test output * rewind slash replace * rewind slash replace * fix regex * rewrite expected scr tests * black Co-authored-by: James Maslek --- openbb_terminal/stocks/screener/screener_controller.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openbb_terminal/stocks/screener/screener_controller.py b/openbb_terminal/stocks/screener/screener_controller.py index 83adec0a975..7fd9359a61f 100644 --- a/openbb_terminal/stocks/screener/screener_controller.py +++ b/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] From 686d89ff2175555060901910be71acf4c55074de Mon Sep 17 00:00:00 2001 From: jose-donato <43375532+jose-donato@users.noreply.github.com> Date: Tue, 24 Jan 2023 00:36:55 +0000 Subject: [PATCH 3/4] fix: small typo (#4036) --- website/content/terminal/guides/basics/index.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/website/content/terminal/guides/basics/index.md b/website/content/terminal/guides/basics/index.md index c2f9e8e8cad..13f2fcb6587 100644 --- a/website/content/terminal/guides/basics/index.md +++ b/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 - Yellow: represents descriptions of a parameter or variable. - White: represents text, usually in combination with a description that is in Yellow. - ### Explanation of Menus Menus, depicted in Dark Blue, 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 Dark Blue, 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 Explanation of Menus, some information also transfers over to other menus and this includes the loaded market data from load. So, if you would visit the `ta` menu (which stands for Technical Analysis) 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. From 5cac9b67433b998a49a2aa0aa735be247b3f482f Mon Sep 17 00:00:00 2001 From: teh_coderer Date: Mon, 23 Jan 2023 19:20:04 -0600 Subject: [PATCH 4/4] fix income comparison error (#4029) --- openbb_terminal/reports/templates/equity.ipynb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/openbb_terminal/reports/templates/equity.ipynb b/openbb_terminal/reports/templates/equity.ipynb index 10f4cbfbc17..2171f267999 100644 --- a/openbb_terminal/reports/templates/equity.ipynb +++ b/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",