From 9f550ff9af596a06601174fabebff89ae893de77 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sat, 6 Mar 2021 21:04:09 +0100 Subject: [PATCH] GitHub Actions: make pyupgrade mandatory and max-line-length=122 --- .github/workflows/test.yml | 6 +++--- gamestonk_terminal/discovery/fidelity_api.py | 2 +- gamestonk_terminal/due_diligence/market_watch_api.py | 2 +- .../fundamental_analysis/alpha_vantage_api.py | 5 ++++- .../fundamental_analysis/yahoo_finance_api.py | 2 +- gamestonk_terminal/helper_funcs.py | 6 +++--- gamestonk_terminal/sentiment/sen_menu.py | 4 ++-- terminal.py | 7 +++++-- 8 files changed, 20 insertions(+), 14 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 032aeeb8d2c..7c4871940c9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,10 +23,10 @@ jobs: - run: pip install bandit black codespell flake8 mypy pyupgrade safety pylint - run: bandit -r . || true - run: black --check . - - run: codespell --ignore-words-list="mape" --quiet-level=2 --skip=".git" # --skip="" - - run: flake8 . --count --ignore=E203,E302,F401,W503 --max-line-length=140 --show-source --statistics + - run: codespell --ignore-words-list="mape" --quiet-level=2 --skip=".git" + - run: flake8 . --count --ignore=E203,E302,F401,W503 --max-line-length=122 --show-source --statistics - run: mypy --ignore-missing-imports . - - run: shopt -s globstar && pyupgrade --py36-plus **/*.py || true + - run: shopt -s globstar && pyupgrade --py36-plus **/*.py - run: safety check - run: pylint **/*.py test: diff --git a/gamestonk_terminal/discovery/fidelity_api.py b/gamestonk_terminal/discovery/fidelity_api.py index 2a96ef56572..8dd7d3b4fc9 100644 --- a/gamestonk_terminal/discovery/fidelity_api.py +++ b/gamestonk_terminal/discovery/fidelity_api.py @@ -28,7 +28,7 @@ def buy_sell_ratio_color_red_green(val: str) -> str: Fore.GREEN, buys, Style.RESET_ALL, sells ) - return "{}% Buys, {}{}%{} Sells".format(buys, Fore.RED, sells, Style.RESET_ALL) + return f"{buys}% Buys, {Fore.RED}{sells}%{Style.RESET_ALL} Sells" def price_change_color_red_green(val: str) -> str: diff --git a/gamestonk_terminal/due_diligence/market_watch_api.py b/gamestonk_terminal/due_diligence/market_watch_api.py index 5a466c56be8..c174a5756ca 100644 --- a/gamestonk_terminal/due_diligence/market_watch_api.py +++ b/gamestonk_terminal/due_diligence/market_watch_api.py @@ -117,7 +117,7 @@ def sean_seah_warnings(l_args, s_ticker): with open(filepath) as fp: line = fp.readline() while line: - print("{}".format(line.strip())) + print(f"{line.strip()}") line = fp.readline() print("") diff --git a/gamestonk_terminal/fundamental_analysis/alpha_vantage_api.py b/gamestonk_terminal/fundamental_analysis/alpha_vantage_api.py index b25a4f046f6..bdddaed3f28 100644 --- a/gamestonk_terminal/fundamental_analysis/alpha_vantage_api.py +++ b/gamestonk_terminal/fundamental_analysis/alpha_vantage_api.py @@ -375,7 +375,10 @@ def earnings(l_args, s_ticker): pd.options.display.max_colwidth = 40 # Request EARNINGS data from Alpha Vantage API - s_req = f"https://www.alphavantage.co/query?function=EARNINGS&symbol={s_ticker}&apikey={cfg.API_KEY_FINANCIALMODELINGPREP}" + s_req = ( + "https://www.alphavantage.co/query?function=EARNINGS&" + f"symbol={s_ticker}&apikey={cfg.API_KEY_FINANCIALMODELINGPREP}" + ) result = requests.get(s_req, stream=True) # If the returned data was successful diff --git a/gamestonk_terminal/fundamental_analysis/yahoo_finance_api.py b/gamestonk_terminal/fundamental_analysis/yahoo_finance_api.py index 71e11b381d1..93bda114d4f 100644 --- a/gamestonk_terminal/fundamental_analysis/yahoo_finance_api.py +++ b/gamestonk_terminal/fundamental_analysis/yahoo_finance_api.py @@ -225,7 +225,7 @@ def sustainability(l_args, s_ticker): return -# ---------------------------------------------------- CALENDAR_EARNINGS ---------------------------------------------------- +# ---------------------------------------------------- CALENDAR_EARNINGS ------------------------------------------------ def calendar_earnings(l_args, s_ticker): parser = argparse.ArgumentParser( prog="calendar_earnings", diff --git a/gamestonk_terminal/helper_funcs.py b/gamestonk_terminal/helper_funcs.py index 5db9fe5166f..8f5f0b5666a 100644 --- a/gamestonk_terminal/helper_funcs.py +++ b/gamestonk_terminal/helper_funcs.py @@ -83,7 +83,7 @@ def long_number_format(num) -> str: if num.is_integer(): return "%d%s" % (num, ["", " K", " M", " B", " T", " P"][magnitude]) - return "%.3f%s" % (num, ["", " K", " M", " B", " T", " P"][magnitude]) + return "{:.3f}{}".format(num, ["", " K", " M", " B", " T", " P"][magnitude]) if isinstance(num, int): num = str(num) if num.lstrip("-").isdigit(): @@ -96,7 +96,7 @@ def long_number_format(num) -> str: if num.is_integer(): return "%d%s" % (num, ["", " K", " M", " B", " T", " P"][magnitude]) - return "%.3f%s" % (num, ["", " K", " M", " B", " T", " P"][magnitude]) + return "{:.3f}{}".format(num, ["", " K", " M", " B", " T", " P"][magnitude]) return num @@ -176,7 +176,7 @@ def get_data(tweet): def clean_tweet(tweet: str, s_ticker: str) -> str: whitespace = re.compile(r"\s+") web_address = re.compile(r"(?i)http(s):\/\/[a-z0-9.~_\-\/]+") - ticker = re.compile(r"(?i)@{}(?=\b)".format(s_ticker)) + ticker = re.compile(fr"(?i)@{s_ticker}(?=\b)") user = re.compile(r"(?i)@[a-z0-9_]+") tweet = whitespace.sub(" ", tweet) diff --git a/gamestonk_terminal/sentiment/sen_menu.py b/gamestonk_terminal/sentiment/sen_menu.py index a700e908cc7..aa4d52496f5 100644 --- a/gamestonk_terminal/sentiment/sen_menu.py +++ b/gamestonk_terminal/sentiment/sen_menu.py @@ -114,7 +114,7 @@ def sen_menu(s_ticker, s_start): elif ns_known_args.cmd == "popular": reddit_api.popular_tickers(l_args) - # ---------------------------------------------------- STOCKTWITS --------------------------------------------------- + # ---------------------------------------------------- STOCKTWITS ----------------------------------------------- elif ns_known_args.cmd == "bullbear": stocktwits_api.bullbear(l_args, s_ticker) @@ -127,7 +127,7 @@ def sen_menu(s_ticker, s_start): elif ns_known_args.cmd == "stalker": stocktwits_api.stalker(l_args) - # ----------------------------------------------------- TWITTER --------------------------------------------------- + # ----------------------------------------------------- TWITTER ------------------------------------------------- elif ns_known_args.cmd == "infer": twitter_api.inference(l_args, s_ticker) diff --git a/terminal.py b/terminal.py index bf6e8c3cf1b..17280edc50e 100644 --- a/terminal.py +++ b/terminal.py @@ -154,7 +154,10 @@ def view(l_args, s_ticker, s_start, s_interval, df_stock): dest="n_type", type=check_positive, default=5, # in case it's daily - help="1234 corresponds to types: 1. open; 2. high; 3.low; 4. close; while 14 corresponds to types: 1.open; 4. close", + help=( + "1234 corresponds to types: 1. open; 2. high; 3. low; 4. close; " + "while 14 corresponds to types: 1. open; 4. close" + ), ) try: @@ -228,7 +231,7 @@ def view(l_args, s_ticker, s_start, s_interval, df_stock): plot_view_stock(df_stock.iloc[:, ln_col_idx], ns_parser.s_ticker) -# ----------------------------------------------------- HELP ------------------------------------------------------------------ +# ----------------------------------------------------- HELP ------------------------------------------------------------ def print_help(s_ticker, s_start, s_interval, b_is_market_open): """Print help""" print("What do you want to do?")