forked from Pyomo/pyomo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' of https://github.com/Pyomo/pyomo into logarithmi…
…c_via_gdp
- Loading branch information
Showing
197 changed files
with
14,272 additions
and
2,022 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -47,6 +47,20 @@ jobs: | |
| uses: crate-ci/typos@master | ||
| with: | ||
| config: ./.github/workflows/typos.toml | ||
| - name: URL Checker | ||
| uses: urlstechie/[email protected] | ||
| with: | ||
| # A comma-separated list of file types to cover in the URL checks | ||
| file_types: .md,.rst,.py | ||
| # Choose whether to include file with no URLs in the prints. | ||
| print_all: false | ||
| # More verbose summary at the end of a run | ||
| verbose: true | ||
| # How many times to retry a failed request (defaults to 1) | ||
| retry_count: 3 | ||
| # Exclude Jenkins because it's behind a firewall; ignore RTD because | ||
| # a magically-generated string is triggering a failure | ||
| exclude_urls: https://pyomo-jenkins.sandia.gov/,https://pyomo.readthedocs.io/en/%s/errors.html | ||
|
|
||
|
|
||
| build: | ||
|
|
@@ -181,7 +195,7 @@ jobs: | |
| # Notes: | ||
| # - install glpk | ||
| # - pyodbc needs: gcc pkg-config unixodbc freetds | ||
| for pkg in bash pkg-config unixodbc freetds glpk; do | ||
| for pkg in bash pkg-config unixodbc freetds glpk ginac; do | ||
| brew list $pkg || brew install $pkg | ||
| done | ||
|
|
@@ -193,7 +207,8 @@ jobs: | |
| # - install glpk | ||
| # - ipopt needs: libopenblas-dev gfortran liblapack-dev | ||
| sudo apt-get -o Dir::Cache=${GITHUB_WORKSPACE}/cache/os \ | ||
| install libopenblas-dev gfortran liblapack-dev glpk-utils | ||
| install libopenblas-dev gfortran liblapack-dev glpk-utils \ | ||
| libginac-dev | ||
| sudo chmod -R 777 ${GITHUB_WORKSPACE}/cache/os | ||
| - name: Update Windows | ||
|
|
@@ -264,11 +279,12 @@ jobs: | |
| if test -z "${{matrix.slim}}"; then | ||
| python -m pip install --cache-dir cache/pip cplex docplex \ | ||
| || echo "WARNING: CPLEX Community Edition is not available" | ||
| python -m pip install --cache-dir cache/pip \ | ||
| -i https://pypi.gurobi.com gurobipy==10.0.3 \ | ||
| python -m pip install --cache-dir cache/pip gurobipy==10.0.3 \ | ||
| || echo "WARNING: Gurobi is not available" | ||
| python -m pip install --cache-dir cache/pip xpress \ | ||
| || echo "WARNING: Xpress Community Edition is not available" | ||
| python -m pip install --cache-dir cache/pip maingopy \ | ||
| || echo "WARNING: MAiNGO is not available" | ||
| if [[ ${{matrix.python}} == pypy* ]]; then | ||
| echo "skipping wntr for pypy" | ||
| else | ||
|
|
@@ -338,7 +354,7 @@ jobs: | |
| echo "*** Install Pyomo dependencies ***" | ||
| # Note: this will fail the build if any installation fails (or | ||
| # possibly if it outputs messages to stderr) | ||
| conda install --update-deps -y $CONDA_DEPENDENCIES | ||
| conda install --update-deps -q -y $CONDA_DEPENDENCIES | ||
| if test -z "${{matrix.slim}}"; then | ||
| PYVER=$(echo "py${{matrix.python}}" | sed 's/\.//g') | ||
| echo "Installing for $PYVER" | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -57,6 +57,21 @@ jobs: | |
| uses: crate-ci/typos@master | ||
| with: | ||
| config: ./.github/workflows/typos.toml | ||
| - name: URL Checker | ||
| uses: urlstechie/[email protected] | ||
| with: | ||
| # A comma-separated list of file types to cover in the URL checks | ||
| file_types: .md,.rst,.py | ||
| # Choose whether to include file with no URLs in the prints. | ||
| print_all: false | ||
| # More verbose summary at the end of a run | ||
| verbose: true | ||
| # How many times to retry a failed request (defaults to 1) | ||
| retry_count: 3 | ||
| # Exclude: | ||
| # - Jenkins because it's behind a firewall | ||
| # - RTD because a magically-generated string triggers failures | ||
| exclude_urls: https://pyomo-jenkins.sandia.gov/,https://pyomo.readthedocs.io/en/%s/errors.html | ||
|
|
||
|
|
||
| build: | ||
|
|
@@ -72,6 +87,11 @@ jobs: | |
| other: [""] | ||
| category: [""] | ||
|
|
||
| # win/3.8 conda builds no longer work due to environment not being able | ||
| # to resolve. We are skipping it now. | ||
| exclude: | ||
| - os: windows-latest | ||
| python: 3.8 | ||
| include: | ||
| - os: ubuntu-latest | ||
| TARGET: linux | ||
|
|
@@ -218,7 +238,7 @@ jobs: | |
| # Notes: | ||
| # - install glpk | ||
| # - pyodbc needs: gcc pkg-config unixodbc freetds | ||
| for pkg in bash pkg-config unixodbc freetds glpk; do | ||
| for pkg in bash pkg-config unixodbc freetds glpk ginac; do | ||
| brew list $pkg || brew install $pkg | ||
| done | ||
|
|
@@ -230,7 +250,8 @@ jobs: | |
| # - install glpk | ||
| # - ipopt needs: libopenblas-dev gfortran liblapack-dev | ||
| sudo apt-get -o Dir::Cache=${GITHUB_WORKSPACE}/cache/os \ | ||
| install libopenblas-dev gfortran liblapack-dev glpk-utils | ||
| install libopenblas-dev gfortran liblapack-dev glpk-utils \ | ||
| libginac-dev | ||
| sudo chmod -R 777 ${GITHUB_WORKSPACE}/cache/os | ||
| - name: Update Windows | ||
|
|
@@ -301,11 +322,12 @@ jobs: | |
| if test -z "${{matrix.slim}}"; then | ||
| python -m pip install --cache-dir cache/pip cplex docplex \ | ||
| || echo "WARNING: CPLEX Community Edition is not available" | ||
| python -m pip install --cache-dir cache/pip \ | ||
| -i https://pypi.gurobi.com gurobipy==10.0.3 \ | ||
| python -m pip install --cache-dir cache/pip gurobipy==10.0.3 \ | ||
| || echo "WARNING: Gurobi is not available" | ||
| python -m pip install --cache-dir cache/pip xpress \ | ||
| || echo "WARNING: Xpress Community Edition is not available" | ||
| python -m pip install --cache-dir cache/pip maingopy \ | ||
| || echo "WARNING: MAiNGO is not available" | ||
| if [[ ${{matrix.python}} == pypy* ]]; then | ||
| echo "skipping wntr for pypy" | ||
| else | ||
|
|
@@ -371,6 +393,7 @@ jobs: | |
| CONDA_DEPENDENCIES="$CONDA_DEPENDENCIES $PKG" | ||
| fi | ||
| done | ||
| echo "" | ||
| echo "*** Install Pyomo dependencies ***" | ||
| # Note: this will fail the build if any installation fails (or | ||
| # possibly if it outputs messages to stderr) | ||
|
|
@@ -613,7 +636,8 @@ jobs: | |
| if: ${{ ! matrix.slim }} | ||
| shell: bash | ||
| run: | | ||
| $PYTHON_EXE -m pip install --cache-dir cache/pip highspy \ | ||
| echo "NOTE: temporarily pinning to highspy pre-release for testing" | ||
| $PYTHON_EXE -m pip install --cache-dir cache/pip "highspy>=1.7.1.dev1" \ | ||
| || echo "WARNING: highspy is not available" | ||
| - name: Set up coverage tracking | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.