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

deps update (#3800) #3801

Merged
merged 36 commits into from
Dec 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
d9fb8a2
deps update (#3800)
jmaslek Dec 19, 2022
2e431b5
statsmodels
jmaslek Dec 19, 2022
e9839ca
delete very old files
jmaslek Dec 19, 2022
521a97e
Lots o tests
jmaslek Dec 19, 2022
0d541c9
Merge branch 'main' into deps_jm
hjoaquim Dec 19, 2022
7e05f60
etf tests
jmaslek Dec 19, 2022
d9d76b0
OPtions tests
jmaslek Dec 19, 2022
07fa2d1
Pin psutil for m1 build
jmaslek Dec 19, 2022
b3ba4e1
stocks rewrite expected
jmaslek Dec 19, 2022
1e41e90
pyproject comments + portfolio test
jmaslek Dec 19, 2022
502344c
disc/ark view test
jmaslek Dec 19, 2022
9e43689
dcf coe
jmaslek Dec 19, 2022
23f2af4
dcf view
jmaslek Dec 19, 2022
cd64480
stocks screener
jmaslek Dec 19, 2022
f177bb7
Merge branch 'main' into deps_jm
jmaslek Dec 19, 2022
bae8965
dcf model
jmaslek Dec 19, 2022
528bbfb
etf controller
jmaslek Dec 19, 2022
be557e3
insider views
jmaslek Dec 19, 2022
c0222d9
dps view
jmaslek Dec 19, 2022
7c90b67
ca menu
jmaslek Dec 19, 2022
3567cb3
stocks/qa
jmaslek Dec 19, 2022
fd1bbfe
skip bt tests
jmaslek Dec 19, 2022
4896139
get rid of pymongo from .spec
jmaslek Dec 19, 2022
9aa2925
One last skip
jmaslek Dec 19, 2022
9581993
Allow finviz to be 1.4.4
jmaslek Dec 19, 2022
5a9661f
oops forgot to get rid of my debugging
jmaslek Dec 19, 2022
82c1b7c
remove bson from spec because no more pymongo
jmaslek Dec 19, 2022
ddd9091
make requirments txt and requirements be finviz 1 4 4
jmaslek Dec 19, 2022
47c730b
try hidden import
jmaslek Dec 20, 2022
3b2c711
Gray sweatpants
jmaslek Dec 20, 2022
8cae786
Add files to spec
jmaslek Dec 20, 2022
9beea54
Revert "Allow finviz to be 1.4.4"
piiq Dec 20, 2022
b6b4bb2
Revert "Pin psutil for m1 build"
piiq Dec 20, 2022
476c2a6
Revert "statsmodels"
piiq Dec 20, 2022
6d0add7
Revert "deps update (#3800)"
piiq Dec 20, 2022
f6a14aa
Re-solve dependencies
piiq Dec 20, 2022
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
11 changes: 4 additions & 7 deletions build/pyinstaller/terminal.spec
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,13 @@ added_files = [
os.path.join(pathex, "investpy", "resources"),
os.path.join("investpy", "resources"),
),
(
os.path.join(pathex, "pymongo"),
"pymongo",
),
(os.path.join(pathex, "bson"), "bson"),
(
os.path.join(pathex, "debugpy", "_vendored"),
os.path.join("debugpy", "_vendored"),
),
(".env", "."),
(os.path.join(pathex, "blib2to3", "Grammar.txt"), "blib2to3"),
(os.path.join(pathex, "blib2to3", "PatternGrammar.txt"), "blib2to3"),
]

# Python libraries that are explicitly pulled into the bundle
Expand All @@ -88,6 +85,8 @@ hidden_imports = [
"sklearn.neighbors.quad_tree",
"sklearn.tree._utils",
"sklearn.neighbors._partition_nodes",
"sklearn.metrics._pairwise_distances_reduction._datasets_pair",
"sklearn.metrics._pairwise_distances_reduction._middle_term_computer",
"squarify",
"linearmodels",
"statsmodels",
Expand All @@ -97,8 +96,6 @@ hidden_imports = [
"textwrap3",
"pyEX",
"feedparser",
"pymongo",
"bson",
"_sysconfigdata__darwin_darwin",
"prophet",
"debugpy",
Expand Down
60 changes: 43 additions & 17 deletions openbb_terminal/reports/templates/crypto.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,9 @@
"source": [
"news = openbb.crypto.dd.news(symbol=ticker).head(10)\n",
"\n",
"if (isinstance(news,pd.DataFrame) and not news.empty) or (not isinstance(news,pd.DataFrame) and news):\n",
"if (isinstance(news, pd.DataFrame) and not news.empty) or (\n",
" not isinstance(news, pd.DataFrame) and news\n",
"):\n",
" news = news.set_index(\"published_at\")\n",
" news.sort_index()\n",
" news[\"link\"] = news[\"link\"].apply(lambda x: f'<a href=\"{x}\">{x}</a>')\n",
Expand All @@ -149,7 +151,9 @@
"source": [
"links = openbb.crypto.dd.links(ticker)\n",
"\n",
"if (isinstance(links,pd.DataFrame) and not links.empty) or (not isinstance(links,pd.DataFrame) and links):\n",
"if (isinstance(links, pd.DataFrame) and not links.empty) or (\n",
" not isinstance(links, pd.DataFrame) and links\n",
"):\n",
" links[\"Link\"] = links[\"Link\"].apply(lambda x: f'<a href=\"{x}\">{x}</a>')\n",
" links\n",
"else:\n",
Expand Down Expand Up @@ -192,7 +196,7 @@
" symbol=ticker,\n",
" to_symbol=\"usd\",\n",
" start_date=dict_of_dates[date],\n",
" source=\"YahooFinance\"\n",
" source=\"YahooFinance\",\n",
" )\n",
"\n",
" if data.empty:\n",
Expand Down Expand Up @@ -328,7 +332,9 @@
"# market cap dominance\n",
"mcapdom_df = openbb.crypto.dd.mcapdom(symbol=ticker)\n",
"\n",
"if (isinstance(mcapdom_df,pd.DataFrame) and not mcapdom_df.empty) or (not isinstance(mcapdom_df,pd.DataFrame) and mcapdom_df):\n",
"if (isinstance(mcapdom_df, pd.DataFrame) and not mcapdom_df.empty) or (\n",
" not isinstance(mcapdom_df, pd.DataFrame) and mcapdom_df\n",
"):\n",
" fig, ax = plt.subplots(figsize=(11, 5), dpi=150)\n",
" openbb.crypto.dd.mcapdom_chart(symbol=ticker, external_axes=[ax])\n",
" fig.tight_layout()\n",
Expand All @@ -349,7 +355,9 @@
"# roadmap\n",
"roadmap_model = openbb.crypto.dd.rm(symbol=ticker)\n",
"\n",
"if (isinstance(roadmap_model,pd.DataFrame) and not roadmap_model.empty) or (not isinstance(roadmap_model,pd.DataFrame) and roadmap_model):\n",
"if (isinstance(roadmap_model, pd.DataFrame) and not roadmap_model.empty) or (\n",
" not isinstance(roadmap_model, pd.DataFrame) and roadmap_model\n",
"):\n",
"\n",
" roadmap_model = roadmap_model.set_index(\"Date\")\n",
" roadmap_model.sort_index()\n",
Expand All @@ -374,7 +382,9 @@
"source": [
"tokenomics_model = openbb.crypto.dd.rm(symbol=ticker)\n",
"\n",
"if (isinstance(tokenomics_model,pd.DataFrame) and not tokenomics_model.empty) or (not isinstance(tokenomics_model,pd.DataFrame) and tokenomics_model):\n",
"if (isinstance(tokenomics_model, pd.DataFrame) and not tokenomics_model.empty) or (\n",
" not isinstance(tokenomics_model, pd.DataFrame) and tokenomics_model\n",
"):\n",
"\n",
" tokenomics_model = tokenomics_model.set_index(\"Date\")\n",
" tokenomics_model.sort_index()\n",
Expand All @@ -386,7 +396,7 @@
" f = io.BytesIO()\n",
" fig.savefig(f, format=\"svg\")\n",
" tokenomics_view = f.getvalue().decode(\"utf-8\")\n",
" \n",
"\n",
"else:\n",
" tokenomics_model = pd.DataFrame()"
]
Expand All @@ -399,7 +409,7 @@
"outputs": [],
"source": [
"# fundraise\n",
"fundraise = openbb.crypto.dd.fr(symbol=ticker) # this returns a tuple\n",
"fundraise = openbb.crypto.dd.fr(symbol=ticker) # this returns a tuple\n",
"\n",
"if fundraise:\n",
" fundraise_info = fundraise[0]\n",
Expand All @@ -414,7 +424,9 @@
"outputs": [],
"source": [
"trading_pair_info = openbb.crypto.dd.trading_pair_info(f\"{ticker}-USDT\")\n",
"if (isinstance(trading_pair_info,pd.DataFrame) and not trading_pair_info.empty) or (not isinstance(trading_pair_info,pd.DataFrame) and trading_pair_info):\n",
"if (isinstance(trading_pair_info, pd.DataFrame) and not trading_pair_info.empty) or (\n",
" not isinstance(trading_pair_info, pd.DataFrame) and trading_pair_info\n",
"):\n",
" trading_pair_info = trading_pair_info.set_index(\"Metric\")\n",
" trading_pair_info\n",
"else:\n",
Expand Down Expand Up @@ -472,7 +484,9 @@
"\n",
"market = openbb.crypto.dd.mkt(ticker)\n",
"\n",
"if (isinstance(market,pd.DataFrame) and not market.empty) or (not isinstance(market,pd.DataFrame) and market):\n",
"if (isinstance(market, pd.DataFrame) and not market.empty) or (\n",
" not isinstance(market, pd.DataFrame) and market\n",
"):\n",
" market = market.set_index(\"exchange\")\n",
"\n",
" market[\"market_url\"] = market[\"market_url\"].apply(\n",
Expand All @@ -493,7 +507,9 @@
"# all exchanges where loaded coin is listed\n",
"ex = openbb.crypto.dd.ex(ticker)\n",
"\n",
"if (isinstance(ex,pd.DataFrame) and not ex.empty) or (not isinstance(ex,pd.DataFrame) and ex):\n",
"if (isinstance(ex, pd.DataFrame) and not ex.empty) or (\n",
" not isinstance(ex, pd.DataFrame) and ex\n",
"):\n",
" ex = ex.set_index(\"id\")\n",
" ex\n",
"else:\n",
Expand All @@ -509,7 +525,9 @@
"source": [
"# last trades\n",
"trades = openbb.crypto.dd.trades(symbol=ticker, exchange_id=\"gemini\", to_symbol=\"USD\")\n",
"if (isinstance(trades,pd.DataFrame) and not trades.empty) or (not isinstance(trades,pd.DataFrame) and trades):\n",
"if (isinstance(trades, pd.DataFrame) and not trades.empty) or (\n",
" not isinstance(trades, pd.DataFrame) and trades\n",
"):\n",
" trades = trades.set_index(\"Date\")\n",
" trades\n",
"else:\n",
Expand All @@ -526,7 +544,7 @@
"# order book\n",
"order_book_raw = openbb.crypto.dd.ob(\n",
" symbol=ticker, exchange=\"gemini\", to_symbol=\"USD\"\n",
") # this returns a dict\n",
") # this returns a dict\n",
"\n",
"if order_book_raw:\n",
" fig, ax = plt.subplots(figsize=(11, 5), dpi=150)\n",
Expand All @@ -549,7 +567,9 @@
"# price and supply related metrics for loaded coin\n",
"\n",
"ps = openbb.crypto.dd.ps(ticker)\n",
"if (isinstance(ps,pd.DataFrame) and not ps.empty) or (not isinstance(ps,pd.DataFrame) and ps):\n",
"if (isinstance(ps, pd.DataFrame) and not ps.empty) or (\n",
" not isinstance(ps, pd.DataFrame) and ps\n",
"):\n",
" ps = ps.set_index(\"Metric\")\n",
" ps\n",
"else:\n",
Expand All @@ -567,7 +587,9 @@
"\n",
"events = openbb.crypto.dd.events(ticker)\n",
"\n",
"if (isinstance(events,pd.DataFrame) and not events.empty) or (not isinstance(events,pd.DataFrame) and events):\n",
"if (isinstance(events, pd.DataFrame) and not events.empty) or (\n",
" not isinstance(events, pd.DataFrame) and events\n",
"):\n",
" events = events.set_index(\"date\")\n",
" events[\"link\"] = events[\"link\"].apply(lambda x: f'<a href=\"{x}\">{x}</a>')\n",
"else:\n",
Expand Down Expand Up @@ -617,7 +639,9 @@
"\n",
"gh_data = openbb.crypto.dd.gh(symbol=ticker)\n",
"\n",
"if (isinstance(gh_data,pd.DataFrame) and not gh_data.empty) or (not isinstance(gh_data,pd.DataFrame) and gh_data):\n",
"if (isinstance(gh_data, pd.DataFrame) and not gh_data.empty) or (\n",
" not isinstance(gh_data, pd.DataFrame) and gh_data\n",
"):\n",
" fig, ax = plt.subplots(figsize=(11, 5), dpi=150)\n",
" openbb.crypto.dd.gh_chart(symbol=ticker, external_axes=[ax])\n",
" fig.tight_layout()\n",
Expand Down Expand Up @@ -1006,7 +1030,9 @@
" htmlcode += widgets.row([widgets.h(3, \"Links\") + links.to_html(escape=False)])\n",
"\n",
"if not news.empty:\n",
" htmlcode += widgets.row([widgets.h(3, \"Published news\") + news.to_html(escape=False)])\n",
" htmlcode += widgets.row(\n",
" [widgets.h(3, \"Published news\") + news.to_html(escape=False)]\n",
" )\n",
"\n",
"htmlcode += widgets.row([widgets.h(3, \"Historical data\")])\n",
"for data in historical_data:\n",
Expand Down
26 changes: 18 additions & 8 deletions openbb_terminal/reports/templates/economy.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -211,9 +211,15 @@
"source": [
"ycrv = openbb.economy.ycrv(return_date=True)\n",
"\n",
"if (isinstance(ycrv,pd.DataFrame) and not ycrv.empty) or (not isinstance(ycrv,pd.DataFrame) and ycrv):\n",
"if (isinstance(ycrv, pd.DataFrame) and not ycrv.empty) or (\n",
" not isinstance(ycrv, pd.DataFrame) and ycrv\n",
"):\n",
" ycrv_data_1, _ = ycrv\n",
" fig, (ax1) = plt.subplots(nrows=1,figsize=(16 / 9 * 5, 5),dpi=150,)\n",
" fig, (ax1) = plt.subplots(\n",
" nrows=1,\n",
" figsize=(16 / 9 * 5, 5),\n",
" dpi=150,\n",
" )\n",
" ycrv_country_1 = \"United states\"\n",
"\n",
" openbb.economy.ycrv_chart(external_axes=[ax1])\n",
Expand Down Expand Up @@ -455,7 +461,9 @@
"source": [
"bigmac_res = openbb.economy.bigmac()\n",
"\n",
"if (isinstance(bigmac_res,pd.DataFrame) and not bigmac_res.empty) or (not isinstance(bigmac_res,pd.DataFrame) and bigmac_res):\n",
"if (isinstance(bigmac_res, pd.DataFrame) and not bigmac_res.empty) or (\n",
" not isinstance(bigmac_res, pd.DataFrame) and bigmac_res\n",
"):\n",
" fig, ax = plt.subplots(figsize=(11, 5), dpi=150)\n",
" openbb.economy.bigmac_chart(\n",
" country_codes=[\n",
Expand Down Expand Up @@ -522,11 +530,11 @@
"metadata": {},
"outputs": [],
"source": [
"fred = openbb.economy.fred(\n",
" series_ids=[\"T10Y3M\"], start_date=\"1980-01-01\"\n",
")\n",
"fred = openbb.economy.fred(series_ids=[\"T10Y3M\"], start_date=\"1980-01-01\")\n",
"\n",
"if (isinstance(fred,pd.DataFrame) and not fred.empty) or (not isinstance(fred,pd.DataFrame) and fred):\n",
"if (isinstance(fred, pd.DataFrame) and not fred.empty) or (\n",
" not isinstance(fred, pd.DataFrame) and fred\n",
"):\n",
" df, df_dict = fred\n",
"\n",
" fig, ax = plt.subplots(figsize=(11, 5), dpi=150)\n",
Expand Down Expand Up @@ -666,7 +674,9 @@
" htmlcode += widgets.row([widgets.h(3, \"Bigmac index (source: Nasdaq)\") + bigmac])\n",
"htmlcode += widgets.row([widgets.h(3, \"Leading indicators (source: EconDB)\") + macro_0])\n",
"if fred:\n",
" htmlcode += widgets.row([widgets.h(3, \"Recession indicator (source: FRED)\") + fred_0])\n",
" htmlcode += widgets.row(\n",
" [widgets.h(3, \"Recession indicator (source: FRED)\") + fred_0]\n",
" )\n",
"body += widgets.add_tab(\"Macro Data\", htmlcode)\n",
"\n",
"body += widgets.tab_clickable_and_save_evt()\n",
Expand Down
4 changes: 3 additions & 1 deletion openbb_terminal/reports/templates/equity.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -1380,7 +1380,9 @@
" [widgets.h(3, \"Last Activity\") + df_insider.head(10).to_html(col_space=\"75px\")]\n",
" )\n",
"else:\n",
" htmlcode = widgets.row([widgets.h(3, \"Last Activity\") + widgets.p(\"No insider trading data found.\")])\n",
" htmlcode = widgets.row(\n",
" [widgets.h(3, \"Last Activity\") + widgets.p(\"No insider trading data found.\")]\n",
" )\n",
"\n",
"body += widgets.add_tab(\"Insider Trading\", htmlcode)\n",
"\n",
Expand Down
6 changes: 3 additions & 3 deletions openbb_terminal/reports/templates/forex.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -164,12 +164,12 @@
"\n",
"if ticker_data[\"Volume\"].isnull().all() or ticker_data[\"Volume\"].eq(0).all():\n",
" fig, ax1 = plt.subplots(nrows=1, ncols=1, figsize=(11, 5), dpi=150)\n",
" external_axes=[ax1]\n",
" external_axes = [ax1]\n",
"else:\n",
" fig, (ax1, ax2) = plt.subplots(nrows=2, ncols=1, figsize=(11, 5), dpi=150)\n",
" external_axes=[ax1, ax2]\n",
" external_axes = [ax1, ax2]\n",
"\n",
"\n",
" \n",
"openbb.forex.candle(\n",
" data=ticker_data,\n",
" to_symbol=to_symbol,\n",
Expand Down
60 changes: 0 additions & 60 deletions openbb_terminal/stocks/dark_pool_shorts/nyse_model.py

This file was deleted.

Loading