From 230b38fe023bf72d6ac7b93f669f82a5501e3d89 Mon Sep 17 00:00:00 2001 From: RyanAugust Date: Thu, 30 Apr 2026 18:32:00 +0000 Subject: [PATCH] precommit update w/ docs update --- .pre-commit-config.yaml | 25 ++++++++++++++++--------- LICENSE | 2 +- docs/Makefile | 2 +- docs/source/conf.py | 4 ++-- docs/source/study.rst | 1 - logging.conf | 2 +- src/pysimmmulator/simulate.py | 1 - tests/test_edge_cases.py | 1 - 8 files changed, 21 insertions(+), 17 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c8d9f54..75cc17b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,22 +1,29 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 # this is optional, use `pre-commit autoupdate` to get the latest rev! + rev: v5.0.0 hooks: - - id: check-yaml - - id: end-of-file-fixer - - id: trailing-whitespace + - id: check-yaml + - id: end-of-file-fixer + - id: trailing-whitespace - - repo: local + - repo: https://github.com/astral-sh/ruff-pre-commit + rev: v0.9.10 hooks: - id: ruff - name: ruff - entry: python3 -m ruff check ./src + args: [ --fix ] + + - repo: local + hooks: + - id: pylint + name: pylint + entry: pylint --disable=all -e W0311 -e C0303 --jobs=0 --indent-string=' ' --recursive=y ./src language: system + types: [python] always_run: true pass_filenames: false - id: tests name: tests - entry: pytest tests + entry: bash -c "PYTHONPATH=src pytest tests/" language: system - always_run: false + always_run: true pass_filenames: false diff --git a/LICENSE b/LICENSE index 6bd4055..aed0439 100644 --- a/LICENSE +++ b/LICENSE @@ -1,2 +1,2 @@ YEAR: 2024 -COPYRIGHT HOLDER: Ryan Duecker \ No newline at end of file +COPYRIGHT HOLDER: Ryan Duecker diff --git a/docs/Makefile b/docs/Makefile index 269cadc..d0c3cbf 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -17,4 +17,4 @@ help: # Catch-all target: route all unknown targets to Sphinx using the new # "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS). %: Makefile - @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) \ No newline at end of file + @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) diff --git a/docs/source/conf.py b/docs/source/conf.py index 797d6b7..b69c5f7 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -10,7 +10,7 @@ project = 'PySiMMMulator' copyright = '2024, Ryan Duecker' author = 'Ryan Duecker' -release = pysimmmulator.__version__ +release = pysimmmulator.__version__ # -- General configuration --------------------------------------------------- # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration @@ -26,4 +26,4 @@ # https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output html_theme = 'sphinx_rtd_theme' -html_static_path = ['_static'] \ No newline at end of file +html_static_path = ['_static'] diff --git a/docs/source/study.rst b/docs/source/study.rst index 8fdc229..22cef4f 100644 --- a/docs/source/study.rst +++ b/docs/source/study.rst @@ -7,4 +7,3 @@ Studies .. automodule:: pysimmmulator.study :members: :undoc-members: - diff --git a/logging.conf b/logging.conf index 33ba362..eefa7b0 100644 --- a/logging.conf +++ b/logging.conf @@ -24,4 +24,4 @@ formatter=pysimmmulatorFormatter args=(sys.stdout,) [formatter_pysimmmulatorFormatter] -format=%(asctime)s - %(name)s - %(levelname)s - %(message)s \ No newline at end of file +format=%(asctime)s - %(name)s - %(levelname)s - %(message)s diff --git a/src/pysimmmulator/simulate.py b/src/pysimmmulator/simulate.py index 0681448..cb1ee2d 100644 --- a/src/pysimmmulator/simulate.py +++ b/src/pysimmmulator/simulate.py @@ -602,4 +602,3 @@ def run(self, config: dict, runs: int, sensitivity_config: dict = None) -> None: self.stash_outputs(result=result) logger.info(f"{run + 1}/{runs} completed") logger.info(f"{runs} runs complete and stored") - diff --git a/tests/test_edge_cases.py b/tests/test_edge_cases.py index df26948..62dec53 100644 --- a/tests/test_edge_cases.py +++ b/tests/test_edge_cases.py @@ -175,4 +175,3 @@ def test_reproducibility(): pd.testing.assert_frame_equal(result1.df, result2.df) assert result1.channel_roi == result2.channel_roi -