Merge branch 'main' into parallel-release-wheel

Author: mrmundt

.jenkins.sh

@@ -86,9 +86,13 @@ if test -z "$MODE" -o "$MODE" == setup; then
     echo "#"
     echo "# Installing pyomo modules"
     echo "#"
-    pushd "$WORKSPACE/pyutilib" || echo "PyUtilib not found"
-    python setup.py develop || echo "PyUtilib failed - skipping."
-    popd
+    if test -d "$WORKSPACE/pyutilib"; then
+        pushd "$WORKSPACE/pyutilib"
+        python setup.py develop || echo "PyUtilib failed - skipping."
+        popd
+    else
+        echo "PyUtilib not found; skipping"
+    fi
     pushd "$WORKSPACE/pyomo" || exit 1
     python setup.py develop $PYOMO_SETUP_ARGS || exit 1
     popd

pyomo/core/staleflag.py

@@ -21,7 +21,7 @@ def stale_mapper(self, encode, value):
             if value:
                 return 0
             else:
-                self.get_flag(0)
+                return self.get_flag(0)
 
     def _get_flag(self, current_flag):
         """Return the current global stale flag value"""

pyomo/core/tests/unit/test_var.py

@@ -1598,5 +1598,27 @@ def test_stale(self):
         self.assertFalse(m.x.stale)
         self.assertFalse(m.y.stale)
 
+    def test_stale_clone(self):
+        m = ConcreteModel()
+        m.x = Var(initialize=0)
+        self.assertFalse(m.x.stale)
+        m.y = Var()
+        self.assertTrue(m.y.stale)
+        m.z = Var(initialize=0)
+        self.assertFalse(m.z.stale)
+
+        i = m.clone()
+        self.assertFalse(i.x.stale)
+        self.assertTrue(i.y.stale)
+        self.assertFalse(i.z.stale)
+
+        StaleFlagManager.mark_all_as_stale(delayed=True)
+        m.z = 5
+        i = m.clone()
+        self.assertTrue(i.x.stale)
+        self.assertTrue(i.y.stale)
+        self.assertFalse(i.z.stale)
+        
+
 if __name__ == "__main__":
     unittest.main()

pyomo/version/info.py

@@ -26,9 +26,9 @@
 # main and needs a hard reference to "suitably new" development.
 major=6
 minor=4
-micro=3
-#releaselevel='invalid'
-releaselevel='final'
+micro=4
+releaselevel='invalid'
+#releaselevel='final'
 serial=0
 
 if releaselevel == 'final':