Merge pull request #58 from George-Ogden/side-effect

Allow Exceptions as `Mock.side_effect`

Author: George-Ogden

.github/workflows/lint.yaml

@@ -10,4 +10,4 @@ on:
 
 jobs:
   lint:
-    uses: George-Ogden/actions/.github/workflows/lint.yaml@v3.2.0
+    uses: George-Ogden/actions/.github/workflows/lint.yaml@v3.4.1

.github/workflows/release.yaml

@@ -11,6 +11,6 @@ permissions:
 
 jobs:
   release:
-    uses: George-Ogden/actions/.github/workflows/python-release.yaml@v3.2.0
+    uses: George-Ogden/actions/.github/workflows/python-release.yaml@v3.4.1
     with:
       validation-code: "import mypy.version; from mypy_pytest_plugin import plugin; plugin(mypy.version.__version__)"

.github/workflows/test.yaml

@@ -14,7 +14,7 @@ jobs:
       matrix:
         shard: [0, 1, 2]
         total-shards: [3]
-    uses: George-Ogden/actions/.github/workflows/python-test.yaml@v3.2.0
+    uses: George-Ogden/actions/.github/workflows/python-test.yaml@v3.4.1
     with:
       python-versions: "['3.12', '3.13', '3.14']"
       timeout-minutes: 15

.gitignore

@@ -11,6 +11,16 @@ TODO
 *.patch
 nohup*
 
+### VisualStudioCode ###
+.vscode/*
+
+# Local History for Visual Studio Code
+.history
+.ionide
+
+# Built Visual Studio Code Extensions
+*.vsix
+
 ### Python ###
 # Byte-compiled / optimized / DLL files
 __pycache__/
@@ -183,12 +193,5 @@ poetry.toml
 # LSP config files
 pyrightconfig.json
 
-### VisualStudioCode ###
-.vscode/*
-
-# Local History for Visual Studio Code
-.history
-.ionide
-
-# Built Visual Studio Code Extensions
-*.vsix
+### Pre-Commit Prettier ###
+node_modules/

.mirror.lock

@@ -1,5 +1,5 @@
 # DANGER: EDIT AT YOUR OWN RISK. Track this file in version control so that others can sync files correctly.
-- commit: 4519f0a82ab20cd50ec11c717ac75abcff7ea16c
+- commit: 26f0c34dacfaf7ad3d790b9b8a005daf242960b2
   files:
   - .github/python-release.yaml
   - .github/python-test.yaml

.pre-commit-config.yaml

@@ -1,9 +1,12 @@
 default_stages: ["pre-commit"]
 default_install_hook_types: ["pre-commit", "commit-msg"]
 
+ci:
+  skip: [mirror-check]
+
 repos:
   - repo: https://github.com/George-Ogden/mirror-rorrim/
-    rev: v0.4.1
+    rev: v0.4.4
     hooks:
       - id: mirror-check
         fail_fast: true
@@ -17,33 +20,38 @@ repos:
       - id: requirements-txt-fixer
 
   - repo: https://github.com/George-Ogden/linter/
-    rev: v1.2.1
+    rev: v1.2.2
     hooks:
       - id: lint
         args: [--fix]
 
+  - repo: https://github.com/koalaman/shellcheck-precommit
+    rev: v0.11.0
+    hooks:
+      - id: shellcheck
+        args: ["--severity=warning"]
+
   - repo: https://github.com/astral-sh/ruff-pre-commit/
-    rev: v0.14.10
+    rev: v0.14.13
     hooks:
-      - id: ruff-format
       - id: ruff-check
         args:
           - --fix
         exclude: ^test_samples/
+      - id: ruff-format
 
   - repo: https://github.com/pre-commit/mirrors-prettier/
     rev: v4.0.0-alpha.8
     hooks:
       - id: prettier
-        additional_dependencies: [prettier]
 
   - repo: https://github.com/rhysd/actionlint/
-    rev: v1.7.9
+    rev: v1.7.10
     hooks:
       - id: actionlint
 
   - repo: https://github.com/George-Ogden/pre-commit-hooks/
-    rev: v2.0.4
+    rev: v2.1.0
     hooks:
       - id: check-merge-conflict
       - id: dbg-check

mypy_pytest_plugin_types/mock.pyi

@@ -91,7 +91,11 @@ class CallableMixin[**P, R]:
     def __init__(
         self,
         spec: Any | None = None,
-        side_effect: Callable[P, Any] | Iterable[R | Exception | type[Exception]] | None = None,
+        side_effect: Callable[P, Any]
+        | Iterable[R | Exception | type[Exception]]
+        | Exception
+        | type[Exception]
+        | None = None,
         return_value: R = ...,
         wraps: Callable[P, R] | None = None,
         name: Any | None = None,

requirements-dev.txt

@@ -2,6 +2,7 @@
 git+https://github.com/George-Ogden/mirror-rorrim; python_version >= "3.12"
 git+https://github.com/George-Ogden/mypy-pytest; python_version >= "3.12"
 git+https://github.com/George-Ogden/pytest-dbg
+git+https://github.com/George-Ogden/pytest-dbg; python_version >= "3.11"
 inline-snapshot
 pip
 pre-commit

test_samples/patch_test.py

@@ -100,3 +100,12 @@ class TypeAliasTest:
 
 mock.patch.object(TypeAliasTest, "f", lambda: None)
 mock.patch.object(TypeAliasTest, "f", lambda n: n)
+
+value = None
+mock.patch("patch_test.value", mock.Mock(side_effect=None))
+mock.patch("patch_test.value", mock.Mock(side_effect=[None]))
+mock.patch("patch_test.value", mock.Mock(side_effect=[None, RuntimeError(), RuntimeError]))
+mock.patch("patch_test.value", mock.Mock(side_effect=[RuntimeError]))
+mock.patch("patch_test.value", mock.Mock(side_effect=[RuntimeError()]))
+mock.patch("patch_test.value", mock.Mock(side_effect=RuntimeError()))
+mock.patch("patch_test.value", mock.Mock(side_effect=RuntimeError))

version.txt

@@ -1 +1 @@
-2.1.2
+2.1.3