Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
repos:
- repo: https://github.com/psf/black
rev: 23.11.0 # Replace by any tag/version: https://github.com/psf/black/tags
- repo: https://github.com/psf/black-pre-commit-mirror
rev: 26.5.1 # Replace by any tag/version: https://github.com/psf/black/tags
hooks:
- id: black
language_version: python3 # Should be a command that runs python3.6+
args: ["--line-length", "99"]

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
rev: v6.0.0
hooks:
- id: trailing-whitespace
exclude: datasets|.data$
Expand Down
1 change: 0 additions & 1 deletion yaqc_cmds/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
"""Unified software for controlling hardware and collecting data in the Wright group."""


from .__version__ import *
from .project import *
2 changes: 0 additions & 2 deletions yaqc_cmds/__version__.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
"""Define version."""


import pathlib
import subprocess


here = pathlib.Path(__file__).resolve().parent

__all__ = ["__version__", "__branch__"]
Expand Down
2 changes: 0 additions & 2 deletions yaqc_cmds/_main_window.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import os
import pathlib


#### import ###################################################################
# BEWARE OF CHANGING ORDER OF IMPORTS!!!!!!!!!

Expand All @@ -33,7 +32,6 @@

import yaqc


### define ####################################################################


Expand Down
1 change: 0 additions & 1 deletion yaqc_cmds/hardware/delays.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import yaqc_cmds.project.classes as pc
import yaqc_cmds.hardware.hardware as hw


# --- driver --------------------------------------------------------------------------------------


Expand Down
2 changes: 1 addition & 1 deletion yaqc_cmds/hardware/hardware.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Parent hardware class and associated.
"""

__all__ = ["Driver", "GUI", "Hardware", "import_hardwares"]


Expand All @@ -23,7 +24,6 @@
from yaqc_cmds.project import widgets as pw
from yaqc_cmds.project import project_globals as g


__here__ = pathlib.Path(__file__)


Expand Down
1 change: 0 additions & 1 deletion yaqc_cmds/hardware/opas.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
from yaqc_cmds.hardware import hardware as hw
from yaqc_cmds.somatic import signals


### driver ####################################################################


Expand Down
1 change: 0 additions & 1 deletion yaqc_cmds/hardware/spectrometers.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import toml
import yaqc


### driver ####################################################################


Expand Down
1 change: 0 additions & 1 deletion yaqc_cmds/project/classes.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

import WrightTools.units as wt_units


__here__ = pathlib.Path(__file__).parent


Expand Down
2 changes: 0 additions & 2 deletions yaqc_cmds/project/file_dialog_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
QFileDialog objects can only be run in the main thread.
"""


### imports ###################################################################


Expand All @@ -15,7 +14,6 @@
from yaqc_cmds.project import project_globals as g
from yaqc_cmds.project import classes as pc


### FileDialog object #########################################################


Expand Down
2 changes: 0 additions & 2 deletions yaqc_cmds/project/kit.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@
a collection of small, general purpose objects and methods
"""


### import ####################################################################


import numpy as np


### math ######################################################################


Expand Down
1 change: 0 additions & 1 deletion yaqc_cmds/project/slack/slack.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import yaqc_cmds.project.project_globals as g
from . import bots


### container objects #########################################################


Expand Down
1 change: 0 additions & 1 deletion yaqc_cmds/sensors/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
from ._sensors import Sensor, Driver, SensorWidget
import yaqc_cmds.__main__


sensors = []
config = yaqc_cmds.__main__.config

Expand Down
1 change: 0 additions & 1 deletion yaqc_cmds/sensors/_sensors.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
"""Sensors."""


import appdirs
import pathlib
import time
Expand Down
1 change: 0 additions & 1 deletion yaqc_cmds/somatic/_wt5.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
"""wt5 data file functions"""


import time
import threading

Expand Down
2 changes: 0 additions & 2 deletions yaqc_cmds/somatic/acquisition.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
Acquisition infrastructure shared by all modules.
"""


### import ####################################################################


Expand Down Expand Up @@ -40,7 +39,6 @@

from . import constant_resolver


### define ####################################################################


Expand Down
3 changes: 1 addition & 2 deletions yaqc_cmds/somatic/modules/abstract_tuning.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ def process(self, scan_folder):
reference_image=str(pathlib.Path(scan_folder) / self.reference_image),
)

def _process(self, data, curve, channel, gtol, ltol, level, scan_folder, config):
...
def _process(self, data, curve, channel, gtol, ltol, level, scan_folder, config): ...

@property
def config_dictionary(self):
Expand Down
1 change: 0 additions & 1 deletion yaqc_cmds/somatic/modules/home.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import somatic.acquisition as acquisition
import yaqc_cmds.hardware.opas as opas


### define ####################################################################


Expand Down
1 change: 0 additions & 1 deletion yaqc_cmds/somatic/modules/motortune.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import yaqc_cmds.sensors as sensors
from yaqc_cmds.somatic import _wt5


### define ####################################################################


Expand Down
1 change: 0 additions & 1 deletion yaqc_cmds/somatic/modules/set_shutter.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import yaqc_cmds.somatic.acquisition as acquisition
import yaqc_cmds.hardware.opas as opas


### define ####################################################################


Expand Down
1 change: 0 additions & 1 deletion yaqc_cmds/somatic/modules/tune_holistic.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import yaqc_cmds.project.classes as pc
import yaqc_cmds.hardware.opas as opas


### define ####################################################################


Expand Down
1 change: 0 additions & 1 deletion yaqc_cmds/somatic/modules/tune_intensity.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

import somatic.modules.abstract_tuning as abstract_tuning


module_name = "TUNE INTENSITY"


Expand Down
1 change: 0 additions & 1 deletion yaqc_cmds/somatic/modules/zero_tune.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
all_hardwares = opas.hardwares + spectrometers.hardwares + delays.hardwares + filters.hardwares
import yaqc_cmds.devices.devices as devices


### define ####################################################################


Expand Down