Fix push command (#53)

* Fix optimizer status in ask

* Fix bug when a discipline name is substring of another discipline name

* Fix help messages

* BUmp 2.5.5

* Drop tests on py3.8, add py3.11

* Update changelog

.github/workflows/tests.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        python-version: ["3.8", "3.9", "3.10"]
+        python-version: ["3.9", "3.10", "3.11"]
 
     steps:
     - name: Checkout sources

CHANGELOG

@@ -1,3 +1,16 @@
+* 2.5.5 (12/01/2023)
+  * Fix `wop push` command when a discipline name is substring of another
+
+* 2.5.4 (25/10/2023)
+  * Fix error message handling
+  * Remove already told check
+
+* 2.5.3 (27/06/2023)
+  * Fix `wop` publication from GitHub action 
+
+* 2.5.2 (27/06/2023)
+  * Update packaging and CI actions
+
 * 2.5.1 (05/06/2023)
   * `wop build`: Remove annoying `BetaConfiguration` warning  
   * `wop pull <source_id>`: Fix bug pull source not working

whatsopt/__init__.py

@@ -1 +1 @@
-__version__ = "2.5.4"
+__version__ = "2.5.5"

whatsopt/optimization.py

@@ -229,7 +229,7 @@ def ask(self, with_best=False):
                 "Time out: please check status and history and may be ask again."
             )
 
-        self.status = self.PENDING
+        self._status = self.PENDING
 
         return self._x_suggested, self._status, self._x_best, self._y_best
 

whatsopt/push_command.py

@@ -153,7 +153,10 @@ def _populate_varattrs_from_outputs(self, mda_attrs, group_prefix=""):
                     scope = discattrs["name"]
                     if mda_prefix:
                         scope = mda_prefix + scope
-                    if ".".join(mda).startswith(scope):
+                    mda_name = ".".join(mda)
+                    if mda_name == scope or (
+                        mda_name.startswith(scope) and mda_name[len(scope)] == "."
+                    ):
                         vattr = {
                             "name": varattrs["name"],
                             "desc": self.vardescs.get(absname, ""),

whatsopt/wop.py

@@ -114,7 +114,7 @@ def status(ctx):
     "-d",
     "--depth",
     default=DEFAULT_PUSH_DEPTH,
-    help="specify the max depth of the sub-analysis nesting (0 meaning no limit, default is 3)",
+    help="specify the max depth of the sub-analysis nesting (0 meaning no limit, default is 2)",
 )
 @click.option(
     "--json",
@@ -407,7 +407,7 @@ def upload(
     "-d",
     "--depth",
     default=DEFAULT_PUSH_DEPTH,
-    help="specify the max depth of the sub-analysis nesting (0 meaning no limit, default is 3)",
+    help="specify the max depth of the sub-analysis nesting (0 meaning no limit, default is 2)",
 )
 @click.pass_context
 def show(ctx, analysis_id, pbfile, name, outfile, batch, depth):