Towards v2

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.6.0-dev
+current_version = 2.0.0-dev0
 commit = True
 message = Bump version to {new_version}
 tag = True

.github/workflows/test-lint-go.yml

@@ -38,7 +38,7 @@ jobs:
       - name: Setup python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
+          python-version: '3.13'
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
@@ -54,7 +54,7 @@ jobs:
       - name: Setup python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
+          python-version: '3.13'
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
@@ -70,7 +70,7 @@ jobs:
       - name: Setup python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
+          python-version: '3.13'
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
@@ -88,7 +88,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v5
       with:
-        python-version: '3.10'
+        python-version: '3.13'
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

README.rst

@@ -1,6 +1,6 @@
 Mockito is a spying framework originally based on `the Java library with the same name
 <https://github.com/mockito/mockito>`_.  (Actually *we* invented the strict stubbing mode
-back in 2009.)  
+back in 2009.)
 
 .. image:: https://github.com/kaste/mockito-python/actions/workflows/test-lint-go.yml/badge.svg
     :target: https://github.com/kaste/mockito-python/actions/workflows/test-lint-go.yml
@@ -45,6 +45,35 @@ Read the docs
 http://mockito-python.readthedocs.io/en/latest/
 
 
+Breaking changes in v2
+======================
+
+Two functions have been renamed:
+
+- `verifyNoMoreInteractions` is deprecated. Use `ensureNoUnverifiedInteractions` instead.
+
+Although `verifyNoMoreInteractions` is the name used in mockito for Java, it is a misnomer over there
+too (imo).  Its docs say "Checks if any of given mocks has any unverified interaction.", and we
+make that clear now in the name of the function, so you don't need the docs to tell you what it does.
+
+- `verifyNoUnwantedInteractions` is deprecated. Use `verifyExpectedInteractions` instead.
+
+The new name should make it clear that it corresponds to the usage of `expect` (as alternative to `when`).
+
+Context managers now check the usage and any expectations (if you used `expect`) on exit.  You can
+disable this check by setting the environment variable `MOCKITO_CONTEXT_MANAGERS_CHECK_USAGE` to `"0"`.
+Note that this does not disable the check for any explicit expectations you might have set with `expect`.
+
+This roughly corresponds to the `verifyStubbedInvocationsAreUsed` contra the `verifyExpectedInteractions`
+functions.
+
+
+New in v2
+=========
+
+- `between` now supports open ranges, e.g. `between=(0, )` to check that at least 0 interactions
+  occurred.
+
 
 Development
 ===========

docs/the-functions.rst

@@ -4,7 +4,7 @@
 The functions
 =============
 
-Stable entrypoints are: :func:`when`, :func:`mock`, :func:`unstub`, :func:`verify`, :func:`spy`. Experimental or new function introduces with v1.0.x are: :func:`when2`, :func:`expect`, :func:`verifyNoUnwantedInteractions`, :func:`verifyStubbedInvocationsAreUsed`, :func:`patch`
+Stable entrypoints are: :func:`when`, :func:`mock`, :func:`unstub`, :func:`verify`, :func:`spy`. New function introduced in v1 are: :func:`when2`, :func:`expect`, :func:`verifyExpectedInteractions`, :func:`verifyStubbedInvocationsAreUsed`, :func:`patch`
 
 .. autofunction:: when
 .. autofunction:: when2
@@ -19,9 +19,14 @@ Stable entrypoints are: :func:`when`, :func:`mock`, :func:`unstub`, :func:`verif
 This looks like a plethora of verification functions, and especially since  you often don't need to `verify` at all.
 
 .. autofunction:: verify
-.. autofunction:: verifyNoMoreInteractions
 .. autofunction:: verifyZeroInteractions
-.. autofunction:: verifyNoUnwantedInteractions
-.. autofunction:: verifyStubbedInvocationsAreUsed
+.. autofunction:: verifyExpectedInteractions
+
+Note that `verifyExpectedInteractions` was named `verifyNoUnwantedInteractions` in v1.
+The usage of `verifyNoUnwantedInteractions` is deprecated.
 
+.. autofunction:: verifyStubbedInvocationsAreUsed
+.. autofunction:: ensureNoUnverifiedInteractions
 
+Note that `ensureNoUnverifiedInteractions` was named `verifyNoMoreInteractions` in v1.
+The usage of `verifyNoMoreInteractions` is deprecated.

mockito/__init__.py

@@ -28,11 +28,13 @@
     expect,
     unstub,
     forget_invocations,
+    ensureNoUnverifiedInteractions,
     verify,
-    verifyNoMoreInteractions,
     verifyZeroInteractions,
-    verifyNoUnwantedInteractions,
+    verifyExpectedInteractions,
     verifyStubbedInvocationsAreUsed,
+    verifyNoUnwantedInteractions,  # deprecated
+    verifyNoMoreInteractions,  # deprecated
     ArgumentError,
 )
 from . import inorder
@@ -44,7 +46,7 @@
 from .matchers import any, contains, times
 from .verification import never
 
-__version__ = '1.6.0-dev'
+__version__ = '2.0.0-dev'
 
 __all__ = [
     'mock',
@@ -54,18 +56,22 @@
     'when2',
     'patch',
     'expect',
+    'ensureNoUnverifiedInteractions',
     'verify',
-    'verifyNoMoreInteractions',
     'verifyZeroInteractions',
-    'verifyNoUnwantedInteractions',
+    'verifyExpectedInteractions',
     'verifyStubbedInvocationsAreUsed',
     'inorder',
     'unstub',
     'forget_invocations',
     'VerificationError',
     'ArgumentError',
+
     'any',  # compatibility
     'contains',  # compatibility
     'never',  # compatibility
+
     'times',  # deprecated
+    'verifyNoUnwantedInteractions',  # deprecated
+    'verifyNoMoreInteractions',  # deprecated
 ]