Merge remote-tracking branch 'upstream/master'

.github/workflows/docker.yml

@@ -10,7 +10,7 @@ jobs:
     container: docker://nasatrick/${{matrix.container}}:latest
     strategy:
       matrix:
-        container: [trick_centos7, trick_centos8, trick_ubuntu1804]
+        container: [trick_ubuntu1804]
     steps:
       - name: run tests
         run: |

.github/workflows/python_tests_linux.yml

@@ -24,8 +24,6 @@ jobs:
           - { os: ubuntu, tag: 18.04,   arch: debian }         # EOL April 2023
           - { os: ubuntu, tag: 20.04,   arch: debian }         # EOL April 2025
           - { os: debian, tag: 10,      arch: debian }               # EOL 2024
-          - { os: centos, tag: 7,       arch: rhel   }          # EOL June 2024
-          - { os: centos, tag: latest,  arch: rhel   }     # 8 as of April 2020
         # - { os: fedora, tag: latest,  arch: rhel   }    # 31 as of April 2020
         # - { os: fedora, tag: 33,      arch: rhel   } # feeling confident?
         # - { os: fedora, tag: rawhide, arch: rhel   } # for thrill-seekers only
@@ -102,13 +100,6 @@ jobs:
           - cfg: { os: debian }
             os_deps: >-
               openjdk-11-jdk
-#-------- CentOS Only Dependencies ----------------
-          - cfg: { os: centos }
-            pkg_mgr: yum
-            conf_pkg: yum -y install epel-release && yum -y update
-            os_deps: >-
-              libX11-devel
-              libXt-devel
 #-------- Fedora Only Dependencies ----------------
 #           - cfg: { os: fedora }
 #             pkg_mgr: dnf
@@ -123,21 +114,6 @@ jobs:
             install_gtest: cd /usr/src/gtest && cmake . && make && cp lib/libgtest* /usr/lib/
             tag_deps: >-
               python3.8-dev
-          - cfg: { os: centos, tag: 7 }
-            tag_deps: >-
-              swig3
-              python-devel
-          - cfg: { os: centos, tag: latest }
-            pkg_mgr: dnf
-            conf_pkg: >
-              sed -i -e "s|mirrorlist=|#mirrorlist=|g" -e "s|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g" /etc/yum.repos.d/CentOS-Linux-* &&
-              dnf -y install epel-release &&
-              dnf -y update &&
-              dnf install -y 'dnf-command(config-manager)' &&
-              dnf config-manager --enable powertools
-            tag_deps: >-
-              swig
-              python3-devel diffutils
 #-------- Job definition ----------------
     runs-on: ubuntu-18.04
     container: docker://${{matrix.cfg.os}}:${{matrix.cfg.tag}}

.github/workflows/report_linux.yml

@@ -13,7 +13,6 @@ jobs:
         cfg:
 #-------- Operating Systems ----------------
           - { os: ubuntu,      tag: 22.04,    arch: debian, arch_ver: 12 }
-          - { os: centos,      tag: 7,        arch: rhel,   arch_ver: 7  }
           - { os: rockylinux,  tag: 8,        arch: rhel,   arch_ver: 8  }
           - { os: oraclelinux, tag: 8,        arch: rhel,   arch_ver: 8  }
         python: [3]

.github/workflows/report_linux_py2.yml

@@ -13,15 +13,14 @@ jobs:
         cfg:
 #-------- Operating Systems ----------------
           - { os: ubuntu,      tag: 22.04,    arch: debian, arch_ver: 12 }
-          - { os: centos,      tag: 7,        arch: rhel,   arch_ver: 7  }
           - { os: rockylinux,  tag: 8,        arch: rhel,   arch_ver: 8  }
           - { os: oraclelinux, tag: 8,        arch: rhel,   arch_ver: 8  }
         python: [2]
 
 
     runs-on: ubuntu-latest
     steps:
-    - uses: dorny/test-reporter@v1
+    - uses: dorny/test-reporter@v4
       with:
         artifact: Trick_${{matrix.cfg.os}}${{matrix.cfg.tag}}_py${{matrix.python}} # artifact name
         name: Results_Trick_${{matrix.cfg.os}}${{matrix.cfg.tag}}_py${{matrix.python}} # Name of the check run which will be created

.github/workflows/test_linux.yml

@@ -23,7 +23,6 @@ jobs:
         cfg:
 #-------- Operating Systems ----------------
           - { os: ubuntu,      tag: 22.04,    arch: debian, arch_ver: 12 }
-          - { os: centos,      tag: 7,        arch: rhel,   arch_ver: 7  }
           - { os: rockylinux,  tag: 8,        arch: rhel,   arch_ver: 8  }
           - { os: oraclelinux, tag: 8,        arch: rhel,   arch_ver: 8  }
         python: [3]
@@ -95,30 +94,6 @@ jobs:
               zlib-devel
               python2-devel
               python3-devel
-#-------- RHEL 7-based Only Dependencies ----------------
-          - cfg: { arch: rhel, arch_ver: 7 }
-            pkg_mgr: yum
-            conf_pkg: |
-              sed -i -e "s|mirrorlist=|#mirrorlist=|g" -e "s|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g" /etc/yum.repos.d/CentOS-* &&
-              yum -y install epel-release
-              yum -y update
-              yum -y install wget
-            os_deps: >-
-              libX11-devel
-              libXt-devel
-              swig3
-            install_gtest: |
-              cd /tmp
-              wget https://github.com/google/googletest/archive/release-1.8.0.tar.gz
-              tar xzvf release-1.8.0.tar.gz
-              cd /tmp/googletest-release-1.8.0/googletest
-              cmake .
-              make
-              make install
-              cd /tmp/googletest-release-1.8.0/googlemock
-              cmake .
-              make
-              make install
 #-------- RHEL 8-based Only Dependencies ----------------
           - cfg: { arch: rhel, arch_ver: 8 }
             pkg_mgr: dnf
@@ -171,7 +146,7 @@ jobs:
           python3 -m venv .venv && . .venv/bin/activate && pip3 install -r requirements.txt
           cd ../../../; make test
       - name: Upload Tests
-        uses: actions/upload-artifact@v3.0.0
+        uses: actions/upload-artifact@v4
         if: success() || failure()    # run this step even if previous step failed
         with:
           name: Trick_${{matrix.cfg.os}}${{matrix.cfg.tag}}_py${{matrix.python}}

.github/workflows/test_linux_py2.yml

@@ -13,7 +13,6 @@ jobs:
         cfg:
 #-------- Operating Systems ----------------
           - { os: ubuntu,      tag: 22.04,    arch: debian, arch_ver: 12 }
-          - { os: centos,      tag: 7,        arch: rhel,   arch_ver: 7  }
           - { os: rockylinux,  tag: 8,        arch: rhel,   arch_ver: 8  }
           - { os: oraclelinux, tag: 8,        arch: rhel,   arch_ver: 8  }
         python: [2]

.github/workflows/test_macos.yml

@@ -42,7 +42,7 @@ jobs:
         export MAKEFLAGS=-j4
         cd ../../../; make test
     - name: Upload Tests
-      uses: actions/upload-artifact@v3.0.0
+      uses: actions/upload-artifact@v4
       if: success() || failure()    # run this step even if previous step failed
       with:
         name: Trick_macos

.github/workflows/trickops.yml

@@ -20,7 +20,7 @@ jobs:
       - name: create virtual environment
         run: |
           cd share/trick/trickops/
-          python3 -m venv .venv && source .venv/bin/activate && pip3 install -r requirements.txt
+          python3 -m venv .venv && source .venv/bin/activate && pip3 install --upgrade pip && pip3 install -r requirements.txt
       - name: get and build koviz
         run: |
           cd /tmp/ && wget -q https://github.com/nasa/koviz/archive/refs/heads/master.zip && unzip master.zip
@@ -63,7 +63,7 @@ jobs:
           source ../.venv/bin/activate
           export PATH="/tmp/koviz-master/bin:${PATH}"
           ./run_tests.py
-      - uses: actions/upload-artifact@v3.0.0
+      - uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
           name: doctests

README.md

@@ -6,15 +6,15 @@
 </picture>
 </p>
 
-<p align=left>
+<p align=center>
 <a href="https://github.com/nasa/trick/actions?query=workflow%3ALinux">
-<img src="https://github.com/nasa/trick/workflows/Linux/badge.svg?branch=master" alt="Linux" height=30px>
+<img src="https://github.com/nasa/trick/actions/workflows/test_linux.yml/badge.svg?branch=master" alt="Linux" height=30px>
 </a>
 <a href="https://github.com/nasa/trick/actions?query=workflow%3AmacOS">
-<img src="https://github.com/nasa/trick/workflows/macOS/badge.svg?branch=master" alt="macOS" height=30px>
+<img src="https://github.com/nasa/trick/actions/workflows/test_macos.yml/badge.svg?branch=master" alt="macOS" height=30px>
 </a>
 <a href="https://github.com/nasa/trick/actions?query=workflow%3A32-bit">
-<img src="https://github.com/nasa/trick/workflows/32-bit/badge.svg?branch=master" alt="32-bit" height=30px>
+<img src="https://github.com/nasa/trick/actions/workflows/test_32_oracle.yml/badge.svg?branch=master" alt="32-bit" height=30px>
 </a>
 </p>
 
@@ -24,14 +24,14 @@ The Trick Simulation Environment, developed at the NASA Johnson Space Center, is
 </p>
 
 <table>
-    <col width="33%">
-    <col width="33%">
-    <col width="33%">
+    <col>
+    <col>
+    <col>
     <thead>
-        <tr>
-            <th><a href="https://nasa.github.io/trick/documentation/install_guide/Install-Guide">Install Guide</a></th>
-            <th><a href="https://nasa.github.io/trick/tutorial/Tutorial">Tutorial</a></th>
-            <th><a href="https://nasa.github.io/trick/documentation/Documentation-Home">Documentation</a></th>
+        <tr align="center">
+            <th width="33%"><a href="https://nasa.github.io/trick/documentation/install_guide/Install-Guide">Install Guide</a></th>
+            <th width="33%"><a href="https://nasa.github.io/trick/tutorial/Tutorial">Tutorial</a></th>
+            <th width="33%"><a href="https://nasa.github.io/trick/documentation/Documentation-Home">Documentation</a></th>
         </tr>
     </thead>
     <tbody>
@@ -44,14 +44,14 @@ The Trick Simulation Environment, developed at the NASA Johnson Space Center, is
 </table>
 
 <table>
-    <col width="33%">
-    <col width="33%">
-    <col width="33%">
+    <col>
+    <col>
+    <col>
     <thead>
         <tr>
-            <th><a href="https://nasa.github.io/trick/related_projects/Related-Projects">Related Projects</a></th>
-            <th><a href="https://nasa.github.io/trick/faq/FAQ">Frequently Asked Questions</a></th>
-            <th><a href="https://nasa.github.io/trick/howto_guides/How-To-Guides">How-To Guides</a></th>
+            <th width="33%"><a href="https://nasa.github.io/trick/related_projects/Related-Projects">Related Projects</a></th>
+            <th width="33%"><a href="https://nasa.github.io/trick/faq/FAQ">Frequently Asked Questions</a></th>
+            <th width="33%"><a href="https://nasa.github.io/trick/howto_guides/How-To-Guides">How-To Guides</a></th>
         </tr>
     </thead>
     <tbody>