Merge branch 'main' into set-init

Author: jsiirola

.github/workflows/test_branches.yml

@@ -44,9 +44,10 @@ jobs:
         python-version: '3.10'
     - name: Black Formatting Check
       run: |
-        # Note v24.4.1 fails due to a bug in the parser
+        # Note v24.4.1 fails due to a bug in the parser. Project-level
+        # configuration is inherited from pyproject.toml.
         pip install 'black!=24.4.1'
-        black . -S -C --check --diff --exclude examples/pyomobook/python-ch/BadIndent.py
+        black . --check --diff
     - name: Spell Check
       uses: crate-ci/typos@master
       with: 

.github/workflows/test_pr_and_main.yml

@@ -55,9 +55,10 @@ jobs:
         python-version: '3.10'
     - name: Black Formatting Check
       run: |
-        # Note v24.4.1 fails due to a bug in the parser
+        # Note v24.4.1 fails due to a bug in the parser. Project-level
+        # configuration is inherited from pyproject.toml.
         pip install 'black!=24.4.1'
-        black . -S -C --check --diff --exclude examples/pyomobook/python-ch/BadIndent.py
+        black . --check --diff
     - name: Spell Check
       uses: crate-ci/typos@master
       with: 

doc/OnlineDocs/contribution_guide.rst

@@ -37,13 +37,17 @@ run:
 
     # Auto-apply correct formatting
    pip install black
-   black -S -C <path> --exclude examples/pyomobook/python-ch/BadIndent.py
+   black <path>
    # Find typos in files
    conda install typos
    typos --config .github/workflows/typos.toml <path>
    
-If the spell-checker returns a failure for a word that is spelled correctly,
-please add the word to the ``.github/workflows/typos.toml`` file.
+If the spell-checker returns a failure for a word that is spelled
+correctly, please add the word to the ``.github/workflows/typos.toml``
+file. Note also that ``black`` reads from ``pyproject.toml`` to
+determine correct configuration, so if you are running ``black``
+indirectly (for example, using an IDE integration), please ensure you
+are not overriding the project-level configuration set in that file.
 
 Online Pyomo documentation is generated using `Sphinx <https://www.sphinx-doc.org/en/master/>`_
 with the ``napoleon`` extension enabled. For API documentation we use of one of these 

pyomo/solvers/tests/testcases.py

@@ -280,6 +280,20 @@
         lambda v: v[:3] == (22, 1, 19),
         'BARON 22.1.19 reports model as optimal',
     )
+for prob in (
+    'LP_block',
+    'LP_duals_maximize',
+    'LP_duals_minimize',
+    'LP_inactive_index',
+    'LP_simple',
+    'LP_trivial_constraints',
+    'QCP_simple',
+    'QP_simple',
+):
+    ExpectedFailures['baron', 'bar', prob] = (
+        lambda v: v == (25, 7, 16, 0),
+        "BARON 25.7.16 returns 0 for duals/rc for models solved in preprocessing",
+    )
 
 
 #

pyproject.toml

@@ -86,3 +86,9 @@ markers = [
     "bar: marks bar tests",
     "builders: tests that should be run when testing custom (extension) builders",
 ]
+
+[tool.black]
+line-length = 88
+skip-string-normalization = true
+skip-magic-trailing-comma = true
+extend-exclude = 'examples/pyomobook/python-ch/BadIndent.py'