Merge remote-tracking branch 'remotes/origin/main' into reports

OpenMDAO · Feb 1, 2024 · 075ec92 · 075ec92
2 parents d7f1617 + ec5ddc3
commit 075ec92
Show file tree

Hide file tree

Showing 291 changed files with 5,802 additions and 20,636 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.9.2-dev
+current_version = 0.9.3-dev
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -21,7 +21,7 @@ body:
     attributes:
       label: Aviary Version
       description: What version of Aviary is being used.
-      placeholder: "0.9.2-dev"
+      placeholder: "0.9.3-dev"
     validations:
       required: true
   - type: textarea

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,5 @@
 blank_issues_enabled: true
 contact_links:
   - name: Discussion Board
-    url: https://github.com/OpenMDAO/om-Aviary/discussions
+    url: https://github.com/OpenMDAO/Aviary/discussions
     about: "If you have questions or need support, please check the discussion board and create a \"New Discussion\" if necessary."
diff --git a/.github/install_env_from_github.sh b/.github/install_env_from_github.sh
@@ -49,7 +49,7 @@ fi
 # pyoptsparse_line=$(grep ' pyoptsparse' $input_yaml | sed 's/^    //')
 
 # Remove specified packages and write to an intermediate file
-grep -v -e 'aviary' -e 'om-aviary' -e 'build-pyoptsparse' -e 'pyoptsparse' -e 'boring-battery' -e 'networkx' -e '  - pip:' $input_yaml > $intermediate_yaml
+grep -v -e 'aviary' -e 'om-aviary' -e 'build-pyoptsparse' -e 'pyoptsparse' -e 'networkx' -e '  - pip:' $input_yaml > $intermediate_yaml
 
 # Check for 'dev' versions of OpenMDAO and Dymos
 if grep -q -e 'openmdao.*dev' $intermediate_yaml; then
@@ -99,8 +99,6 @@ conda activate $env_name
 # Check flags and install special packages if needed
 pip install -r $requirements_txt
 
-pip install "boring_battery @ git+https://github.com/jcchin/boring.git"
-
 if [ "$install_openmdao_from_git" = true ]; then
     pip install git+https://github.com/OpenMDAO/OpenMDAO.git
 fi

diff --git a/.github/workflows/notify_teams.yml b/.github/workflows/notify_teams.yml
@@ -0,0 +1,112 @@
+name: Notify Teams
+
+on:
+  pull_request_target:
+    branches: [main]
+    types: [opened, reopened, assigned, closed]
+
+env:
+  SMTP_SERVER: smtp.gmail.com
+  SMTP_PORT: 465
+  EMAIL_USERNAME: ${{ secrets.EMAIL_USERNAME }}
+  EMAIL_PASSWORD: ${{ secrets.EMAIL_PASSWORD }}
+  EMAIL_FROM: GitHub Actions
+  EMAIL_TO: ${{ secrets.DESTINATION_EMAIL }}
+  # Optional priority: 'high', 'normal' (default) or 'low'
+
+jobs:
+  send_email_on_opened_pr:
+    if: (github.event_name == 'pull_request' || github.event_name == 'pull_request_target') && (github.event.action == 'opened' || github.event.action == 'reopened')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get PR Data
+        run: |
+          echo "action=${{ github.event.action }}" >> $GITHUB_ENV
+          echo "number=${{ github.event.pull_request.number }}" >> $GITHUB_ENV
+          echo "user=${{ github.event.pull_request.user.login }}" >> $GITHUB_ENV
+          echo "title=${{ github.event.pull_request.title }}" >> $GITHUB_ENV
+          echo "url=${{ github.event.pull_request.html_url }}" >> $GITHUB_ENV
+          echo "assignees=${{ join(github.event.pull_request.assignees.*.login, ',') }}" >> $GITHUB_ENV
+
+      - name: Send Email on Opened PR
+        uses: dawidd6/action-send-mail@v3
+        with: 
+          server_address: ${{ env.SMTP_SERVER }}
+          server_port: ${{ env.SMTP_PORT }}
+          username: ${{ env.EMAIL_USERNAME }}
+          password: ${{ env.EMAIL_PASSWORD }}
+          to: ${{ env.EMAIL_TO }}
+          from: ${{ env.EMAIL_FROM }}
+          subject: "***Notification*** Opened Pull Request: ${{ env.number }}"
+          body: |
+            {
+              "action": "${{ env.action }}",
+              "number": "${{ env.number }}",
+              "user": "${{ env.user }}",
+              "title": "${{ env.title }}",
+              "url": "${{ env.url }}",
+              "assignees": "${{ env.assignees }}"
+            }
+          ignore_cert: true
+          nodemailerlog: true
+          nodemailerdebug: true
+
+  send_email_on_updated_assignees:
+    if: (github.event_name == 'pull_request' || github.event_name == 'pull_request_target') && github.event.action == 'assigned'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get Updated Assignees
+        run: |
+          echo "number=${{ github.event.pull_request.number }}" >> $GITHUB_ENV
+          echo "assignees=${{ join(github.event.pull_request.assignees.*.login, ',') }}" >> $GITHUB_ENV
+          echo "title=${{ github.event.pull_request.title }}" >> $GITHUB_ENV
+
+      - name: Send Email on Updated Assignees
+        uses: dawidd6/action-send-mail@v3
+        with: 
+          server_address: ${{ env.SMTP_SERVER }}
+          server_port: ${{ env.SMTP_PORT }}
+          username: ${{ env.EMAIL_USERNAME }}
+          password: ${{ env.EMAIL_PASSWORD }}
+          to: ${{ env.EMAIL_TO }}
+          from: ${{ env.EMAIL_FROM }}
+          subject: "***Notification*** Updated Assignees for Pull Request: ${{ env.number }}"
+          body: |
+            {
+              "number": "${{ env.number }}",
+              "assignees": "${{ env.assignees }}",
+              "title": "${{ env.title }}"
+            }
+          ignore_cert: true
+          nodemailerlog: true
+          nodemailerdebug: true
+
+  send_email_on_closed_pr:
+    if: (github.event_name == 'pull_request' || github.event_name == 'pull_request_target') && github.event.action == 'closed'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get PR Data
+        run: |
+          echo "number=${{ github.event.pull_request.number }}" >> $GITHUB_ENV
+          echo "title=${{ github.event.pull_request.title }}" >> $GITHUB_ENV
+
+      - name: Send Email on Closed PR
+        uses: dawidd6/action-send-mail@v3
+        with: 
+          server_address: ${{ env.SMTP_SERVER }}
+          server_port: ${{ env.SMTP_PORT }}
+          username: ${{ env.EMAIL_USERNAME }}
+          password: ${{ env.EMAIL_PASSWORD }}
+          to: ${{ env.EMAIL_TO }}
+          from: ${{ env.EMAIL_FROM }}
+          subject: "***Notification*** Closed Pull Request: ${{ env.number }}"
+          body: |
+            {
+              "number": "${{ env.number }}",
+              "title": "${{ env.title }}"
+            }
+          ignore_cert: true
+          nodemailerlog: true
+          nodemailerdebug: true
+
+
diff --git a/.github/workflows/test_workflow.yml b/.github/workflows/test_workflow.yml
@@ -11,10 +11,12 @@ on:
   merge_group:
     branches: [ main ]
 
+  # Allow running the workflow manually from the Actions tab
+  workflow_dispatch:
+
 jobs:
 
   pre_commit:
-    if: github.repository_owner == 'OpenMDAO'
     # run pre-commit checks
     runs-on: ubuntu-latest
 
@@ -26,7 +28,6 @@ jobs:
     - uses: pre-commit/[email protected]
 
   test_ubuntu:
-    if: github.repository_owner == 'OpenMDAO'
     runs-on: ubuntu-latest
 
     timeout-minutes: 90
@@ -42,9 +43,10 @@ jobs:
             SCIPY: '1.6'
             PYOPTSPARSE: 'v2.9.1'
             SNOPT: '7.7'
-            OPENMDAO: '3.27'
+            OPENMDAO: 'dev'
             DYMOS: '1.8.0'
             MAKE_DOCS: 0
+            RUN_BENCHES: 0
 
           # development versions of openmdao/dymos
           - NAME: dev
@@ -56,6 +58,7 @@ jobs:
             OPENMDAO: 'dev'
             DYMOS: 'dev'
             MAKE_DOCS: 0
+            RUN_BENCHES: 0
 
           # latest versions of openmdao/dymos
           - NAME: latest
@@ -64,9 +67,10 @@ jobs:
             SCIPY: 1
             PYOPTSPARSE: 'v2.9.1'
             SNOPT: '7.7'
-            OPENMDAO: 'latest'
+            OPENMDAO: 'dev'
             DYMOS: 'latest'
             MAKE_DOCS: 0
+            RUN_BENCHES: 0
 
           # latest versions of openmdao/dymos for docs only
           - NAME: latest_docs
@@ -75,9 +79,22 @@ jobs:
             SCIPY: 1
             PYOPTSPARSE: 'v2.9.1'
             SNOPT: '7.7'
-            OPENMDAO: 'latest'
+            OPENMDAO: 'dev'
             DYMOS: 'latest'
             MAKE_DOCS: 1
+            RUN_BENCHES: 0
+
+          # latest versions of openmdao/dymos for benches only
+          - NAME: latest_benches
+            PY: 3
+            NUMPY: 1
+            SCIPY: 1
+            PYOPTSPARSE: 'v2.9.1'
+            SNOPT: '7.7'
+            OPENMDAO: 'latest'
+            DYMOS: 'latest'
+            MAKE_DOCS: 0
+            RUN_BENCHES: 1
 
     steps:
       - name: Display run details
@@ -106,6 +123,7 @@ jobs:
         with:
           auto-update-conda: true
           python-version: ${{ matrix.PY }}
+          channels: conda-forge
 
       - name: Install dependencies
         shell: bash -l {0}
@@ -115,7 +133,7 @@ jobs:
           echo "============================================================="
           conda install numpy=${{ matrix.NUMPY }} scipy=${{ matrix.SCIPY }} -q -y
           conda install matplotlib pandas panel hvplot -q -y
-          pip install testflo pyxdsm -q
+          pip install testflo -q
 
       - name: Install pyOptSparse
         if: matrix.PYOPTSPARSE
@@ -138,15 +156,6 @@ jobs:
           pip install git+https://github.com/OpenMDAO/build_pyoptsparse
           build_pyoptsparse -v -b ${{ matrix.PYOPTSPARSE }} $SNOPT
 
-      - name: Install TeX Live
-        shell: bash
-        run: |
-          echo "============================================================="
-          echo "Install TeX Live (for pyXDSM)"
-          echo "============================================================="
-          sudo apt-get update
-          sudo apt-get install texlive-pictures texlive-latex-extra -y
-
       - name: Install OpenMDAO
         if: matrix.OPENMDAO
         shell: bash -l {0}
@@ -202,25 +211,23 @@ jobs:
           path: ${{ matrix.NAME }}_environment.yml
           retention-days: 5
 
-      - name: Generate specs
-        if: matrix.MAKE_DOCS == 0
+      - name: Run tests
+        if: matrix.MAKE_DOCS == 0 && matrix.RUN_BENCHES == 0
         shell: bash -l {0}
         run: |
           echo "============================================================="
-          echo "Generate specs"
+          echo "Run Tests"
           echo "============================================================="
-          cd aviary/xdsm
-          python run_all.py
-          cd ../..
+          testflo . -n 1 --show_skipped --coverage --coverpkg aviary
 
-      - name: Run tests
-        if: matrix.MAKE_DOCS == 0
+      - name: Run benchmarks
+        if: matrix.RUN_BENCHES
         shell: bash -l {0}
         run: |
           echo "============================================================="
-          echo "Run Tests"
+          echo "Run Benchmarks"
           echo "============================================================="
-          testflo . -n 1 --show_skipped --coverage --coverpkg aviary
+          testflo . --testmatch=bench_test*
 
       - name: Build docs
         if: matrix.MAKE_DOCS
@@ -232,13 +239,13 @@ jobs:
           echo "Build the docs"
           echo "============================================================="
           bash build_book.sh
-          
+
       - name: Display doc build reports
         continue-on-error: True
         if: matrix.MAKE_DOCS
         shell: bash -l {0}
         run: |
-          cd $HOME/work/om-Aviary/om-Aviary/aviary/docs
+          cd $HOME/work/Aviary/Aviary/aviary/docs
           find _build/html/reports/ -type f -name '*.log' \
           -exec echo "#################################################################" \; \
           -exec echo {} \; \
@@ -255,7 +262,7 @@ jobs:
           echo "Publishing Docs to github.io"
           echo "============================================================="
           pip install ghp-import
-          cd $HOME/work/om-Aviary/om-Aviary/aviary
+          cd $HOME/work/Aviary/Aviary/aviary
           ghp-import -n -p -f docs/_build/html
 
       - name: Scan for security issues

diff --git a/.github/workflows/test_workflow_no_dev_install.yml b/.github/workflows/test_workflow_no_dev_install.yml
@@ -11,10 +11,12 @@ on:
   merge_group:
     branches: [ main ]
 
+  # Allow running the workflow manually from the Actions tab
+  workflow_dispatch:
+
 jobs:
 
   test_ubuntu_no_dev_install:
-    if: github.repository_owner == 'OpenMDAO'
     runs-on: ubuntu-latest
 
     timeout-minutes: 90
@@ -54,6 +56,17 @@ jobs:
         with:
           auto-update-conda: true
           python-version: ${{ matrix.PY }}
+          channels: conda-forge
+
+      - name: Install OpenMDAO Dev
+        shell: bash -l {0}
+        run: |
+          echo "============================================================="
+          echo "THIS STEP IS TEMPORARY"
+          echo "Please remove after the release of OpenMDAO 3.31."
+          echo "Install OpenMDAO"
+          echo "============================================================="
+          pip install git+https://github.com/OpenMDAO/OpenMDAO
 
       - name: Checkout Aviary
         uses: actions/checkout@v2
@@ -65,7 +78,7 @@ jobs:
           echo "Install Aviary"
           echo "============================================================="
           pip install packaging
-          pip install .[test]
+          pip install .[all]
 
       - name: Display conda environment info
         shell: bash -l {0}
@@ -88,4 +101,4 @@ jobs:
           echo "Run Tests (from directory other than repo root)"
           echo "============================================================="
           cd $HOME
-          testflo aviary -n 1 --show_skipped --timeout=240 --durations=20
+          testflo aviary -n 1 --show_skipped --timeout=240 --durations=20
diff --git a/.gitignore b/.gitignore
@@ -138,9 +138,6 @@ reports/
 *.tex
 *.tikz
 
-# Generated by XDSM files
-*_specs/
-
 #VSCode user settings
 .vscode/