Skip to content

Commit

Permalink
feat: Add Python 3.12 (#949)
Browse files Browse the repository at this point in the history
* chore(python): Add Python 3.12

* feat: Add Python 3.12

* Allow extra log message in cache tests.
  • Loading branch information
sorced-jim authored Feb 27, 2024
1 parent 5cc6e91 commit b5c8477
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 10 deletions.
4 changes: 3 additions & 1 deletion CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ In order to add a feature to ``python-ndb``:
documentation (in ``docs/``).

- The feature must work fully on the following CPython versions:
3.7, 3.8, 3.9, 3.10, and 3.11 on both UNIX and Windows.
3.7, 3.8, 3.9, 3.10, 3.11 and 3.12 on both UNIX and Windows.

- The feature must not add unnecessary dependencies (where
"unnecessary" is of course subjective, but new dependencies should
Expand Down Expand Up @@ -260,12 +260,14 @@ We support:
- `Python 3.9`_
- `Python 3.10`_
- `Python 3.11`_
- `Python 3.12`_

.. _Python 3.7: https://docs.python.org/3.7/
.. _Python 3.8: https://docs.python.org/3.8/
.. _Python 3.9: https://docs.python.org/3.9/
.. _Python 3.10: https://docs.python.org/3.10/
.. _Python 3.11: https://docs.python.org/3.11/
.. _Python 3.12: https://docs.python.org/3.12/


Supported versions can be found in our ``noxfile.py`` `config`_.
Expand Down
2 changes: 1 addition & 1 deletion noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
LOCAL_DEPS = ("google-api-core", "google-cloud-core")
NOX_DIR = os.path.abspath(os.path.dirname(__file__))
DEFAULT_INTERPRETER = "3.8"
ALL_INTERPRETERS = ("3.7", "3.8", "3.9", "3.10", "3.11")
ALL_INTERPRETERS = ("3.7", "3.8", "3.9", "3.10", "3.11", "3.12")
CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute()

BLACK_VERSION = "black==22.3.0"
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ def main():
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Operating System :: OS Independent",
"Topic :: Internet",
],
Expand Down
Empty file added testing/constraints-3.12.txt
Empty file.
4 changes: 2 additions & 2 deletions tests/unit/test__cache.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ class TransientError(Exception):

with warnings.catch_warnings(record=True) as logged:
assert _cache.global_get(b"foo").result() is None
assert len(logged) == 1
assert len(logged) in [1, 2]

_batch.get_batch.assert_called_once_with(_cache._GlobalCacheGetBatch)
batch.add.assert_called_once_with(b"foo")
Expand Down Expand Up @@ -314,7 +314,7 @@ class TransientError(Exception):

with warnings.catch_warnings(record=True) as logged:
assert _cache.global_set(b"key", b"value").result() is None
assert len(logged) == 0
assert len(logged) in [0, 1]

_batch.get_batch.assert_called_once_with(_cache._GlobalCacheSetBatch, {})
batch.add.assert_called_once_with(b"key", b"value")
Expand Down
24 changes: 18 additions & 6 deletions tests/unit/test__datastore_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -1253,7 +1253,9 @@ def test_wo_transaction(stub, datastore_pb2):
)

request = datastore_pb2.CommitRequest.return_value
assert api.commit.future.called_once_with(request)
api.commit.future.assert_called_once_with(
request, metadata=mock.ANY, timeout=mock.ANY
)

@staticmethod
@pytest.mark.usefixtures("in_context")
Expand All @@ -1276,7 +1278,9 @@ def test_w_transaction(stub, datastore_pb2):
)

request = datastore_pb2.CommitRequest.return_value
assert api.commit.future.called_once_with(request)
api.commit.future.assert_called_once_with(
request, metadata=mock.ANY, timeout=mock.ANY
)


@pytest.mark.usefixtures("in_context")
Expand Down Expand Up @@ -1365,7 +1369,9 @@ def test__datastore_allocate_ids(stub, datastore_pb2):
)

request = datastore_pb2.AllocateIdsRequest.return_value
assert api.allocate_ids.future.called_once_with(request)
api.allocate_ids.future.assert_called_once_with(
request, metadata=mock.ANY, timeout=mock.ANY
)


@pytest.mark.usefixtures("in_context")
Expand Down Expand Up @@ -1407,7 +1413,9 @@ def test_read_only(stub, datastore_pb2):
)

request = datastore_pb2.BeginTransactionRequest.return_value
assert api.begin_transaction.future.called_once_with(request)
api.begin_transaction.future.assert_called_once_with(
request, metadata=mock.ANY, timeout=mock.ANY
)

@staticmethod
@pytest.mark.usefixtures("in_context")
Expand All @@ -1432,7 +1440,9 @@ def test_read_write(stub, datastore_pb2):
)

request = datastore_pb2.BeginTransactionRequest.return_value
assert api.begin_transaction.future.called_once_with(request)
api.begin_transaction.future.assert_called_once_with(
request, metadata=mock.ANY, timeout=mock.ANY
)


@pytest.mark.usefixtures("in_context")
Expand Down Expand Up @@ -1463,7 +1473,9 @@ def test__datastore_rollback(stub, datastore_pb2):
)

request = datastore_pb2.RollbackRequest.return_value
assert api.rollback.future.called_once_with(request)
api.rollback.future.assert_called_once_with(
request, metadata=mock.ANY, timeout=mock.ANY
)


def test__complete():
Expand Down

0 comments on commit b5c8477

Please sign in to comment.