Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pull in updates from development branch #10

Merged
merged 45 commits into from
Sep 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
3d51618
Update to use rich.progress from pip
dbhart Sep 1, 2024
ba67658
Adding initial sphinx configuration files for api documentation
dbhart Sep 1, 2024
4632563
Uploading libsansmic files
dbhart Sep 2, 2024
bc72469
Update to sync
dbhart Sep 3, 2024
e4067d6
Fix argparse error
dbhart Sep 3, 2024
313ee6a
Updates to documentation formatting and locations
dbhart Sep 4, 2024
e85eaf9
Documentation updates and results outputs
dbhart Sep 5, 2024
814c8c4
Bump beta version number
dbhart Sep 5, 2024
96cf4b3
Update outputs and demonstration notebook
dbhart Sep 5, 2024
f0226f1
Merge pull request #1 from dbhart/mydev-cee
dbhart Sep 5, 2024
7ff2af1
Update to results format.
dbhart Sep 6, 2024
664bbda
Updates to make C output closer to old fortran and allow it to be tur…
dbhart Sep 6, 2024
3d29674
Merge pull request #2 from dbhart/mydev-cee
dbhart Sep 6, 2024
d40273d
Minor fix to basic notebook
dbhart Sep 6, 2024
d97d0ff
Merge branch 'dev' of github.com:dbhart/sansmic into dev
dbhart Sep 6, 2024
e1172d8
Minor typo fixes; add regression testing
dbhart Sep 7, 2024
d0c6267
Create CONTRIBUTING.md
dbhart Sep 7, 2024
cc6c25a
Merge branch 'dev' of github.com:dbhart/sansmic into dev
dbhart Sep 7, 2024
c82f112
Create codeql.yml
dbhart Sep 9, 2024
440d617
Merge branch 'sandialabs:main' into dev
dbhart Sep 9, 2024
e4ec14f
Add regression testing continuous integration.
dbhart Sep 9, 2024
8ebffc3
Fix bugs in CI workflow
dbhart Sep 9, 2024
f91ea75
No tomllib on py39 or py310 by default
dbhart Sep 9, 2024
94b3d35
No tomllib on py39 or py310 by default
dbhart Sep 9, 2024
9312837
No tomllib on py39 or py310 by default
dbhart Sep 9, 2024
ad4dec3
No tomllib on py39 or py310 by default
dbhart Sep 9, 2024
adb4370
Adding IO unit tests for scenarios/dat files
dbhart Sep 10, 2024
f93b710
Update installation instructions
dbhart Sep 10, 2024
257887f
Backwards compatibility fix for tests
dbhart Sep 10, 2024
b7b68f2
Add codecov badge
dbhart Sep 10, 2024
81211bb
Codecov configuration
dbhart Sep 10, 2024
17b25d8
Codecov configuration
dbhart Sep 10, 2024
a0f87b3
Merge branch 'sandialabs:main' into dev
dbhart Sep 10, 2024
827be9a
Add in CSV output files
dbhart Sep 11, 2024
9c15101
Updates to the documentation and some bug fixes for the python codes
dbhart Sep 11, 2024
31aae3f
Fix outting CSV files without extra linespacing
dbhart Sep 11, 2024
bf9db38
Update codecov config
dbhart Sep 11, 2024
5f24917
Add initial sansmic.app module tests
dbhart Sep 12, 2024
8874a3e
Added more testing
dbhart Sep 12, 2024
a93d6b2
Can't test file formats that don't get pulled in in the requirements,…
dbhart Sep 12, 2024
5d9f62a
Can't test file formats that don't get pulled in in the requirements,…
dbhart Sep 12, 2024
32a07c0
Test the last pieces of the app module
dbhart Sep 12, 2024
477644c
app updates to gracefully handle filesystem errors
dbhart Sep 13, 2024
1138796
enhance codecov monitoring
dbhart Sep 13, 2024
082dffa
updates to coverage configuration
dbhart Sep 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 28 additions & 10 deletions .github/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,37 @@ coverage:
target: auto
threshold: 5
base: auto
flags:
- "unit"
paths:
- "src/"
- "!tests/"
- "tests/"
# advanced settings
# branches:
# - main
branches:
- main
- dev
if_ci_failed: error #success, failure, error, ignore
informational: false
only_pulls: false
tests: # declare a new status context "tests"
target: 100% # we always want 100% coverage here
paths:
- "tests/" # only include coverage in "tests/" folder
only_pulls: true

comment:
layout: "header, diff, components" # show component info in the PR comment

component_management:
default_rules:
statuses:
- type: project
target: auto
branches:
- "!main"
individual_components:
- component_id: module_python
name: python code
paths:
- src/python/**
- component_id: module_ext
name: C++ code
paths:
- src/ext_modules/**
- component_id: module_tests
name: tests
paths:
- tests/**
95 changes: 95 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL Advanced"

on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]
schedule:
- cron: '42 21 * * 3'

jobs:
analyze:
name: Analyze (${{ matrix.language }})
# Runner size impacts CodeQL analysis time. To learn more, please see:
# - https://gh.io/recommended-hardware-resources-for-running-codeql
# - https://gh.io/supported-runners-and-hardware-resources
# - https://gh.io/using-larger-runners (GitHub.com only)
# Consider using larger runners or machines with greater resources for possible analysis time improvements.
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
permissions:
# required for all workflows
security-events: write

# required to fetch internal or private CodeQL packs
packages: read

# only required for workflows in private repositories
actions: read
contents: read

strategy:
fail-fast: false
matrix:
include:
- language: c-cpp
build-mode: manual
- language: python
build-mode: none
# CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
# Use `c-cpp` to analyze code written in C, C++ or both
# Use 'java-kotlin' to analyze code written in Java, Kotlin or both
# Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
# To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
# see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
# If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
steps:
- name: Checkout repository
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
build-mode: ${{ matrix.build-mode }}
# If you wish to specify custom queries, you can do so here or in a config file.
# 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.

# For more 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

# If the analyze step fails for one of the languages you are analyzing with
# "We were unable to automatically build your code", modify the matrix above
# to set the build mode to "manual" for that language. Then modify this step
# to build your code.
# ℹ️ 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
- if: matrix.build-mode == 'manual'
shell: bash
run: |
echo 'If you are using a "manual" build mode for one or more of the' \
'languages you are analyzing, replace this with the commands to build' \
'your code, for example:'
echo ' make bootstrap'
echo ' make release'
python -m pip install pybind11 setuptools
python setup.py build_ext

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
82 changes: 82 additions & 0 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
name: Continuous Integration

on:
push:
branches:
- main
pull_request:
workflow_dispatch:

defaults:
run:
shell: bash

permissions:
contents: read

jobs:
test:
runs-on: ubuntu-latest
strategy:
matrix:
version: ["3.9", "3.10", "3.11", "3.12"]
steps:

- name: Harden Runner
uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
with:
egress-policy: audit

- name: Check out the commit
uses: actions/checkout@v3

- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: ~${{ matrix.version }}

- name: Install development dependencies
run: |
python3 -m pip install --upgrade pip
python3 -m pip install -r requirements.txt
python3 -m pip install tomli

- name: Test install
run: python3 -m pip install .[tests]

- name: Test with pytest
run: python3 -m pytest --cov=sansmic --cov=tests examples/ tests/

- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v3
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

# - name: Check documentation coverage
# run: |
# make coverage
# mv build/coverage/python.txt ../docs-coverage-report-${{ matrix.version }}.txt
# working-directory: ./docs

# - name: Archive documentation coverage results
# uses: actions/upload-artifact@v3
# with:
# name: docs-coverage-report-${{ matrix.version }}
# path: docs-coverage-report-${{ matrix.version }}.txt

- name: Test uninstall
run: python3 -m pip uninstall -y my-repository-name

# commits:
# runs-on: ubuntu-latest
# steps:
# - name: Harden Runner
# uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
# with:
# egress-policy: audit

# - name: Conventional Commits
# uses: taskmedia/action-conventional-commits@9148865058f63a6cb560ff4bfd7d534505f43646 # v1.1.3
# with:
# types: >
# build|chore|ci|docs|feat|fix|minor|patch|perf|style|refactor|test
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -167,3 +167,4 @@ _local/

docs/apidocs/pymodule/**
docs/apidocs/clibrary/**
DEPLOY.bat
Loading
Loading