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

Refactor PyCIEMSS to use ChiRho and remove stale functionality #396

Merged
merged 44 commits into from
Dec 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
7266dda
remove all files except interfaces and integration demo
SamWitty Oct 24, 2023
75d749f
remove tests
SamWitty Oct 24, 2023
b3a8957
minor refactor of dependencies and added lint
SamWitty Oct 24, 2023
48597c3
added back in github workflows
SamWitty Oct 24, 2023
77194a8
add quote around 3.10
SamWitty Oct 24, 2023
c6c624a
added makefile for offline lint testing
SamWitty Oct 24, 2023
2399e95
ran make format
SamWitty Oct 24, 2023
8491551
removed Ensemble
SamWitty Oct 24, 2023
c20e665
added types for interfaces, and deleted ODE implementations
SamWitty Oct 24, 2023
b67aedf
lint
SamWitty Oct 24, 2023
ddc32ed
fixed makefile for tests
SamWitty Oct 24, 2023
519a05e
get test_modules_import working
SamWitty Oct 24, 2023
0537a22
lint
SamWitty Oct 24, 2023
8fb5788
remove src from directory
SamWitty Oct 24, 2023
4421a22
remove stale notebooks
SamWitty Oct 24, 2023
dc4c674
remove src from lint scripts
SamWitty Oct 24, 2023
4d3b07e
modify setup.cfg
SamWitty Oct 24, 2023
c6a3695
added pytest cov
SamWitty Oct 24, 2023
9d2bc70
remove .gitignore in notebook
SamWitty Oct 24, 2023
d01ed8f
remove stale INSTALL.md
SamWitty Oct 24, 2023
ea18151
remove pytest-cov
SamWitty Oct 24, 2023
cd63161
rename test to tests
SamWitty Oct 24, 2023
1476799
update scripts with new tests filepath
SamWitty Oct 24, 2023
dc10213
fix Makefile to point to correct tests
SamWitty Oct 26, 2023
a7e5416
AMR and MIRA integration with Chirho (#398)
SamWitty Oct 26, 2023
99ab914
`simulate` TA4 interface (#399)
SamWitty Oct 30, 2023
c5eaaac
remove placeholder parameters (#403)
SamWitty Nov 1, 2023
6c6d8ee
Support for regulatory networks (#404)
SamWitty Nov 2, 2023
6887529
Remove package finding AND add to module exports (#407)
fivegrant Nov 3, 2023
73d2134
Add basic output formatting (#405)
SamWitty Nov 6, 2023
3a87e3f
`calibrate` TA4 interface (#401)
SamWitty Nov 8, 2023
a9bd9d8
Basic functionality for sampling from an ensemble of dynamical system…
SamWitty Nov 14, 2023
a1f2168
Update test fixtures to include new gold-standard AMRs (#415)
SamWitty Nov 16, 2023
833b204
Add basic integration notebook and CI for testing notebooks (#416)
SamWitty Nov 16, 2023
5e35b73
Add observables to sample output (#412)
SamWitty Nov 16, 2023
bc08821
updating urls for petri and stock flow example amrs (#419)
sabinala Dec 11, 2023
f5cb70b
Bump ChiRho version in dependencies and update any changes resulting …
SamWitty Dec 12, 2023
58e11c1
scale back tests (#427)
SamWitty Dec 13, 2023
029eb8d
Parameter Intervention (#424)
SamWitty Dec 13, 2023
2381404
Adding regnet urls to fixtures, and limiting number of examples to th…
sabinala Dec 13, 2023
73a27b2
Add parameter interventions to calibrate and refactor interface tests…
SamWitty Dec 15, 2023
7bc0a9e
Add datafile input for `calibrate` (#432)
SamWitty Dec 18, 2023
edd54f7
bump pyciemss version (#433)
SamWitty Dec 18, 2023
1e0db1e
Merge remote-tracking branch 'origin' into staging-refactor
SamWitty Dec 18, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
File renamed without changes.
38 changes: 38 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Lint

on:
push:
branches: [ main, staging-refactor ]
pull_request:
branches: [ main, staging-refactor ]

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.8]

steps:
- uses: actions/checkout@v2

- name: pip cache
uses: actions/cache@v1
with:
path: ~/.cache/pip
key: lint-pip-${{ hashFiles('**/pyproject.toml') }}
restore-keys: |
lint-pip-

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

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -e .[tests]

- name: Lint
run: ./scripts/lint.sh
40 changes: 0 additions & 40 deletions .github/workflows/python-package.yml

This file was deleted.

53 changes: 53 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: Test

on:
push:
branches: [ main, staging-refactor ]
pull_request:
branches: [ main, staging-refactor ]

jobs:
build:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
python-version: [3.8, 3.9, '3.10']
os: [ubuntu-latest] # , macos-latest]

steps:
- uses: actions/checkout@v2
- name: Ubuntu cache
uses: actions/cache@v1
if: startsWith(matrix.os, 'ubuntu')
with:
path: ~/.cache/pip
key:
${{ matrix.os }}-${{ matrix.python-version }}-${{ hashFiles('**/pyproject.toml') }}
restore-keys: |
${{ matrix.os }}-${{ matrix.python-version }}-

- name: macOS cache
uses: actions/cache@v1
if: startsWith(matrix.os, 'macOS')
with:
path: ~/Library/Caches/pip
key:
${{ matrix.os }}-${{ matrix.python-version }}-${{ hashFiles('**/pyproject.toml') }}
restore-keys: |
${{ matrix.os }}-${{ matrix.python-version }}-

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

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -e .[tests]

- name: Test
shell: bash
run: |
pytest tests/ -s -n auto
40 changes: 40 additions & 0 deletions .github/workflows/test_notebooks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: Test notebooks

on:
schedule:
- cron: '0 0 * * 6' # Run at midnight on Saturdays
push:
branches: [ main, staging-refactor ]
pull_request:
branches: [ main, staging-refactor ]

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.8]

steps:
- uses: actions/checkout@v2

- name: pip cache
uses: actions/cache@v1
with:
path: ~/.cache/pip
key: lint-pip-${{ hashFiles('**/pyproject.toml') }}
restore-keys: |
lint-pip-

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

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -e .[tests]

- name: Run Notebook Test
run: python -m pytest --nbval-lax docs/source/interfaces.ipynb
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -339,3 +339,4 @@ venv/
*~
*_schema.json
*data_with_missing_entries.csv
*.nix
17 changes: 0 additions & 17 deletions INSTALL.md

This file was deleted.

10 changes: 10 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
lint: FORCE
./scripts/lint.sh

format:
./scripts/clean.sh

tests: lint FORCE
pytest -v tests -n auto

FORCE:
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
exclude_patterns = []

extensions += ['sphinx.ext.autodoc', 'autoapi.extension']
autoapi_dirs = ['../../src']
autoapi_dirs = ['../../pyciemss']


# -- Options for HTML output -------------------------------------------------
Expand Down
Loading
Loading