Add FLY to ruff

holoviews/core/data/__init__.py

@@ -905,7 +905,7 @@ def aggregate(self, dimensions=None, function=None, spreadfn=None, **kwargs):
         if not self:
             if spreadfn:
                 spread_name = spreadfn.__name__
-                vdims = [d for vd in self.vdims for d in [vd, vd.clone('_'.join([vd.name, spread_name]))]]
+                vdims = [d for vd in self.vdims for d in [vd, vd.clone(f'{vd.name}_{spread_name}')]]
             else:
                 vdims = self.vdims
             if not kdims and len(vdims) == 1:
@@ -924,7 +924,7 @@ def aggregate(self, dimensions=None, function=None, spreadfn=None, **kwargs):
             error = self.clone(error, kdims=kdims, new_type=Dataset)
             combined = self.clone(aggregated, kdims=kdims, new_type=Dataset)
             for i, d in enumerate(vdims):
-                dim = d.clone('_'.join([d.name, spread_name]))
+                dim = d.clone(f'{d.name}_{spread_name}')
                 dvals = error.dimension_values(d, flat=False)
                 idx = vdims.index(d)
                 combined = combined.add_dimension(dim, idx+1, dvals, True)

holoviews/core/data/interface.py

@@ -15,7 +15,7 @@ class DataError(ValueError):
 
     def __init__(self, msg, interface=None):
         if interface is not None:
-            msg = '\n\n'.join([msg, interface.error()])
+            msg = f"{msg}\n\n{interface.error()}"
         super().__init__(msg)
 
 
@@ -263,7 +263,7 @@ def initialize(cls, eltype, data, kdims, vdims, datatype=None):
             if priority_errors:
                 intfc, e, _ = priority_errors[0]
                 priority_error = f"{intfc.__name__} raised following error:\n\n {e}"
-                error = ' '.join([error, priority_error])
+                error = f"{error} {priority_error}"
                 raise DataError(error, intfc).with_traceback(sys.exc_info()[2])
             raise DataError(error)
 

holoviews/core/io.py

@@ -862,7 +862,7 @@ def contents(self, maxlen=70):
 
     def listing(self):
         "Return a list of filename entries currently in the archive"
-        return ['.'.join([f,ext]) if ext else f for (f,ext) in self._files.keys()]
+        return [f'{f}.{ext}' if ext else f for (f,ext) in self._files.keys()]
 
     def clear(self):
         "Clears the file archive"

holoviews/core/pprint.py

@@ -209,7 +209,7 @@ def target_info(cls, obj, ansi=False):
         target_footer = ("\nTo see the options info for one of these target specifications,"
                          "\nwhich are of the form {type}[.{group}[.{label}]], do holoviews.help({type}).")
 
-        return '\n'.join([heading, target_header, target_info, target_footer])
+        return f'{heading}\n{target_header}\n{target_info}\n{target_footer}'
 
 
     @classmethod

holoviews/ipython/magics.py

@@ -222,7 +222,7 @@ def line_completer(cls, line, completions, compositor_defs):
 
         verbose_openers = ['style(', 'plot[', 'norm{']
         if suggestions and line.endswith('.'):
-            return ['.'.join([completion_key, el]) for el in suggestions]
+            return [f"{completion_key}.{el}" for el in suggestions]
         elif not completion_key:
             return type_keys + list(compositor_defs.keys()) + verbose_openers
 

holoviews/plotting/bokeh/annotation.py

@@ -349,7 +349,7 @@ def _init_glyph(self, plot, mapping, properties, key):
                 for t in ('line', 'fill'):
                     if v is None:
                         continue
-                    key = '_'.join([t, p])
+                    key = f'{t}_{p}'
                     if key not in properties:
                         properties[key] = v
             start = arrow_start(**properties) if arrow_start else None

holoviews/plotting/bokeh/links.py

@@ -44,7 +44,7 @@ def __init__(self, root_model, link, source_plot, target_plot=None):
                       if k not in ('source', 'target', 'name')}
 
         for sh in self.source_handles+[self.source_model]:
-            key = '_'.join(['source', sh])
+            key = f'source_{sh}'
             references[key] = source_plot.handles[sh]
 
         for p, value in link.param.values().items():
@@ -54,7 +54,7 @@ def __init__(self, root_model, link, source_plot, target_plot=None):
 
         if target_plot is not None:
             for sh in self.target_handles+[self.target_model]:
-                key = '_'.join(['target', sh])
+                key = f'target_{sh}'
                 references[key] = target_plot.handles[sh]
 
         if self.source_model in source_plot.handles:

holoviews/plotting/bokeh/stats.py

@@ -359,7 +359,7 @@ class ViolinPlot(BoxWhiskerPlot):
                    for glyph in ('violin_', 'box_')] +
                   [glyph+p for p in base_properties+line_properties
                    for glyph in ('stats_', 'outline_')] +
-                  ['_'.join([glyph, p]) for p in ('color', 'alpha')
+                  [f'{glyph}_{p}' for p in ('color', 'alpha')
                    for glyph in ('box', 'violin', 'stats', 'median')] +
                   ['cmap', 'box_cmap', 'violin_cmap'])
 

holoviews/plotting/bokeh/styles.py

@@ -26,11 +26,11 @@
 
 line_properties = ['line_color', 'line_alpha', 'color', 'alpha', 'line_width',
                    'line_join', 'line_cap', 'line_dash']
-line_properties += ['_'.join([prefix, prop]) for prop in line_properties
+line_properties += [f'{prefix}_{prop}' for prop in line_properties
                     for prefix in property_prefixes]
 
 fill_properties = ['fill_color', 'fill_alpha']
-fill_properties += ['_'.join([prefix, prop]) for prop in fill_properties
+fill_properties += [f'{prefix}_{prop}' for prop in fill_properties
                     for prefix in property_prefixes]
 
 text_properties = ['text_font', 'text_font_size', 'text_font_style', 'text_color',

holoviews/plotting/bokeh/util.py

@@ -638,7 +638,7 @@ def py2js_tickformatter(formatter, msg=''):
     args = inspect.getfullargspec(formatter).args
     arg_define = f'var {args[0]} = tick;' if args else ''
     return_js = 'return formatter();\n'
-    jsfunc = '\n'.join([arg_define, jscode, return_js])
+    jsfunc = f"{arg_define}\n{jscode}\n{return_js}"
     match = re.search(r'(formatter \= function flx_formatter \(.*\))', jsfunc)
     return jsfunc[:match.start()] + 'formatter = function ()' + jsfunc[match.end():]
 

holoviews/plotting/renderer.py

@@ -588,7 +588,7 @@ def save(self_or_cls, obj, basename, fmt='auto', key={}, info={},
                 if title is None:
                     title = os.path.basename(basename)
                 if fmt in MIME_TYPES:
-                    basename = '.'.join([basename, fmt])
+                    basename = f"{basename}.{fmt}"
             plot.layout.save(basename, embed=True, resources=resources, title=title)
             return
 

holoviews/plotting/util.py

@@ -329,7 +329,7 @@ def undisplayable_info(obj, html=False):
         remedy = f"Please call the {collate} method on the appropriate elements."
 
     if not html:
-        return '\n'.join([error, remedy, info])
+        return f'{error}\n{remedy}\n{info}'
     else:
         return "<center>{msg}</center>".format(msg=('<br>'.join(
             ['<b>%s</b>' % error, remedy, '<i>%s</i>' % info])))

pyproject.toml

@@ -34,6 +34,7 @@ target-version = "py37"
 select = [
     "E",
     "F",
+    "FLY",
     "ICN",
     "PLC",
     "PLE",