From 504bc4490ea689b3211a4e1bf04081f308676859 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 22:03:00 +0000 Subject: [PATCH 1/2] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/pre-commit/pre-commit-hooks: v4.3.0 → v4.5.0](https://github.com/pre-commit/pre-commit-hooks/compare/v4.3.0...v4.5.0) - [github.com/asottile/setup-cfg-fmt: v1.20.1 → v2.5.0](https://github.com/asottile/setup-cfg-fmt/compare/v1.20.1...v2.5.0) - [github.com/PyCQA/flake8: 4.0.1 → 7.0.0](https://github.com/PyCQA/flake8/compare/4.0.1...7.0.0) - https://github.com/myint/autoflake → https://github.com/PyCQA/autoflake - [github.com/PyCQA/autoflake: v1.4 → v2.3.1](https://github.com/PyCQA/autoflake/compare/v1.4...v2.3.1) - [github.com/PyCQA/isort: 5.10.1 → 5.13.2](https://github.com/PyCQA/isort/compare/5.10.1...5.13.2) - [github.com/psf/black: 22.6.0 → 24.3.0](https://github.com/psf/black/compare/22.6.0...24.3.0) - [github.com/asottile/pyupgrade: v2.37.1 → v3.15.1](https://github.com/asottile/pyupgrade/compare/v2.37.1...v3.15.1) --- .pre-commit-config.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8dfe5d7..e9f8643 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,34 +1,34 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.3.0 + rev: v4.5.0 hooks: - id: check-docstring-first - id: end-of-file-fixer - id: trailing-whitespace - repo: https://github.com/asottile/setup-cfg-fmt - rev: v1.20.1 + rev: v2.5.0 hooks: - id: setup-cfg-fmt - repo: https://github.com/PyCQA/flake8 - rev: 4.0.1 + rev: 7.0.0 hooks: - id: flake8 additional_dependencies: [flake8-typing-imports==1.7.0] - - repo: https://github.com/myint/autoflake - rev: v1.4 + - repo: https://github.com/PyCQA/autoflake + rev: v2.3.1 hooks: - id: autoflake args: ["--in-place", "--remove-all-unused-imports"] - repo: https://github.com/PyCQA/isort - rev: 5.10.1 + rev: 5.13.2 hooks: - id: isort - repo: https://github.com/psf/black - rev: 22.6.0 + rev: 24.3.0 hooks: - id: black - repo: https://github.com/asottile/pyupgrade - rev: v2.37.1 + rev: v3.15.1 hooks: - id: pyupgrade args: [--py37-plus, --keep-runtime-typing] From 1ed00fa775c456995957f56722434e5b72dd064e Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 22:03:31 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- llspy/gui/mainwindow.py | 24 +++++++++++++++--------- setup.cfg | 9 ++------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/llspy/gui/mainwindow.py b/llspy/gui/mainwindow.py index 6ca5d1b..ce090d7 100644 --- a/llspy/gui/mainwindow.py +++ b/llspy/gui/mainwindow.py @@ -1421,9 +1421,11 @@ def getValidatedOptions(self): "trimZ": (self.trimZ0SpinBox.value(), self.trimZ1SpinBox.value()), "trimY": (self.trimY0SpinBox.value(), self.trimY1SpinBox.value()), "trimX": (self.trimX0SpinBox.value(), self.trimX1SpinBox.value()), - "nIters": self.iterationsSpinBox.value() - if self.doDeconGroupBox.isChecked() - else 0, + "nIters": ( + self.iterationsSpinBox.value() + if self.doDeconGroupBox.isChecked() + else 0 + ), "napodize": self.apodizeSpinBox.value(), "nzblend": self.zblendSpinBox.value(), # if bRotate == True and rotateAngle is not none: rotate based on sheet angle @@ -1465,9 +1467,11 @@ def getValidatedOptions(self): if self.RegProcessChannelRefModeCombo.currentText() else "none" ), - "otfDir": self.otfFolderLineEdit.text() - if self.otfFolderLineEdit.text() != "" - else None, + "otfDir": ( + self.otfFolderLineEdit.text() + if self.otfFolderLineEdit.text() != "" + else None + ), "compressRaw": self.compressRawCheckBox.isChecked(), "compressionType": self.compressTypeCombo.currentText(), "reprocess": self.reprocessCheckBox.isChecked(), @@ -1862,9 +1866,11 @@ def closeEvent(self, event): box.setCheckBox(pref) pref.stateChanged.connect( - lambda value: self.confirmOnQuitCheckBox.setChecked(False) - if value - else self.confirmOnQuitCheckBox.setChecked(True) + lambda value: ( + self.confirmOnQuitCheckBox.setChecked(False) + if value + else self.confirmOnQuitCheckBox.setChecked(True) + ) ) reply = box.exec_() diff --git a/setup.cfg b/setup.cfg index d416edc..012395b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -7,7 +7,7 @@ url = https://github.com/tlambert03/LLSpy author = Talley Lambert author_email = talley.lambert@gmail.com license = BSD 3-clause -license_file = LICENSE +license_files = LICENSE classifiers = Development Status :: 3 - Alpha Intended Audience :: Science/Research @@ -18,11 +18,6 @@ classifiers = Programming Language :: Python Programming Language :: Python :: 3 Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3.6 - Programming Language :: Python :: 3.7 - Programming Language :: Python :: 3.8 - Programming Language :: Python :: 3.9 - Programming Language :: Python :: 3.10 Topic :: Scientific/Engineering Topic :: Scientific/Engineering :: Visualization @@ -41,7 +36,7 @@ install_requires = voluptuous watchdog numba;python_version < '3.10' -python_requires = >=3.6 +python_requires = >=3.8 include_package_data = True zip_safe = False