experimaestro 1.8.0rc7__tar.gz → 1.8.4__tar.gz

{experimaestro-1.8.0rc7 → experimaestro-1.8.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: experimaestro
-Version: 1.8.0rc7
+Version: 1.8.4
 Summary: "Experimaestro is a computer science experiment manager"
 License: GPL-3
 Keywords: experiment manager

{experimaestro-1.8.0rc7 → experimaestro-1.8.4}/pyproject.toml

@@ -20,7 +20,7 @@ include = [
     "src/experimaestro/mkdocs/style.css",
     { path="src/experimaestro/server/data/*", format=['sdist', 'wheel']}
 ]
-version = "1.8.0-rc7"
+version = "1.8.4"
 repository = "https://github.com/experimaestro/experimaestro-python"
 documentation = "https://experimaestro-python.readthedocs.io/"
 
@@ -122,7 +122,7 @@ warn_unused_ignores = true
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "1.8.0rc7"
+version = "1.8.4"
 changelog_start_rev = "v1.0.0"
 tag_format = "v$major.$minor.$patch$prerelease"
 # update_changelog_on_bump = true

{experimaestro-1.8.0rc7 → experimaestro-1.8.4}/src/experimaestro/core/objects/config.py

@@ -339,6 +339,9 @@ class ConfigInformation:
                     try:
                         if argument.generator:
                             if not isinstance(argument.generator, Generator):
+                                # Don't set if already set
+                                if config.__xpm__.values.get(k) is not None:
+                                    continue
                                 value = argument.generator()
                             else:
                                 sig = inspect.signature(argument.generator)

{experimaestro-1.8.0rc7 → experimaestro-1.8.4}/src/experimaestro/tests/test_identifier.py

@@ -38,6 +38,11 @@ class C(Config):
     b: Param[int]
 
 
+class CField(Config):
+    a: Param[int] = field(default_factory=lambda: 1)
+    b: Param[int]
+
+
 class D(Config):
     a: Param[A]
 
@@ -79,6 +84,10 @@ def test_param_default():
     assert_equal(C(a=1, b=2), C(b=2))
 
 
+def test_identifier_default_field():
+    assert_equal(CField(a=1, b=2), CField(b=2))
+
+
 def test_param_inner_eq():
     assert_equal(D(a=A(a=1)), D(a=A(a=1)))
 

{experimaestro-1.8.0rc7 → experimaestro-1.8.4}/src/experimaestro/tests/test_param.py

@@ -290,6 +290,26 @@ def test_default_mismatch():
         A.__getxpmtype__().getArgument("x")
 
 
+# --- Handling default with field
+
+
+def test_param_default_set():
+    """Test that the default setting is well set"""
+
+    class A0(Config):
+        x: Param[int] = 2
+
+    assert A0().instance().x == 2
+    assert A0(x=3).instance().x == 3
+
+    class A(Config):
+        x: Param[int] = field(default_factory=lambda: 2)
+
+    assert A().instance().x == 2
+
+    assert A(x=3).instance().x == 3
+
+
 # --- Handling help annotations