From 5d83ddf561a4910cf5612d28b5f873bcccbbcc30 Mon Sep 17 00:00:00 2001 From: Kevin Johnson Date: Sun, 4 Jul 2021 09:58:14 -0700 Subject: [PATCH] MAINT hwc colum renaming and reqs update --- .gitignore | 5 +++-- pandas_ta/volatility/hwc.py | 16 ++++++++-------- requirements.txt | 7 +++++-- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 5d12990..dc05d78 100644 --- a/.gitignore +++ b/.gitignore @@ -131,7 +131,6 @@ AlphaVantageAPI/ # Data & NB Exclusions *.csv -jnb/*.ipynb data/datas.csv data/f500.csv data/GLD_D_tv.csv @@ -142,4 +141,6 @@ data/SPY_D_TV2.csv data/SPY_D_TV3.csv data/TV_5min.csv data/tulip.csv -examples/*.csv \ No newline at end of file +examples/*.csv +jnb/*.ipynb +jnb/*.txt \ No newline at end of file diff --git a/pandas_ta/volatility/hwc.py b/pandas_ta/volatility/hwc.py index e531aae..b539c9c 100644 --- a/pandas_ta/volatility/hwc.py +++ b/pandas_ta/volatility/hwc.py @@ -85,25 +85,25 @@ def hwc(close, na=None, nb=None, nc=None, nd=None, scalar=None, channel_eval=Non # Name and Categorize it # suffix = f'{str(na).replace(".", "")}-{str(nb).replace(".", "")}-{str(nc).replace(".", "")}' - hwc.name = 'HW-MID' - hwc_upper.name = "HW-UPPER" - hwc_lower.name = "HW-LOWER" + hwc.name = "HWM" + hwc_upper.name = "HWU" + hwc_lower.name = "HWL" hwc.category = hwc_upper.category = hwc_lower.category = "volatility" if channel_eval: - hwc_width.name = 'HW-WIDTH' - hwc_pctwidth.name = 'HW-PCTW' + hwc_width.name = "HWW" + hwc_pctwidth.name = "HWPCT" # Prepare DataFrame to return if channel_eval: data = {hwc.name: hwc, hwc_upper.name: hwc_upper, hwc_lower.name: hwc_lower, hwc_width.name: hwc_width, hwc_pctwidth.name: hwc_pctwidth} df = DataFrame(data) - df.name = "hwc" + df.name = "HWC" df.category = hwc.category else: data = {hwc.name: hwc, hwc_upper.name: hwc_upper, hwc_lower.name: hwc_lower} df = DataFrame(data) - df.name = "hwc" + df.name = "HWC" df.category = hwc.category return df @@ -149,5 +149,5 @@ Kwargs: fillna (value, optional): pd.DataFrame.fillna(value) fill_method (value, optional): Type of fill method Returns: - pd.DataFrame: HW-MID, HW-UPPER, HW-LOWER columns. + pd.DataFrame: HWM (Mid), HWU (Upper), HWL (Lower) columns. """ diff --git a/requirements.txt b/requirements.txt index 21c37a1..2fbbcc6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,5 @@ -numpy>=1.20.2 -pandas>=1.2.4 \ No newline at end of file +numpy==1.21.0 +pandas==1.3.0 +python-dateutil==2.8.1 +pytz==2021.1 +six==1.16.0