From 838d560bd9cf872f4c87510304e829d122fa10d9 Mon Sep 17 00:00:00 2001 From: Emma Johnson Date: Mon, 9 Sep 2024 15:29:45 -0600 Subject: [PATCH 1/5] Fixing a couple typos the new version of typos (1.24.5) is finding --- examples/doc/samples/case_studies/diet/DietProblem.tex | 2 +- examples/doc/samples/case_studies/diet/README.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/doc/samples/case_studies/diet/DietProblem.tex b/examples/doc/samples/case_studies/diet/DietProblem.tex index d933e097d88..e2ae7ba4c62 100644 --- a/examples/doc/samples/case_studies/diet/DietProblem.tex +++ b/examples/doc/samples/case_studies/diet/DietProblem.tex @@ -54,7 +54,7 @@ \subsection*{Build the model} The comma indicates that this parameter is over two different sets, and thus is in two dimensions. When we create the data file, we will be able to fill in how much of each nutrient each food contains. -At this point we have defined our sets and parameters. However, we have yet to cosnider the amount of food to be bought and eaten. This is the variable weâre trying to solve for, and thus we create an object of the variable class. Since this is just recording how much food to purchase, we create a one dimensional variable over food: +At this point we have defined our sets and parameters. However, we have yet to consider the amount of food to be bought and eaten. This is the variable weâre trying to solve for, and thus we create an object of the variable class. Since this is just recording how much food to purchase, we create a one dimensional variable over food: \begin{verbatim}model.amount=Var(model.foods, within = NonNegativeReals) \end{verbatim} diff --git a/examples/doc/samples/case_studies/diet/README.txt b/examples/doc/samples/case_studies/diet/README.txt index c30e963dc27..c382b4d653c 100644 --- a/examples/doc/samples/case_studies/diet/README.txt +++ b/examples/doc/samples/case_studies/diet/README.txt @@ -68,7 +68,7 @@ model.nutrient_value=Param(model.nutrients, model.foods) The comma indicates that this parameter is over two different sets, and thus is in two dimensions. When we create the data file, we will be able to fill in how much of each nutrient each food contains. -At this point we have defined our sets and parameters. However, we have yet to cosnider the amount of food to be bought and eaten. This is the variable we're trying to solve for, and thus we create an object of the variable class. Since this is just recording how much food to purchase, we create a one dimensional variable over food: +At this point we have defined our sets and parameters. However, we have yet to consider the amount of food to be bought and eaten. This is the variable we're trying to solve for, and thus we create an object of the variable class. Since this is just recording how much food to purchase, we create a one dimensional variable over food: {{{ #!python From 1a73b626245d20801a375cc5b864efab260dba53 Mon Sep 17 00:00:00 2001 From: Miranda Mundt Date: Mon, 9 Sep 2024 15:46:20 -0600 Subject: [PATCH 2/5] Change BARON download URL --- .github/workflows/test_branches.yml | 2 +- .github/workflows/test_pr_and_main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_branches.yml b/.github/workflows/test_branches.yml index a4f2f8128e9..92c47b2d64b 100644 --- a/.github/workflows/test_branches.yml +++ b/.github/workflows/test_branches.yml @@ -519,7 +519,7 @@ jobs: $BARON_DIR = "${env:TPL_DIR}/baron" echo "$BARON_DIR" | ` Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - $URL = "https://minlp.com/downloads/xecs/baron/current/" + $URL = "https://minlp-downloads.nyc3.cdn.digitaloceanspaces.com/xecs/baron/current/" if ( "${{matrix.TARGET}}" -eq "win" ) { $INSTALLER = "${env:DOWNLOAD_DIR}/baron_install.exe" $URL += "baron-win64.exe" diff --git a/.github/workflows/test_pr_and_main.yml b/.github/workflows/test_pr_and_main.yml index 1aefe02687b..857e8ebde4e 100644 --- a/.github/workflows/test_pr_and_main.yml +++ b/.github/workflows/test_pr_and_main.yml @@ -547,7 +547,7 @@ jobs: $BARON_DIR = "${env:TPL_DIR}/baron" echo "$BARON_DIR" | ` Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - $URL = "https://minlp.com/downloads/xecs/baron/current/" + $URL = "https://minlp-downloads.nyc3.cdn.digitaloceanspaces.com/xecs/baron/current/" if ( "${{matrix.TARGET}}" -eq "win" ) { $INSTALLER = "${env:DOWNLOAD_DIR}/baron_install.exe" $URL += "baron-win64.exe" From cfee53e5070c1b7f09e67ec7d2a5b34c21e78f39 Mon Sep 17 00:00:00 2001 From: Miranda Mundt Date: Tue, 10 Sep 2024 10:52:43 -0600 Subject: [PATCH 3/5] Shorten tests; print out dir structure --- .github/workflows/test_pr_and_main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_pr_and_main.yml b/.github/workflows/test_pr_and_main.yml index 857e8ebde4e..dd84b559f69 100644 --- a/.github/workflows/test_pr_and_main.yml +++ b/.github/workflows/test_pr_and_main.yml @@ -667,7 +667,6 @@ jobs: run: | $PYTHON_EXE -m pytest -v \ -W ignore::Warning ${{matrix.category}} \ - pyomo `pwd`/pyomo-model-libraries \ `pwd`/examples `pwd`/doc --junitxml="TEST-pyomo.xml" - name: Run Pyomo MPI tests @@ -852,6 +851,7 @@ jobs: fi for ARTIFACT in artifacts/*_*${{matrix.TARGET}}_*; do NAME=`echo $ARTIFACT | cut -d/ -f2` + ls -la $ARTIFACT cp -v $ARTIFACT/.coverage .coverage-$NAME done rm -vf .coverage coverage.xml From 858c29f408c48c88b8098ed498d1aba20076cf20 Mon Sep 17 00:00:00 2001 From: Miranda Mundt Date: Tue, 10 Sep 2024 11:38:45 -0600 Subject: [PATCH 4/5] Print out dir after coverage combine --- .github/workflows/test_pr_and_main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test_pr_and_main.yml b/.github/workflows/test_pr_and_main.yml index dd84b559f69..9d82758281f 100644 --- a/.github/workflows/test_pr_and_main.yml +++ b/.github/workflows/test_pr_and_main.yml @@ -692,6 +692,7 @@ jobs: coverage combine coverage report -i coverage xml -i + ls -la - name: Record build artifacts uses: actions/upload-artifact@v4 From 68ba5d6dd34bd42468a062519c5894ccd8c41138 Mon Sep 17 00:00:00 2001 From: Miranda Mundt Date: Tue, 10 Sep 2024 12:13:49 -0600 Subject: [PATCH 5/5] Turn on hidden file uploads --- .github/workflows/test_pr_and_main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_pr_and_main.yml b/.github/workflows/test_pr_and_main.yml index 9d82758281f..34efa4a029b 100644 --- a/.github/workflows/test_pr_and_main.yml +++ b/.github/workflows/test_pr_and_main.yml @@ -667,6 +667,7 @@ jobs: run: | $PYTHON_EXE -m pytest -v \ -W ignore::Warning ${{matrix.category}} \ + pyomo `pwd`/pyomo-model-libraries \ `pwd`/examples `pwd`/doc --junitxml="TEST-pyomo.xml" - name: Run Pyomo MPI tests @@ -692,12 +693,12 @@ jobs: coverage combine coverage report -i coverage xml -i - ls -la - name: Record build artifacts uses: actions/upload-artifact@v4 with: name: ${{github.job}}_${{env.GHA_JOBGROUP}}-${{env.GHA_JOBNAME}} + include-hidden-files: true path: | .coverage coverage.xml @@ -852,7 +853,6 @@ jobs: fi for ARTIFACT in artifacts/*_*${{matrix.TARGET}}_*; do NAME=`echo $ARTIFACT | cut -d/ -f2` - ls -la $ARTIFACT cp -v $ARTIFACT/.coverage .coverage-$NAME done rm -vf .coverage coverage.xml