Result of running ruff check --fix

Author: ptsOSL

docs/conf.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Configuration file for the Sphinx documentation builder.
 #
@@ -14,18 +13,18 @@
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
+sys.path.append(os.path.join(os.path.dirname(__file__), ".."))
 
 # -- Project information -----------------------------------------------------
 
-project = u'ATIP'
-copyright = u'2019, Tobyn Nicholls'
-author = u'Tobyn Nicholls'
+project = "ATIP"
+copyright = "2019, Tobyn Nicholls"
+author = "Tobyn Nicholls"
 
 # The short X.Y version
-version = u'1.0'
+version = "1.0"
 # The full version, including alpha/beta/rc tags
-release = u'1.0'
+release = "1.0"
 
 
 # -- General configuration ---------------------------------------------------
@@ -38,49 +37,49 @@
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
-    'sphinx.ext.autodoc',
-    'sphinx.ext.intersphinx',
-    'sphinx.ext.napoleon',
-    'sphinx.ext.viewcode',
+    "sphinx.ext.autodoc",
+    "sphinx.ext.intersphinx",
+    "sphinx.ext.napoleon",
+    "sphinx.ext.viewcode",
 ]
 
 # Include both class and __init__() docstrings.
-autoclass_content = 'both'
+autoclass_content = "both"
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ["_templates"]
 
 # The suffix(es) of source filenames.
 # You can specify multiple suffix as a list of string:
 #
 # source_suffix = ['.rst', '.md']
-source_suffix = '.rst'
+source_suffix = ".rst"
 
 # The master toctree document.
-master_doc = 'index'
+master_doc = "index"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-language = 'en'
+language = "en"
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 # This pattern also affects html_static_path and html_extra_path.
-exclude_patterns = ['_build']
+exclude_patterns = ["_build"]
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = "sphinx"
 
 
 # -- Options for HTML output -------------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-html_theme = 'sphinx_rtd_theme'
+html_theme = "sphinx_rtd_theme"
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
@@ -91,7 +90,7 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path = ['_static']
+# html_static_path = ['_static']
 
 # Custom sidebar templates, must be a dictionary that maps document names
 # to template names.
@@ -107,7 +106,7 @@
 # -- Options for HTMLHelp output ---------------------------------------------
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'docsdoc'
+htmlhelp_basename = "docsdoc"
 
 
 # -- Options for LaTeX output ------------------------------------------------
@@ -116,15 +115,12 @@
     # The paper size ('letterpaper' or 'a4paper').
     #
     # 'papersize': 'letterpaper',
-
     # The font size ('10pt', '11pt' or '12pt').
     #
     # 'pointsize': '10pt',
-
     # Additional stuff for the LaTeX preamble.
     #
     # 'preamble': '',
-
     # Latex figure (float) alignment
     #
     # 'figure_align': 'htbp',
@@ -134,19 +130,15 @@
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, 'docs.tex', u'ATIP Documentation',
-     u'Tobyn Nicholls', 'manual'),
+    (master_doc, "docs.tex", "ATIP Documentation", "Tobyn Nicholls", "manual"),
 ]
 
 
 # -- Options for manual page output ------------------------------------------
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [
-    (master_doc, 'docs', u'ATIP Documentation',
-     [author], 1)
-]
+man_pages = [(master_doc, "docs", "ATIP Documentation", [author], 1)]
 
 
 # -- Options for Texinfo output ----------------------------------------------
@@ -155,9 +147,15 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, 'docs', u'ATIP Documentation',
-     author, 'docs', 'ATIP - Accelerator Toolbox Interface for Pytac.',
-     'Accelerator Physics'),
+    (
+        master_doc,
+        "docs",
+        "ATIP Documentation",
+        author,
+        "docs",
+        "ATIP - Accelerator Toolbox Interface for Pytac.",
+        "Accelerator Physics",
+    ),
 ]
 
 
@@ -176,7 +174,7 @@
 # epub_uid = ''
 
 # A list of files that should not be packed into the epub file.
-epub_exclude_files = ['search.html']
+epub_exclude_files = ["search.html"]
 
 
 # -- Extension configuration -------------------------------------------------
@@ -185,7 +183,7 @@
 
 # Example configuration for intersphinx: refer to the Python standard library.
 intersphinx_mapping = {
-    'python': ('https://docs.python.org/', None),
-    'pytac': ('https://pytac.readthedocs.io/en/latest/', None),
-    'cothread': ('https://cothread.readthedocs.io/en/latest/', None)
+    "python": ("https://docs.python.org/", None),
+    "pytac": ("https://pytac.readthedocs.io/en/latest/", None),
+    "cothread": ("https://cothread.readthedocs.io/en/latest/", None),
 }

src/atip/simulator.py

@@ -60,7 +60,7 @@ def calculate_optics(
     return LatticeData(twiss, beamdata.tune, beamdata.chromaticity, emitdata, radint)
 
 
-class ATSimulator(object):
+class ATSimulator:
     """A centralised class which makes use of AT to simulate the physics data
     for the copy of the AT lattice which it holds. It works as follows, when a
     change is made to the lattice in Pytac it is added to the queue attribute

src/atip/utils.py

@@ -73,7 +73,7 @@ def preload_at(at_lat):
     class elems:
         pass
 
-    setattr(elems, "all", [elem for elem in at_lat])
+    elems.all = [elem for elem in at_lat]
     elems_dict = {
         type_: []
         for type_ in [
@@ -120,7 +120,7 @@ def preload(pytac_lat):
     class elems:
         pass
 
-    setattr(elems, "all", pytac_lat.get_elements())
+    elems.all = pytac_lat.get_elements()
     for family in pytac_lat.get_all_families():
         setattr(elems, family, pytac_lat.get_elements(family))
     return elems

src/virtac/atip_server.py

@@ -15,7 +15,7 @@
 from .mirror_objects import collate, refresher, summate, transform
 
 
-class ATIPServer(object):
+class ATIPServer:
     """A soft-ioc server allowing ATIP to be interfaced using EPICS, in the
     same manner as the live machine.
 

src/virtac/create_csv.py

@@ -235,7 +235,9 @@ def generate_tune_pvs(lattice):
     for pv in tune_pvs:
         offset_pvs.append(":".join([pv.split(":")[0], "OFFSET1"]))
         delta_pvs.append(f"SR-CS-TFB-01:{pv[2:4]}{pv[9:12]}{pv[13:15]}:I")
-    for tune_pv, offset_pv, delta_pv in zip(tune_pvs, offset_pvs, delta_pvs):
+    for tune_pv, offset_pv, delta_pv in zip(
+        tune_pvs, offset_pvs, delta_pvs, strict=False
+    ):
         data.append((tune_pv, offset_pv, delta_pv))
     return data
 

src/virtac/masks.py

@@ -1,7 +1,7 @@
 from cothread.catools import caget, caput
 
 
-class callback_offset(object):
+class callback_offset:
     """A class to hold a method to be passed as a callback to camonitor."""
 
     def __init__(self, server, quad_pv, offset_record):
@@ -31,7 +31,7 @@ def callback(self, value, index=None):
         self.server.refresh_record(self.quad_pv)
 
 
-class callback_set(object):
+class callback_set:
     """A class to hold a method to be passed as a callback to camonitor."""
 
     def __init__(self, output):
@@ -52,7 +52,7 @@ def callback(self, value, index=None):
             record.set(value)
 
 
-class caget_mask(object):
+class caget_mask:
     """A mask for caget so it can comply with the record.get() syntax."""
 
     def __init__(self, pv):
@@ -67,7 +67,7 @@ def get(self):
         return caget(self.pv)
 
 
-class caput_mask(object):
+class caput_mask:
     """A mask for caput so it can comply with the record.set(value) syntax."""
 
     def __init__(self, pv):

src/virtac/mirror_objects.py

@@ -1,7 +1,7 @@
 import numpy
 
 
-class summate(object):
+class summate:
     """This class is designed to be passed instead of a mirror record, when its
     set method is then called it takes the sum of all the input records and
     sets it to the output record.
@@ -27,7 +27,7 @@ def set(self, value=None):
         self.output_record.set(value)
 
 
-class collate(object):
+class collate:
     """This class is designed to be passed instead of a mirror record, when its
     set method is then called it gets the values of all the input records and
     combines them in order before setting the combined array to the output
@@ -55,7 +55,7 @@ def set(self, value=None):
         self.output_record.set(value)
 
 
-class transform(object):
+class transform:
     """This class is designed to be passed instead of a mirror record, when its
     set method is then called it applies the held transformation and then sets
     the new value to the held output record.
@@ -85,7 +85,7 @@ def set(self, value):
         self.output_record.set(value)
 
 
-class refresher(object):
+class refresher:
     """This class is designed to be passed instead of a mirror record, when its
     set method is then called it refreshes the held PV on the held server.
     """

tests/test_at_simulator_object.py

@@ -1,6 +1,7 @@
+from unittest import mock
+
 import at
 import cothread
-import mock
 import numpy
 import pytest
 from pytac.exceptions import DataSourceException, FieldException
@@ -225,7 +226,7 @@ def test_get_at_element(atsim, at_lattice):
 
 
 def test_get_at_lattice(atsim, at_lattice):
-    for elem1, elem2 in zip(atsim.get_at_lattice(), atsim._at_lat):
+    for elem1, elem2 in zip(atsim.get_at_lattice(), atsim._at_lat, strict=False):
         assert elem1 == elem2
 
 

tests/test_element_data_source.py

@@ -1,5 +1,6 @@
+from unittest import mock
+
 import at
-import mock
 import pytest
 from pytac.exceptions import ControlSystemException, FieldException, HandleException
 from testfixtures import LogCapture

tests/test_lattice_data_source.py

@@ -1,4 +1,5 @@
-import mock
+from unittest import mock
+
 import pytest
 from pytac.exceptions import ControlSystemException, FieldException, HandleException
 from testfixtures import LogCapture