Skip to content

Commit

Permalink
Futher flaking changes with autopep8 E101,E126,E128,E225,E231,E261,E3…
Browse files Browse the repository at this point in the history
…03,E402,W391
  • Loading branch information
i-am-mounce committed Dec 5, 2023
1 parent d2b2aa2 commit af87bd5
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 14 deletions.
14 changes: 6 additions & 8 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,9 @@
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = [
'sphinx.ext.autodoc',
'sphinx.ext.coverage',
'numpydoc',
]
'sphinx.ext.autodoc',
'sphinx.ext.coverage',
'numpydoc']

numpydoc_show_inherited_class_members = False
numpydoc_class_members_toctree = False
Expand Down Expand Up @@ -64,10 +63,9 @@
html_static_path = ['_static']

html_theme_options = {
"logo": { #"link": "https://matplotlib.org/stable/",
"image_light": "_static/pyscan logo v3.svg",
"image_dark": "_static/pyscan logo v3.svg",
},
"logo": { # "link": "https://matplotlib.org/stable/",
"image_light": "_static/pyscan logo v3.svg",
"image_dark": "_static/pyscan logo v3.svg"},
# collapse_navigation in pydata-sphinx-theme is slow, so skipped for local
# and CI builds https://github.com/pydata/pydata-sphinx-theme/pull/386
# "collapse_navigation": not is_release_build,
Expand Down
1 change: 0 additions & 1 deletion pyscan/drivers/keysitem3302aawg.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ def set_channel_trigger_config(self, channel, source=0, behavior=3):
def set_channel_awg_from_array(
self, channel, trigger_mode, start_delay, cycles, prescalar, waveform_type,
waveform_data_A, waveform_data_B=None, padding_mode=0):

'''
Parameters
----------
Expand Down
9 changes: 4 additions & 5 deletions pyscan/drivers/princetonpimax4.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
===============
"""

from PrincetonInstruments.LightField.AddIns import Pulse
from PrincetonInstruments.LightField.AddIns import ExperimentSettings
from PrincetonInstruments.LightField.AddIns import CameraSettings
from PrincetonInstruments.LightField.Automation import Automation
from pyscan.general.itemattribute import ItemAttribute

import clr
Expand All @@ -20,11 +24,6 @@
clr.AddReference('PrincetonInstruments.LightField.AutomationV5')
clr.AddReference('PrincetonInstruments.LightFieldAddInSupportServices')

from PrincetonInstruments.LightField.Automation import Automation
from PrincetonInstruments.LightField.AddIns import CameraSettings
from PrincetonInstruments.LightField.AddIns import ExperimentSettings
from PrincetonInstruments.LightField.AddIns import Pulse


class PrincetonPiMax4(ItemAttribute):
'''Class to control Princeton Instruments PI MAX 4 camera
Expand Down

0 comments on commit af87bd5

Please sign in to comment.