merge master into branch fill_between

Author: DanielGoldfarb

examples/scratch_pad/mav_cross_issue518.ipynb

@@ -94,13 +94,9 @@ def _get_valid_plot_types(plottype=None):
 
     if plottype is None:
         return _valid_types_all
-
-    if plottype not in _valid_types_all:
-        return None
     elif plottype in _alias_types:
         return _alias_types[plottype]
-    else:
-        return plottype
+    return plottype
 
 
 def _mav_validator(mav_value):

examples/scratch_pad/plotting.issue508.py

@@ -22,16 +22,16 @@ def _build_panels( figure, config ):
     ------
     The following items are used from `config`:
 
-    num_panels   : integer (0-9) or None
+    num_panels   : integer (0-31) or None
         number of panels to create
 
     addplot      : dict or None
         value for the `addplot=` kwarg passed into `mplfinance.plot()`
 
-    volume_panel : integer (0-9) or None
+    volume_panel : integer (0-31) or None
         panel id (0-number_of_panels)
 
-    main_panel   : integer (0-9) or None
+    main_panel   : integer (0-31) or None
         panel id (0-number_of_panels)
 
     panel_ratios : sequence or None
@@ -68,7 +68,7 @@ def _build_panels( figure, config ):
     panel_ratios = config['panel_ratios']
 
     if not _valid_panel_id(main_panel):
-        raise ValueError('main_panel id must be integer 0 to 9, but is '+str(main_panel))
+        raise ValueError('main_panel id must be integer 0 to 31, but is '+str(main_panel))
 
     if num_panels is None:  # then infer the number of panels:
         pset = {0} # start with a set including only panel zero
@@ -85,12 +85,12 @@ def _build_panels( figure, config ):
                 if panel in backwards_panel_compatibility:
                     panel = backwards_panel_compatibility[panel]
                 if not _valid_panel_id(panel):
-                    raise ValueError('addplot panel must be integer 0 to 9, but is "'+str(panel)+'"')
+                    raise ValueError('addplot panel must be integer 0 to 31, but is "'+str(panel)+'"')
                 pset.add(panel)
 
         if volume is True:
             if not _valid_panel_id(volume_panel):
-                raise ValueError('volume_panel must be integer 0 to 9, but is "'+str(volume_panel)+'"')
+                raise ValueError('volume_panel must be integer 0 to 31, but is "'+str(volume_panel)+'"')
             pset.add(volume_panel)
 
         pset.add(main_panel)

examples/styles.ipynb

@@ -66,7 +66,7 @@ def _valid_make_mpf_style_kwargs():
 
         'base_mpl_style': { 'Default'     : None,
                             'Description' : 'matplotlib style to use as base of new mplfinance style',
-                            'Validator'   : lambda value: isinstance(value,str) }, # and is in plt.style.available
+                            'Validator'   : lambda value: isinstance(value,(str,list))}, # and is in plt.style.available
 
         'marketcolors'  : { 'Default'     : None,
                             'Description' : 'market colors object, from `mpf.make_market_colors()`',

examples/using_lines.ipynb

@@ -557,7 +557,6 @@ def _construct_ohlc_collections(dates, opens, highs, lows, closes, marketcolors=
 
     if marketcolors is None:
         mktcolors = _get_mpfstyle('classic')['marketcolors']['ohlc']
-        #print('default mktcolors=',mktcolors)
     else:
         mktcolors = marketcolors['ohlc']
 
@@ -635,7 +634,6 @@ def _construct_candlestick_collections(dates, opens, highs, lows, closes, market
 
     if marketcolors is None:
         marketcolors = _get_mpfstyle('classic')['marketcolors']
-        #print('default market colors:',marketcolors)
 
     datalen = len(dates)
 
@@ -719,7 +717,6 @@ def _construct_hollow_candlestick_collections(dates, opens, highs, lows, closes,
 
     if marketcolors is None:
         marketcolors = _get_mpfstyle('classic')['marketcolors']
-        #print('default market colors:',marketcolors)
 
     datalen = len(dates)
 
@@ -828,7 +825,6 @@ def _construct_renko_collections(dates, highs, lows, volumes, config_renko_param
     renko_params = _process_kwargs(config_renko_params, _valid_renko_kwargs())
     if marketcolors is None:
         marketcolors = _get_mpfstyle('classic')['marketcolors']
-        #print('default market colors:',marketcolors)
 
     brick_size = renko_params['brick_size']
     atr_length = renko_params['atr_length']
@@ -1005,7 +1001,6 @@ def _construct_pointnfig_collections(dates, highs, lows, volumes, config_pointnf
     pointnfig_params = _process_kwargs(config_pointnfig_params, _valid_pnf_kwargs())
     if marketcolors is None:
         marketcolors = _get_mpfstyle('classic')['marketcolors']
-        #print('default market colors:',marketcolors)
 
     box_size = pointnfig_params['box_size']
     atr_length = pointnfig_params['atr_length']
@@ -1218,9 +1213,6 @@ def _construct_aline_collections(alines, dtix=None):
     else:
         aconfig = _process_kwargs({}, _valid_lines_kwargs())
 
-    #print('aconfig=',aconfig)
-    #print('alines=',alines)
-
     alines = _alines_validator(alines, returnStandardizedValue=True)
     if alines is None:
         raise ValueError('Unable to standardize alines value: '+str(alines))
@@ -1403,6 +1395,7 @@ def _construct_tline_collections(tlines, dtix, dates, opens, highs, lows, closes
     # reconstruct the data frame:
     df = pd.DataFrame({'open':opens,'high':highs,'low':lows,'close':closes},
                       index=pd.DatetimeIndex(mdates.num2date(dates))   )
+    df.index = df.index.tz_localize(None)
 
     # possible `tvalue`s : close,open,high,low,oc_avg,hl_avg,ohlc_avg,hilo
     #          'hilo' means high on the up trend, low on the down trend.
@@ -1436,7 +1429,7 @@ def _tline_lsq(dfslice,tline_use):
         x1, x2 = xs[0], xs[-1]
         y1 = m*x1 + b
         y2 = m*x2 + b
-        x1, x2 = mdates.num2date(x1), mdates.num2date(x2)
+        x1, x2 = mdates.num2date(x1).replace(tzinfo=None), mdates.num2date(x2).replace(tzinfo=None)
         return ((x1,y1),(x2,y2))
 
     if isinstance(tline_use,str):

src/mplfinance/_arg_validators.py

@@ -1,5 +1,4 @@
-
-version_info = (0, 12, 9, 'beta', 0)
+version_info = (0, 12, 8, 'beta', 11)
 
 _specifier_ = {'alpha': 'a','beta': 'b','candidate': 'rc','final': ''}
 

src/mplfinance/_panels.py

@@ -857,18 +857,18 @@ def plot( data, **kwargs ):
         save = config['savefig']
         if isinstance(save,dict):
             if config['tight_layout'] and 'bbox_inches' not in save:
-                plt.savefig(**save,bbox_inches='tight')
+                fig.savefig(**save,bbox_inches='tight')
             else:
-                plt.savefig(**save)
+                fig.savefig(**save)
         else:
             if config['tight_layout']:
-                plt.savefig(save,bbox_inches='tight')
+                fig.savefig(save,bbox_inches='tight')
             else:
-                plt.savefig(save)
+                fig.savefig(save)
         if config['closefig']: # True or 'auto'
             plt.close(fig)
     elif not config['returnfig']:
-        plt.show(block=config['block']) # https://stackoverflow.com/a/13361748/1639359 
+        plt.show(block=config['block']) # https://stackoverflow.com/a/13361748/1639359
         if config['closefig'] == True or (config['block'] and config['closefig']):
             plt.close(fig)