Merge pull request #1 from Pyomo/master

merge master into pynumero_mumps

.github/PULL_REQUEST_TEMPLATE.md

@@ -9,7 +9,7 @@
 
 ### Legal Acknowledgement
 
-By contributing to this software project, I agree to the following terms and conditions for my contribution:
+By contributing to this software project, I have read the [contribution guide](https://pyomo.readthedocs.io/en/stable/contribution_guide.html) and agree to the following terms and conditions for my contribution:
 
 1. I agree my contributions are submitted under the BSD license.
 2. I represent I am authorized to make the contributions and grant the license. If my employer has rights to intellectual property that includes these contributions, I represent that I have received permission to make contributions and grant the required license on behalf of that employer.

.github/workflows/parallel_tests.yml → .github/workflows/mpi_matrix_test.yml

@@ -1,4 +1,4 @@
-name: parallel_tests
+name: continuous-integration/github/pr
 
 on:
   pull_request:
@@ -7,13 +7,18 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    name: mpi/${{ matrix.TARGET }}/py${{ matrix.python-version }}
+    runs-on: ${{ matrix.os }}
     strategy:
       max-parallel: 1
       matrix:
+        os: [ubuntu-latest]
         python-version: [3.7]
+        include:
+        - os: ubuntu-latest
+          TARGET: linux
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - name: setup conda
       uses: s-weigand/setup-conda@v1
       with:

.github/workflows/ubuntu_python_matrix_test.yml → .github/workflows/push_branch_test.yml

@@ -1,21 +1,22 @@
-name: continuous-integration/github/pr/linux
+name: continuous-integration/github/push
 
-on:
-  pull_request:
-    branches:
-      - master
+on: push
 
 jobs:
-  pyomo-linux-tests:
-    name: py${{ matrix.python-version }}
-    runs-on: ubuntu-18.04
+  pyomo-linux-branch-test:
+    name: ${{ matrix.TARGET }}/py${{ matrix.python-version }}
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.5, 3.6, 3.7, 3.8]
+        os: [ubuntu-18.04]
+        include:
+        - os: ubuntu-18.04
+          TARGET: linux
+        python-version: [3.7]
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v1
       with:

.github/workflows/mac_python_matrix_test.yml → .github/workflows/unix_python_matrix_test.yml

@@ -1,34 +1,42 @@
-name: continuous-integration/github/pr/osx
+name: continuous-integration/github/pr
 
 on:
   pull_request:
     branches:
       - master
 
 jobs:
-  pyomo-mac-tests:
-    name: py${{ matrix.python-version }}
-    runs-on: macos-latest
+  pyomo-unix-tests:
+    name: ${{ matrix.TARGET }}/py${{ matrix.python-version }}
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
+        os: [macos-latest, ubuntu-18.04]
+        include:
+        - os: macos-latest
+          TARGET: osx
+        - os: ubuntu-18.04
+          TARGET: linux
         python-version: [3.5, 3.6, 3.7, 3.8]
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v1
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install Pyomo dependencies
       run: |
-        echo "Install pre-dependencies for pyodbc..."
-        brew update # Install pre-dependencies for pyodbc
-        brew install bash gcc
-        brew link --overwrite gcc
-        brew install pkg-config
-        brew install unixodbc
-        brew install freetds # Now install Python modules
+        if hash brew; then
+            echo "Install pre-dependencies for pyodbc..."
+            brew update 
+            brew install bash gcc
+            brew link --overwrite gcc
+            brew install pkg-config
+            brew install unixodbc
+            brew install freetds 
+        fi
         echo "Upgrade pip..."
         python -m pip install --upgrade pip
         echo ""
@@ -42,7 +50,11 @@ jobs:
         echo ""
         echo "Install GAMS..."
         echo ""
-        wget -q https://d37drm4t2jghv5.cloudfront.net/distributions/29.1.0/macosx/osx_x64_64_sfx.exe -O gams_installer.exe
+        if hash brew; then
+            wget -q https://d37drm4t2jghv5.cloudfront.net/distributions/29.1.0/macosx/osx_x64_64_sfx.exe -O gams_installer.exe
+        else
+            wget -q https://d37drm4t2jghv5.cloudfront.net/distributions/29.1.0/linux/linux_x64_64_sfx.exe -O gams_installer.exe
+        fi
         chmod +x gams_installer.exe
         ./gams_installer.exe -q -d gams
         cd gams/*/apifiles/Python/
@@ -77,6 +89,7 @@ jobs:
         echo "Run test.pyomo..."
         GAMS_DIR=`ls -d1 $(pwd)/gams/*/ | head -1`
         export PATH=$PATH:$GAMS_DIR
+        export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$GAMS_DIR
         export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$GAMS_DIR
         pip install nose
         test.pyomo -v --cat="nightly" pyomo `pwd`/pyomo-model-libraries

.github/workflows/win_python_matrix_test.yml

@@ -1,4 +1,4 @@
-name: continuous-integration/github/pr/win
+name: continuous-integration/github/pr
 
 on:
   pull_request:
@@ -7,14 +7,14 @@ on:
 
 jobs:
   pyomo-tests:
-    name: py${{ matrix.python-version }}
+    name: win/py${{ matrix.python-version }}
     runs-on: windows-latest
     strategy:
       fail-fast: false # This flag causes all of the matrix to continue to run, even if one matrix option fails
       matrix:
         python-version: [2.7, 3.5, 3.6, 3.7, 3.8] 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }} with Miniconda
       uses: goanpeca/setup-miniconda@v1 # Using an action created by user goanpeca to set up different Python Miniconda environments
       with:

doc/OnlineDocs/contribution_guide.rst

@@ -44,6 +44,13 @@ at least 70% coverage of the lines modified in the PR and prefer
 coverage closer to 90%. We also require that all tests pass before a PR
 will be merged.
 
+The Pyomo master branch (as of `this commit <https://github.com/Pyomo/pyomo/commit/49e2ff171ddcd083c62ac28379afcf33af2549ae>`) provides a Github Action
+workflow that will test any changes pushed to a branch using Ubuntu with
+Python 3.7. For existing forks, fetch and merge your fork (and branches) with
+Pyomo's master. For new forks, you will need to enable Github Actions
+in the 'Actions' tab on your fork. Then the test will begin to run
+automatically with each push to your fork.
+
 At any point in the development cycle, a "work in progress" pull request
 may be opened by including '[WIP]' at the beginning of the PR
 title. This allows your code changes to be tested by Pyomo's automatic

doc/OnlineDocs/installation.rst

@@ -23,7 +23,7 @@ optimization solvers can be installed with conda as well:
 
 ::
 
-   conda install -c conda-forge ipopt coincbc glpk
+   conda install -c conda-forge ipopt glpk
 
 
 Using PIP