merge conflicts

Author: AymericPCLegros

Diff for: .github/workflows/nompi4py.yml

@@ -24,12 +24,12 @@ jobs:
           auto-activate-base: false
       - name: Install dependencies
         run: |
-          pip install pyomo sphinx sphinx_rtd_theme cplex
-          pip install xpress numpy pandas scipy dill
+          pip install sphinx sphinx_rtd_theme cplex
+          pip install xpress pandas dill
 
       - name: setup the program
         run: |
-          python setup.py develop
+          pip install -e .
 
       - name: PH EF tests
         run: |

Diff for: .github/workflows/pull_push_regression.yml

@@ -35,7 +35,7 @@ jobs:
 
       - name: setup the program
         run: |
-          python setup.py develop
+          pip install -e .
 
       - name: Test EF/PH
         run: |

Diff for: .github/workflows/pyotracker.yml

@@ -30,7 +30,6 @@ jobs:
           conda install mpi4py pandas setuptools git
           pip install sphinx sphinx_rtd_theme cplex
           pip install xpress
-          pip install numpy
           pip install matplotlib
 
       - name: set up pyomo

Diff for: .github/workflows/schur_complement.yml

@@ -25,18 +25,18 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install numpy scipy nose pybind11
+        pip install nose pybind11
         conda install openmpi pymumps --no-update-deps
         pip install mpi4py pandas
         pip install git+https://github.com/pyutilib/pyutilib.git
         git clone https://github.com/pyomo/pyomo.git
         cd pyomo/
-        python setup.py develop
+        pip install -e .
         pyomo download-extensions
         pyomo build-extensions
         cd ../
         pip install git+https://github.com/parapint/parapint.git
-        python setup.py develop
+        pip install -e .
     - name: Test with nose
       run: |
         nosetests -v mpisppy/tests/test_sc.py

Diff for: .github/workflows/straight.yml

@@ -31,7 +31,7 @@ jobs:
 
       - name: setup the program
         run: |
-          python setup.py develop
+          pip install -e .
 
       - name: mpi tests
         run: |

Diff for: .github/workflows/testadmmWrapper.yml

@@ -0,0 +1,42 @@
+# aph (pyomo released)
+
+name: admmWrapper tests
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+defaults:
+    run:
+        shell: bash -l {0}
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: conda-incubator/setup-miniconda@v2
+        with:
+          activate-environment: test_env
+          python-version: 3.9
+          auto-activate-base: false
+      - name: Install dependencies
+        run: |
+          conda install mpi4py pandas setuptools
+          pip install pyomo xpress cplex
+          pip install numpy
+
+      - name: setup the program
+        run: |
+          pip install -e .
+
+      - name: run tests
+        timeout-minutes: 100
+        run: |
+          cd mpisppy/tests
+          # envall does nothing
+          python test_admmWrapper.py

Diff for: .github/workflows/testagnostic.yml

@@ -35,7 +35,7 @@ jobs:
 
       - name: setup the program
         run: |
-          python setup.py develop
+          pip install -e .
 
       - name: run tests
         timeout-minutes: 100

Diff for: .github/workflows/testaph.yml

@@ -28,11 +28,10 @@ jobs:
         run: |
           conda install mpi4py pandas setuptools
           pip install pyomo xpress cplex
-          pip install numpy
 
       - name: setup the program
         run: |
-          python setup.py develop
+          pip install -e .
 
       - name: run tests
         timeout-minutes: 100

Diff for: .github/workflows/testbunpick.yml

@@ -26,12 +26,12 @@ jobs:
           auto-activate-base: false
       - name: Install dependencies
         run: |
-          conda install mpi4py numpy setuptools
+          conda install mpi4py "numpy<2" setuptools
           pip install pyomo pandas xpress cplex scipy sympy dill PyYAML Pympler networkx pandas
 
       - name: setup the program
         run: |
-          python setup.py develop
+          pip install -e .
 
       - name: run pickled bundles tests
         timeout-minutes: 10

Diff for: .github/workflows/testconfint.yml

@@ -26,12 +26,12 @@ jobs:
           auto-activate-base: false
       - name: Install dependencies
         run: |
-          conda install mpi4py numpy setuptools
+          conda install mpi4py "numpy<2" setuptools
           pip install pyomo pandas xpress cplex scipy sympy dill
 
       - name: setup the program
         run: |
-          python setup.py develop
+          pip install -e .
 
       - name: run farmer tests
         timeout-minutes: 10
@@ -43,4 +43,4 @@ jobs:
         timeout-minutes: 10
         run: |
           cd mpisppy/tests
-          python test_conf_int_aircond.py
+          python test_conf_int_aircond.py

Diff for: .github/workflows/testgradient.yml

@@ -24,12 +24,12 @@ jobs:
           auto-activate-base: false
       - name: Install dependencies
         run: |
-          conda install mpi4py numpy setuptools cmake
+          conda install mpi4py "numpy<2" setuptools cmake
           pip install pyomo pandas xpress cplex scipy sympy dill
 
       - name: setup the program
         run: |
-          python setup.py develop
+          pip install -e .
 
       - name: Build Pyomo extensions
         run: |

Diff for: .github/workflows/testpysp.yml

@@ -29,11 +29,10 @@ jobs:
         run: |
           conda install mpi4py pandas setuptools pytest pyyaml networkx
           pip install pyomo xpress cplex
-          pip install numpy
 
       - name: setup the program
         run: |
-          python setup.py develop
+          pip install -e .
 
       - name: run pysp model tests
         timeout-minutes: 100

Diff for: .github/workflows/testwithcylinders.yml

@@ -26,12 +26,12 @@ jobs:
           auto-activate-base: false
       - name: Install dependencies
         run: |
-          conda install mpi4py numpy setuptools
+          conda install mpi4py "numpy<2" setuptools
           pip install pyomo pandas xpress cplex scipy
 
       - name: setup the program
         run: |
-          python setup.py develop
+          pip install -e .
 
       - name: run tests
         timeout-minutes: 10

Diff for: README.rst

@@ -9,7 +9,7 @@ a there is a `paper <https://link.springer.com/article/10.1007/s12532-023-00247-
 Status for internal tests
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 
-.. image:: https://github.com/Pyomo/mpi-sppy/workflows/pyomo%20tracker/badge.svg
+.. image:: https://github.com/Pyomo/mpi-sppy/workflows/pyotracker/badge.svg
    :target: https://github.com/Pyomo/mpi-sppy/actions/workflows/pyotracker.yml