Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix collections.ControlledDict handling of Iterators via update method, fix Python version in test workflow and recover Windows in CI #732

Merged
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
max-parallel: 20
matrix:
os: [ubuntu-latest, macos-14] #, windows-latest]
python-version: ["3.10", "3.12"]
python-version: ["3.10", "3.11", "3.12", "3.13"]

runs-on: ${{ matrix.os }}

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ maintainers = [
]
description = "Monty is the missing complement to Python."
readme = "README.md"
requires-python = ">=3.10"
requires-python = ">=3.10,<=3.13"
DanielYang59 marked this conversation as resolved.
Show resolved Hide resolved
classifiers = [
"Programming Language :: Python :: 3",
"Development Status :: 4 - Beta",
Expand Down
4 changes: 3 additions & 1 deletion src/monty/collections.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ def __setitem__(self, key, value) -> None:

def update(self, *args, **kwargs) -> None:
"""Forbid adding or updating keys based on _allow_add and _allow_update."""

updates = dict(*args, **kwargs)
for key in dict(*args, **kwargs):
if key not in self.data and not self._allow_add:
raise TypeError(
Expand All @@ -99,7 +101,7 @@ def update(self, *args, **kwargs) -> None:
f"Cannot update key {key!r} using update, because update is disabled."
)

super().update(*args, **kwargs)
super().update(updates)

def setdefault(self, key, default=None) -> Any:
"""Forbid adding or updating keys based on _allow_add and _allow_update.
Expand Down
10 changes: 9 additions & 1 deletion tests/test_collections.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ def test_update_allowed(self):
dct.update({"a": 3})
assert dct["a"] == 3

# Test Iterator handling
dct.update(zip(["c", "d"], [11, 12]))
assert dct["c"] == 11

dct.setdefault("a", 4) # existing key
assert dct["a"] == 3

Expand Down Expand Up @@ -157,7 +161,11 @@ def test_namespace_dict():
dct["hello"] = "world"
assert dct["key"] == "val"

# Test update (not allowed)
# Test use `update` to add new values
dct.update({"new_key": "new_value"})
assert dct["new_key"] == "new_value"

# Test add (not allowed)
with pytest.raises(TypeError, match="update is disabled"):
dct["key"] = "val"

Expand Down
Loading