Merge branch 'dev' into feature/64-correlation-heat-map

Author: teubert

.github/workflows/codeql.yml

@@ -20,6 +20,7 @@ jobs:
   code_ql:
     name: CodeQL Analysis
     runs-on: ubuntu-latest
+
     permissions:
       actions: read
       contents: read
@@ -29,11 +30,7 @@ jobs:
       fail-fast: false
       matrix:
         language: [ 'python' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
-        # Use only 'java' to analyze code written in Java, Kotlin or both
-        # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
-        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
-
+        
     steps:
     - name: Checkout repository
       uses: actions/checkout@v3
@@ -47,14 +44,10 @@ jobs:
         # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.
 
-        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-        # queries: security-extended,security-and-quality
-
-
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
+    # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
     # If this step fails, then you should remove it and run the build manually (see below)
-    # - name: Autobuild
-    #   uses: github/codeql-action/autobuild@v2
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun

.github/workflows/coverage.yml

@@ -4,7 +4,7 @@ on:
   push:
   pull_request:
     paths:
-      - prog_models
+      - progpy
 
 jobs:
   coverage:
@@ -20,16 +20,16 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies cache
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ~/.cache/pip
-        key: pip-cache
+        key: pip-cache-datadriven
     - name: Install additional dependencies
       run: |
         pip install coverage
         pip install importlib_metadata
     - name: Update
-      run: pip install --upgrade --upgrade-strategy eager -e .
+      run: pip install --upgrade --upgrade-strategy eager -e .[datadriven]
     - name: Run coverage
       run: |
         coverage run -m tests.test_base_models

.github/workflows/greetings.yml

@@ -12,4 +12,4 @@ jobs:
     - uses: actions/first-interaction@v1
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
-        pr-message: "Thank you for your contributions. If you haven't already, please send a signed Contributor License Agreement (CLA) to Christopher Teubert ([email protected]). CLAs can be found here: https://github.com/nasa/prog_models/tree/master/forms.  Also, make sure you're familiar with the developer notes and contributing sections of our developers guide, https://nasa.github.io/progpy/dev_guide.html#notes-for-developers"
+        pr-message: "Thank you for your contributions. If you haven't already, please send a signed Contributor License Agreement (CLA) to Christopher Teubert ([email protected]). CLAs can be found here: https://github.com/nasa/progpy/tree/master/forms.  Also, make sure you're familiar with the developer notes and contributing sections of our developers guide, https://nasa.github.io/progpy/dev_guide.html#notes-for-developers"

.github/workflows/print-benchmarking.yml

@@ -1,7 +1,15 @@
-# name: Print Benchmarking
+name: Print Benchmarking
 
-# on: pull_request
+on: pull_request
 
+jobs:
+  benchmark_branch:
+    timeout-minutes: 5
+    runs-on: ubuntu-latest
+    steps:
+      - name: Placeholder
+        run: echo "Placholder benchmark in process of getting fixed - job will pass."
+        
 # jobs:
 #   benchmark_branch: 
 #     timeout-minutes: 20

.github/workflows/python-package-manual.yml

@@ -0,0 +1,28 @@
+# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Manual Tests
+
+on:
+  workflow_dispatch:
+
+jobs:
+  test_tutorials_part_2:
+    timeout-minutes: 35
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.9'
+    - name: Install dependencies cache
+      uses: actions/cache@v4
+      with:
+        path: ~/.cache/pip
+        key: pip-cache-datadriven
+    - name: Update
+      run: |
+        pip install --upgrade --upgrade-strategy eager -e .[datadriven,test]
+    - name: Run tests
+      run: python -m tests.test_tutorials_part_2