Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
132 commits
Select commit Hold shift + click to select a range
8611da0
testing automated comments on PRs
mogres Sep 27, 2022
4c43fad
add baseline for packing bias test
mogres Sep 27, 2022
94b00ac
formatting workflow file
mogres Sep 27, 2022
aa70ff1
try adding image as comment
mogres Sep 27, 2022
232e823
adding recipe and config file for test packing
mogres Sep 27, 2022
94d8185
install all dependencies
mogres Sep 27, 2022
7526fb5
adding updated python version to workflow
mogres Sep 27, 2022
61f07ef
updating log file path
mogres Sep 27, 2022
fc39b2c
updating log file path
mogres Sep 27, 2022
c622b29
updating log file path
mogres Sep 28, 2022
368efdf
fixing merge conflicts
mogres Sep 28, 2022
4ec2f57
updating log file path
mogres Sep 28, 2022
3a56382
print log file path
mogres Sep 28, 2022
23e97a5
add working directory to workflow
mogres Sep 28, 2022
7871a16
add pwd to workflow
mogres Sep 28, 2022
d38cfd1
try changing working directory
mogres Sep 28, 2022
90b2606
add cd before pack command
mogres Sep 28, 2022
7bf98e7
fix workflow file to remove duplicate run command
mogres Sep 28, 2022
d3631c6
printing out __file__
mogres Sep 28, 2022
05d089e
activate conda environment in yml
mogres Sep 28, 2022
59cdba6
add conda init statement
mogres Sep 28, 2022
904a7f0
remove troubleshooting statement
mogres Sep 28, 2022
d4357fd
adding package data to setup.py
mogres Sep 28, 2022
b19f810
typo
meganrm Sep 30, 2022
d63c449
make config optional
meganrm Sep 30, 2022
d3b25b3
[wip] - download file structurre
meganrm Sep 30, 2022
2f213a0
Update analyze.yml
meganrm Sep 30, 2022
ccac0ea
Update analyze.yml
meganrm Sep 30, 2022
cdff90c
Update analyze.yml
meganrm Sep 30, 2022
ef2af42
Update analyze.yml
meganrm Oct 1, 2022
f27d2a5
testing logger config location
meganrm Oct 1, 2022
07854f7
testing
meganrm Oct 1, 2022
6bcd777
using config file
meganrm Oct 1, 2022
aa07bca
change output
meganrm Oct 1, 2022
aafa109
comment
meganrm Oct 1, 2022
53f12b3
Update analyze.yml
meganrm Oct 2, 2022
9dedec6
Update analyze.yml
meganrm Oct 2, 2022
f452145
Update analyze.yml
meganrm Oct 2, 2022
3fd79c9
Update analyze.yml
meganrm Oct 2, 2022
8501044
Update analyze.yml
meganrm Oct 2, 2022
111cd2e
Update analyze.yml
meganrm Oct 2, 2022
545873e
Update analyze.yml
meganrm Oct 2, 2022
7f55273
Update analyze.yml
meganrm Oct 3, 2022
f015b5b
Update analyze.yml
meganrm Oct 3, 2022
7fb06d1
Update analyze.yml
meganrm Oct 3, 2022
92c0564
format
meganrm Oct 3, 2022
3b1a1e3
dry out code
meganrm Oct 3, 2022
3159eb5
Update analyze.yml
meganrm Oct 3, 2022
ca48677
Update analyze.yml
meganrm Oct 3, 2022
dc6248b
Update analyze.yml
meganrm Oct 3, 2022
aefaf9e
Update analyze.yml
meganrm Oct 3, 2022
16d89ed
Update ci.yml
meganrm Oct 3, 2022
0119787
Update analyze.yml
meganrm Oct 3, 2022
918c26e
Update analyze.yml
meganrm Oct 3, 2022
a7581fa
Update analyze.yml
meganrm Oct 3, 2022
5e14b44
Update analyze.yml
meganrm Oct 3, 2022
105e4e4
Update analyze.yml
meganrm Oct 3, 2022
e68beda
Update analyze.yml
meganrm Oct 3, 2022
a1a7595
delete file
meganrm Oct 13, 2022
a79b6b0
fix test for running on actions
meganrm Oct 13, 2022
0c64e87
fix path for test data
meganrm Oct 13, 2022
55bcd7d
delint
meganrm Oct 13, 2022
0298266
fix format version
meganrm Oct 13, 2022
0244cf7
Merge branch 'main' of https://github.com/mesoscope/cellpack into fea…
mogres Nov 10, 2022
0173f10
Merge branch 'feature/fire-analyze' of https://github.com/mesoscope/c…
mogres Nov 10, 2022
0ddf2da
analyze gradients with peroxisomes
mogres Nov 10, 2022
07ef99e
WIP: analyses on gradient packings
mogres Nov 14, 2022
717031e
Merge branch 'feature/gradients' of github.com:mesoscope/cellpack int…
mogres Nov 14, 2022
557c7ab
running radial gradient test
mogres Nov 14, 2022
eeb610f
Merge branch 'main' of github.com:mesoscope/cellpack into feature/per…
mogres Nov 14, 2022
2eabe58
saving surface distances to grid file
mogres Nov 14, 2022
ff1d817
streamline analysis loop, update gradient analyses
mogres Nov 15, 2022
4ec082b
updating test gradient recipe
mogres Nov 15, 2022
4b5c48f
updating analysis workflow to set similarity values
mogres Nov 16, 2022
a199d71
ignore test outputs, add analysis config
mogres Nov 21, 2022
f691e7c
calculate average similarity values between packings
mogres Nov 22, 2022
1c11028
changing filename in ioutils
mogres Nov 22, 2022
38f66e1
Merge branch 'feature/gradients' of github.com:mesoscope/cellpack int…
mogres Nov 22, 2022
b0659d7
Merge branch 'feature/gradients' of github.com:mesoscope/cellpack int…
mogres Nov 22, 2022
9a8ad87
use trimesh proximity to calculate surface distances
mogres Nov 22, 2022
d9ec584
remove surface points from saved grid file
mogres Nov 23, 2022
eae7503
removed list conversion for `seed_distances`
mogres Nov 30, 2022
d093238
Merge branch 'main' of github.com:mesoscope/cellpack into feature/gra…
mogres Dec 13, 2022
cb1b8a6
remove unneeded function argument
mogres Dec 14, 2022
42e7014
format
mogres Dec 14, 2022
315c474
Merge branch 'main' of github.com:mesoscope/cellpack into feature/aut…
mogres Dec 14, 2022
866e68c
install all requirements for testing
mogres Dec 14, 2022
2677fc9
update path to logger config
mogres Dec 14, 2022
69e2a7a
updated test recipes
mogres Dec 15, 2022
fc2a2ae
Merge branch 'feature/gradient_analysis' of github.com:mesoscope/cell…
mogres Dec 15, 2022
8acc3c0
convert numpy array to list before writing to JSON
mogres Dec 15, 2022
7c7f677
add mdutils to requirements
mogres Dec 16, 2022
c949493
create analysis report through workflow
mogres Dec 16, 2022
adefff8
update analysis workflow to only use analysis config
mogres Dec 16, 2022
8fdc600
update ci workflow
mogres Dec 16, 2022
de7ebfb
update cml command
mogres Dec 16, 2022
f7b9384
update path to analysis report
mogres Dec 16, 2022
aa10786
remove packing bias test
mogres Dec 16, 2022
947d096
add image through workflow directly
mogres Dec 16, 2022
703d057
update deprecated publish method
mogres Dec 16, 2022
6e41e4e
update paths for image and report
mogres Dec 16, 2022
21db186
look for image in local github file structure
mogres Dec 16, 2022
ba2323f
update path to image file in config
mogres Dec 16, 2022
f971245
print paths to distance distribution image
mogres Dec 16, 2022
fe99691
add debug statement in workflow
mogres Dec 16, 2022
641fb1c
fix analysis ci workflow
mogres Dec 16, 2022
802af8f
fix debug statements, use direct path to results image
mogres Dec 16, 2022
220576e
add packing image, plot distance between ingredients
mogres Dec 16, 2022
0d7d7d9
format
mogres Dec 16, 2022
3318bc0
try full path to image
mogres Dec 18, 2022
79a0acb
update previous comment instead of adding a new one
mogres Dec 18, 2022
15bbdae
update error message, try cml publish comment
mogres Dec 18, 2022
691bfd8
fix path to image file
mogres Dec 19, 2022
3afbb87
rearrange workflow; update path to results
mogres Dec 19, 2022
be653a0
reorder workflow
mogres Dec 19, 2022
fbbd46e
try showing contents of folder earlier
mogres Dec 19, 2022
e75665d
try showing folder contents earlier
mogres Dec 19, 2022
a051c63
revert to original workflow
mogres Dec 19, 2022
7664814
revert analysis config
mogres Dec 19, 2022
79f3389
use github results path in output report
mogres Dec 19, 2022
cc94a1b
use numpy for sphere distance calcs, fix function input, fix 2d plot …
mogres Jan 5, 2023
c368bcf
update formatting of report
mogres Jan 11, 2023
efb0bce
Merge branch 'main' of github.com:mesoscope/cellpack into feature/aut…
mogres Jan 18, 2023
b191693
try to fix linting issues
mogres Jan 18, 2023
b165d00
formatting
mogres Jan 18, 2023
bdc74bc
upload to aws
meganrm Feb 1, 2023
53d363a
dont double checkout
meganrm Feb 1, 2023
625affb
remove log statement
meganrm Feb 2, 2023
d62bb07
reference aws bucket
meganrm Feb 2, 2023
a4db393
Merge branch 'main' into feature/automated_test
meganrm Feb 2, 2023
fdce425
remove duplicate entry from gitignore
mogres Feb 3, 2023
fdc5348
* move imports to top of the file
mogres Feb 3, 2023
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
51 changes: 51 additions & 0 deletions .github/workflows/analyze.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: Analyze

on: push

jobs:
Analyze:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: [3.9]
os: [ubuntu-latest]
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install Dependencies
run: |
python -m pip install --upgrade pip
pip install .[all]
- name: Pack test recipe
run: |
pack -r cellpack/tests/recipes/test_spheres.json -c cellpack/tests/packing-configs/test_config.json
analyze -a cellpack/tests/analysis-configs/PR_analysis_config.json
- name: Upload results
uses: actions/upload-artifact@v3
with:
name: results
path: cellpack/tests/outputs/test_spheres/
Comment:
runs-on: ubuntu-latest
needs: [Analyze]
steps:
- uses: actions/checkout@v3
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1-node16
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: us-west-2
- uses: actions/download-artifact@v3
- name: Copy files to results bucket
run: aws s3 sync ./results s3://cellpack-results --delete
- uses: iterative/setup-cml@v1
- name: Update comment
env:
REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
cml comment update --watermark-title="{workflow} report" ./results/analysis_report.md --pr
cat ./results/analysis_report.md
24 changes: 17 additions & 7 deletions .github/workflows/build-main.yml → .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,24 @@
name: Build Main
name: Continuous Integration

on:
push:
branches:
- main
tags:
- "v*"
pull_request:
branches:
- main
schedule:
# <minute [0,59]> <hour [0,23]> <day of the month [1,31]> <month of the year [1,12]> <day of the week [0,6]>
# <minute [0,59]> <hour [0,23]> <day of the month [1,31]>
# <month of the year [1,12]> <day of the week [0,6]>
# https://pubs.opengroup.org/onlinepubs/9699919799/utilities/crontab.html#tag_20_25_07
# Run every Monday at 18:00:00 UTC (Monday at 10:00:00 PST)
- cron: '0 18 * * 1'
# Run every Monday at 10:24:00 PST
# (Since these CRONs are used by a lot of people -
# let's be nice to the servers and schedule it _not_ on the hour)
- cron: "24 18 * * 1"
workflow_dispatch:


jobs:
test:
Expand All @@ -27,10 +37,10 @@ jobs:
- name: Install Dependencies
run: |
python -m pip install --upgrade pip
pip install .[test]
pip install .[all]
- name: Test with pytest
run: |
pytest --cov-report xml --cov=cellpack cellpack/tests/
pytest cellpack/tests/
- name: Upload codecov
uses: codecov/codecov-action@v1

Expand All @@ -55,7 +65,7 @@ jobs:
black --check cellpack

publish:
if: contains(github.event.head_commit.message, 'Bump version')
if: success() && startsWith(github.ref, 'refs/tags/')
needs: [lint, test]
runs-on: ubuntu-latest

Expand Down
48 changes: 0 additions & 48 deletions .github/workflows/test-and-lint.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ coverage.xml
*.cover
.hypothesis/
.pytest_cache/
cellpack/tests/outputs/

# Translations
*.mo
Expand Down Expand Up @@ -119,4 +120,3 @@ cellpack/tests/outputs/
# data
data/
**/converted/*

10 changes: 10 additions & 0 deletions analysis-configs/gradient_analysis_config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"version": "1.0.0",
"format_version": "1.0",
"input_path": "out/gradients_X/jitter/",
"output_path": "out/gradients_X/",
"ingredient_key" : "ext_A",
"run_similarity_analysis": true,
"save_plots": true,
"max_plots_to_save": 1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TODO: formalize the analysis config options and add default settings for all of them

}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"version": "1.0.0",
"format_version": "1.0",
"input_path": "out/analyze/peroxisomes_test/spheresSST/",
"output_path": "out/analyze/peroxisomes_test/spheresSST/",
"input_path": "out/analyze/peroxisomes_gradient/spheresSST/",
"output_path": "out/analyze/peroxisomes_gradient/",
"ingredient_key" : "membrane_interior_peroxisome",
"mesh_paths" : {
"inner": "data/mean-nuc.obj",
Expand All @@ -11,6 +11,6 @@
"run_similarity_analysis": true,
"get_parametrized_representation": true,
"save_plots": true,
"get_correlations": true,
"max_plots_to_save": 1
"get_correlations": false,
"max_plots_to_save": 5
}
Loading