Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
155 commits
Select commit Hold shift + click to select a range
c6514f1
added scvi-scarches-xgb to label projection
LuckyMD Jul 18, 2022
999d0a6
pre-commit
github-actions[bot] Jul 18, 2022
7b60383
added methods to init and renamed
LuckyMD Jul 18, 2022
88369e0
Merge branch 'scvi-scarches-xgb' of github.com:openproblems-bio/openp…
LuckyMD Jul 18, 2022
ff8572e
Merge branch 'main' of github.com:openproblems-bio/openproblems into …
LuckyMD Jul 18, 2022
85ddc04
updated method naming and added imports
LuckyMD Jul 18, 2022
4e1ee2a
pre-commit
github-actions[bot] Jul 18, 2022
cf4ef8c
Merge branch 'main' of https://github.com/openproblems-bio/openproble…
LuckyMD Jul 19, 2022
a8aab8f
Merge branch 'scvi-scarches-xgb' of github.com:LuckyMD/SingleCellOpen…
LuckyMD Jul 19, 2022
76936d0
made labels categorical
LuckyMD Jul 19, 2022
bc62d91
test integer label encoding
LuckyMD Jul 19, 2022
655a846
pre-commit
github-actions[bot] Jul 19, 2022
a198352
Merge remote-tracking branch 'origin/main' into scvi-scarches-xgb
LuckyMD Jul 19, 2022
02031ee
Automatically create PRs for R dependencies (#499)
scottgigante-immunai Jul 19, 2022
60b5c62
Fix auto update PR creation (#501)
scottgigante-immunai Jul 19, 2022
ab3a7eb
Bump peter-evans/create-pull-request from 3 to 4 (#485)
dependabot[bot] Jul 20, 2022
5932f0a
Include docker image sha in hash (#505)
scottgigante-immunai Jul 20, 2022
e1e4201
Update dbplyr to 2.2.1 (#502)
github-actions[bot] Jul 20, 2022
a8d2086
Add markdownlint to pre-commit (#506)
scottgigante-immunai Jul 20, 2022
d453915
add markdownlint.yaml
scottgigante-immunai Jul 20, 2022
6983971
Merge branch 'main' of github.com:openproblems-bio/openproblems into …
scottgigante-immunai Jul 20, 2022
817ea64
remove unnecessary skips
scottgigante-immunai Jul 20, 2022
f923f03
Update snakemake requirement from ==7.8.* to >=7.8,<7.10 (#503)
dependabot[bot] Jul 21, 2022
d20f2fd
Add dataset reference to dataset decorator (#500)
scottgigante-immunai Jul 21, 2022
59e6c0c
[new task] Spatial decomposition (#309)
giovp Jul 21, 2022
0ada9b3
install pre-dependencies for docker update (#507)
scottgigante-immunai Jul 21, 2022
89649ab
handle comments in r dependencies
scottgigante-immunai Jul 21, 2022
05de621
move .pre-commit.r_requirements to docker/openproblems-github-actions
scottgigante-immunai Jul 21, 2022
6cd43dc
remove unnecessary COPY
scottgigante-immunai Jul 21, 2022
ca012f3
Skip PR if already exists on R auto update (#508)
scottgigante-immunai Jul 22, 2022
b6e8826
fix UPDATE_BRANCH_NAME ref # ci skip
scottgigante-immunai Jul 23, 2022
4c6322e
set committer as well as author # ci skip
scottgigante-immunai Jul 23, 2022
8de6be9
set draft: true # ci skip
scottgigante-immunai Jul 23, 2022
478137f
don't need to skip if branch exists # ci skip
scottgigante-immunai Jul 24, 2022
b05e8cf
Update lintr to 3.0.0 (#512)
github-actions[bot] Jul 24, 2022
4c24dc1
label docker image by git file age (#513)
scottgigante-immunai Jul 24, 2022
bfb76f5
Update tibble to 3.1.8 (#514)
github-actions[bot] Jul 25, 2022
411a416
Cache result of `assert_url_accessible` (#516)
scottgigante-immunai Jul 25, 2022
3c1dec5
Update rpy2 requirement from <3.5.3 to <3.5.4 (#515)
dependabot[bot] Jul 25, 2022
713e2c2
fix tower auth check
scottgigante-immunai Jul 26, 2022
5097b0a
rename variables
scottgigante-immunai Jul 26, 2022
c74994f
Update devtools to 2.4.4 (#517)
github-actions[bot] Jul 26, 2022
d28011c
add destvi (#519)
giovp Jul 26, 2022
63fb80a
increase dataset summary length
scottgigante-immunai Jul 26, 2022
547cfd3
add stereoscope (#521)
giovp Jul 27, 2022
f4a9d39
Update snakemake requirement from <7.10,>=7.8 to >=7.8,<7.11 (#522)
dependabot[bot] Jul 27, 2022
c0b258b
Add `RCTD` to spatial decomposition (#518)
scottgigante-immunai Jul 28, 2022
759d3f3
bugfix renv update
scottgigante-immunai Jul 28, 2022
2c9d2af
Merge branch 'main' of github.com:openproblems-bio/openproblems into …
scottgigante-immunai Jul 28, 2022
5e978e0
pass github_token to docker
scottgigante-immunai Jul 28, 2022
1dc52a4
just suppress warnings
scottgigante-immunai Jul 28, 2022
346682e
Update snakemake requirement from <7.11,>=7.8 to >=7.8,<7.12 (#523)
dependabot[bot] Jul 28, 2022
55df4a4
Update forecast to 8.17.0 (#524)
github-actions[bot] Jul 28, 2022
65c9091
print blank line if file empty
scottgigante-immunai Jul 28, 2022
ac44265
Merge branch 'main' of github.com:openproblems-bio/openproblems into …
scottgigante-immunai Jul 28, 2022
eb1f03b
Update htmlwidgets to 1.5.4 (#525)
github-actions[bot] Aug 2, 2022
7199c93
Update snakemake requirement from <7.12,>=7.8 to >=7.8,<7.13 (#527)
dependabot[bot] Aug 2, 2022
ac2621e
Add dimred task/datasets descriptions (#490)
lazappi Aug 2, 2022
280fba6
added dataset and task descriptions for batch_integration_graph (#498)
LuckyMD Aug 2, 2022
c8bf762
Fill in missing summaries (#529)
scottgigante-immunai Aug 2, 2022
eaf07ce
Update scipy requirement from ==1.8.* to >=1.8,<1.10 (#528)
dependabot[bot] Aug 3, 2022
0bb8074
Update igraph to 1.3.4 (#530)
github-actions[bot] Aug 3, 2022
f036430
use curl for docker hash if docker fails
scottgigante-immunai Aug 3, 2022
75b4061
use patch for scipy>=1.6.0
scottgigante-immunai Aug 3, 2022
3cd88c4
except FileNotFoundError
scottgigante-immunai Aug 4, 2022
91bd9ec
handle missing function
scottgigante-immunai Aug 4, 2022
e57a633
fix rctd celltype counts
scottgigante-immunai Aug 5, 2022
402af43
Sample missing celltypes
scottgigante Aug 6, 2022
6086b0a
Update to nf-openproblems v1.7 (#534)
scottgigante-immunai Aug 9, 2022
64acb78
Fix sampling and reindexing
scottgigante-immunai Aug 9, 2022
f4ef2c8
Update Rcpp to 1.0.9 (#531)
github-actions[bot] Aug 9, 2022
7a7e645
Fix docker unavailable error to include image name (#532)
mxposed Aug 9, 2022
8a6d668
Require minimum celltype count for `spatial_decomposition` (#536)
scottgigante-immunai Aug 9, 2022
1b1c49b
update README (#504)
LuckyMD Aug 11, 2022
2a42aef
Update caret to 6.0-93 (#535)
github-actions[bot] Aug 18, 2022
cebcf1d
replace :: in branch name
scottgigante-immunai Aug 19, 2022
9d1c011
Merge branch 'main' of github.com:openproblems-bio/openproblems into …
scottgigante-immunai Aug 19, 2022
c6fa547
Speed up NuSVR (#540)
scottgigante-immunai Aug 23, 2022
91b4e8e
Run seuratv3 from a fork (#541)
scottgigante-immunai Aug 23, 2022
9c15f95
require predicted proportions to be finite (#542)
scottgigante-immunai Aug 24, 2022
691500c
adding cell2location method (3 options) (#539)
vitkl Aug 25, 2022
6bc9fc7
Update rpy2 requirement from <3.5.4 to <3.5.5 (#538)
dependabot[bot] Aug 25, 2022
5b2d123
Update bioc/ComplexHeatmap to 2.12.1 (#537)
github-actions[bot] Aug 25, 2022
ece79d2
better logic control
scottgigante-immunai Aug 25, 2022
72262d4
fix typo
scottgigante-immunai Aug 25, 2022
83ecff6
manually set PKG_CHANGED if no changes
scottgigante-immunai Aug 25, 2022
109e8ce
Fix process_results (#547)
scottgigante-immunai Aug 26, 2022
bc349bb
Save version and metric result to a file (#548)
scottgigante-immunai Aug 28, 2022
23cdfe5
Enforce data sparsity (#546)
scottgigante-immunai Aug 30, 2022
259b50b
Update snakemake requirement from <7.13,>=7.8 to >=7.8,<7.15 (#549)
dependabot[bot] Aug 30, 2022
7547b05
reference tsne html, not pdf (#562)
scottgigante-immunai Sep 1, 2022
335145e
Update reticulate to 1.25 (#544)
github-actions[bot] Sep 2, 2022
c50c7ca
Bump black from 22.6.0 to 22.8.0 (#561)
dependabot[bot] Sep 2, 2022
9e35d93
Update dplyr to 1.0.10 (#563)
github-actions[bot] Sep 2, 2022
67bce7b
use fewer epochs in test mode (#560)
scottgigante-immunai Sep 12, 2022
662c0f9
require that proportions sum to 1 (#558)
scottgigante-immunai Sep 12, 2022
5a41785
Pin igraph to 0.9 (#569)
scottgigante-immunai Sep 13, 2022
b49a321
Bump actions/checkout from 2 to 3 (#565)
dependabot[bot] Sep 14, 2022
9c8b8ee
sort rank in processed output (#571)
scottgigante-immunai Sep 14, 2022
23b2ba5
Update bioc/scran to 1.24.1 (#568)
github-actions[bot] Sep 14, 2022
e530481
Update cli to 3.4.0 (#567)
github-actions[bot] Sep 15, 2022
8fac7b5
Update lintr to 3.0.1 (#570)
github-actions[bot] Sep 15, 2022
dd37263
Don't write results for incomplete tasks (#573)
scottgigante-immunai Sep 15, 2022
4086eaf
Batch integration embedding (#415)
danielStrobl Sep 16, 2022
1a9ffc9
Update reticulate to 1.26 (#564)
github-actions[bot] Sep 16, 2022
01b3210
Update conos to 1.4.7 (#574)
github-actions[bot] Sep 20, 2022
3fe9251
Website cleanup (#566)
scottgigante Sep 20, 2022
9f7be7c
Fix seuratobject version
scottgigante-immunai Sep 20, 2022
8eed7c0
rename .nextflow.log to nextflow.log
scottgigante-immunai Sep 21, 2022
b5da92e
fix utils namespace clash
scottgigante-immunai Sep 21, 2022
2b57586
Update lifecycle to 1.0.2 (#578)
github-actions[bot] Sep 21, 2022
4cb8399
pin sctransform to 0.3.4
scottgigante-immunai Sep 21, 2022
8c77a0e
add dependabot to docker
scottgigante-immunai Sep 22, 2022
830c7b5
Merge branch 'main' of github.com:openproblems-bio/openproblems into …
scottgigante-immunai Sep 22, 2022
fcd5b87
Quieten more warnings (#453)
scottgigante-immunai Sep 26, 2022
fee2655
Update cli to 3.4.1 (#591)
github-actions[bot] Sep 26, 2022
ef19df9
Task denoising method knn naive (#556)
wes-lewis Sep 26, 2022
4a2bc7d
Update Matrix to 1.5-1 (#579)
github-actions[bot] Sep 26, 2022
299f0d7
Task cell cell comm (#520)
dbdimitrov Sep 26, 2022
56bfa23
fix hvg flakiness
scottgigante-immunai Sep 27, 2022
1068e5f
temporarily remove cell cell comm
scottgigante-immunai Sep 28, 2022
f9ecd71
remove cell cell comm test
scottgigante-immunai Sep 28, 2022
eaa41ba
Update sagemaker requirement in /docker/openproblems (#596)
dependabot[bot] Sep 29, 2022
5c8d7e4
Update bioc/scran to 1.24.1 (#595)
github-actions[bot] Sep 29, 2022
ebabce8
Bump jax from 0.3.6 to 0.3.19 in /docker/openproblems-python-scvi (#597)
dependabot[bot] Sep 29, 2022
6b7ea6c
Update cmake requirement in /docker/openproblems (#600)
dependabot[bot] Sep 29, 2022
9947be1
Update scvi-tools requirement in /docker/openproblems-python-scvi (#601)
dependabot[bot] Sep 29, 2022
f0f1ca1
Bump annoy in /docker/openproblems-python-batch-integration (#580)
dependabot[bot] Sep 30, 2022
c97decf
Use scran log-normalized layer for batch integration instead of count…
danielStrobl Sep 30, 2022
dc8ea08
Bump cmake from 3.18.4 to 3.24.1.1 in /docker/openproblems-python-ext…
dependabot[bot] Sep 30, 2022
6f352b7
Update torch requirement in /docker/openproblems-r-pytorch (#585)
dependabot[bot] Sep 30, 2022
8b570aa
Revert "temporarily remove cell cell comm" (#598)
scottgigante-immunai Sep 30, 2022
7a7e3d7
Update igraph to 1.3.5 (#588)
github-actions[bot] Sep 30, 2022
d729d48
Revert "Update cmake requirement from ==3.22.* to ==3.24.* in /docker…
scottgigante-immunai Oct 3, 2022
4755ff6
install multicoretsne fork
scottgigante-immunai Oct 3, 2022
c31094e
Bump pyyaml from 5.4.1 to 6.0 in /docker/openproblems-python-tf2.4 (#…
dependabot[bot] Oct 3, 2022
2855bf2
Update pytest-cov requirement from ==3.0.* to >=3.0,<4.1 (#599)
dependabot[bot] Oct 4, 2022
f5d7b2e
Update bioc/scuttle to 1.6.3 (#602)
github-actions[bot] Oct 4, 2022
cc6ddda
Task denoising method knn smoothing (#554)
wes-lewis Oct 4, 2022
6bda1ee
use only 10x data for muris senis (#610)
scottgigante-immunai Oct 4, 2022
b578c4f
Batch integration feature (#416)
danielStrobl Oct 5, 2022
175306d
Update conos to 1.4.9 (#613)
github-actions[bot] Oct 6, 2022
3f19f0e
Seurat method for label projection (#533)
mxposed Oct 6, 2022
0eba33a
Add tangram to spatial_decomposition (#587)
scottgigante-immunai Oct 6, 2022
edda25b
Bump jaxlib from 0.3.15 to 0.3.20 in /docker/openproblems-python-scvi…
dependabot[bot] Oct 6, 2022
aa23fcf
Update torch requirement in /docker/openproblems-python-extras (#605)
dependabot[bot] Oct 7, 2022
a4e15bb
Bump styfle/cancel-workflow-action from 0.10.0 to 0.10.1 (#606)
dependabot[bot] Oct 7, 2022
9317cae
pin tabulate
scottgigante-immunai Oct 11, 2022
ab4628a
add rlang traceback in seurat methods (#620)
scottgigante-immunai Oct 12, 2022
83b512e
add destvi dataset (#526)
giovp Oct 12, 2022
78c4cba
Update crayon to 1.5.2 (#617)
github-actions[bot] Oct 12, 2022
2667a27
Update tensorflow-cpu requirement from ==2.7.* to ==2.9.* in /docker/…
dependabot[bot] Oct 13, 2022
d7f9018
Update sagemaker requirement in /docker/openproblems (#619)
dependabot[bot] Oct 13, 2022
0ade0c9
Update devtools to 2.4.5 (#623)
github-actions[bot] Oct 13, 2022
832262c
Merge branch 'main' into scvi-scarches-xgb
scottgigante-immunai Oct 13, 2022
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
10 changes: 6 additions & 4 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@ assignees: ''
---

- [ ] I have checked that this issue has not already been reported.
- [ ] I have confirmed this bug exists on the master branch of openproblems.
- [ ] I have confirmed this bug exists on the `main` branch of openproblems.

---

**Note**: Please read [this guide](https://matthewrocklin.com/blog/work/2018/02/28/minimal-bug-reports) detailing how to provide the necessary information for us to reproduce your bug.

**Note**: Please read [this
guide](https://matthewrocklin.com/blog/work/2018/02/28/minimal-bug-reports) detailing
how to provide the necessary information for us to reproduce your bug.

### Minimal code sample (that we can copy&paste without having any data)

Expand All @@ -29,6 +30,7 @@ assignees: ''

<details>

[Paste the output of scanpy.logging.print_versions() leaving a blank line after the details tag]
<!-- Paste the output of scanpy.logging.print_versions() leaving a blank line after the
details tag -->

</details>
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/propose-a-new-dataset.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ about: Suggest new data for one or more tasks
title: ''
labels: enhancement, dataset
assignees: ''

---

**What is the dataset?**
Expand All @@ -14,4 +13,5 @@ Describe it briefly and include a citation.
Include a link to the publicly available data.

**Which tasks could it be used for?**
If the dataset is to be used for a task that is not yet included in the code base, use the issue template *propose a new task* instead.
If the dataset is to be used for a task that is not yet included in the code base, use
the issue template *propose a new task* instead.
3 changes: 2 additions & 1 deletion .github/ISSUE_TEMPLATE/propose-a-new-method.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ Describe it briefly and include a citation.
Include a link to the publicly available codebase.

**Which task(s) could it be used for?**
If the method is to be used for a task that is not yet included in the code base, use the issue template *propose a new task* instead.
If the method is to be used for a task that is not yet included in the code base, use
the issue template *propose a new task* instead.
3 changes: 2 additions & 1 deletion .github/ISSUE_TEMPLATE/propose-a-new-metric.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ Describe it briefly and include a citation if applicable.
Include a link to the publicly available codebase if available.

**Which task(s) could it be used for?**
If the method is to be used for a task that is not yet included in the code base, use the issue template *propose a new task* instead.
If the method is to be used for a task that is not yet included in the code base, use
the issue template *propose a new task* instead.
3 changes: 2 additions & 1 deletion .github/ISSUE_TEMPLATE/propose-a-new-task.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@ Include links to at least one publicly available dataset that could be used.
Include links to codebases of at least two methods that perform the task.

**Propose metrics**
Describe at least one metric by which to measure success on the task. It must be able to be applied to the proposed datasets.
Describe at least one metric by which to measure success on the task. It must be able to
be applied to the proposed datasets.
54 changes: 54 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,60 @@ updates:
interval: "daily"
open-pull-requests-limit: 1

- package-ecosystem: "pip"
directory: "/docker/openproblems"
schedule:
interval: "daily"
open-pull-requests-limit: 1

- package-ecosystem: "pip"
directory: "/docker/openproblems-github-actions"
schedule:
interval: "daily"
open-pull-requests-limit: 1

- package-ecosystem: "pip"
directory: "/docker/openproblems-python-batch-integration"
schedule:
interval: "daily"
open-pull-requests-limit: 1

- package-ecosystem: "pip"
directory: "/docker/openproblems-python-extras"
schedule:
interval: "daily"
open-pull-requests-limit: 1

- package-ecosystem: "pip"
directory: "/docker/openproblems-python-scvi"
schedule:
interval: "daily"
open-pull-requests-limit: 1

- package-ecosystem: "pip"
directory: "/docker/openproblems-python-tf2.4"
schedule:
interval: "daily"
open-pull-requests-limit: 1

- package-ecosystem: "pip"
directory: "/docker/openproblems-r-base"
schedule:
interval: "daily"
open-pull-requests-limit: 1

- package-ecosystem: "pip"
directory: "/docker/openproblems-r-extras"
schedule:
interval: "daily"
open-pull-requests-limit: 1

- package-ecosystem: "pip"
directory: "/docker/openproblems-r-pytorch"
schedule:
interval: "daily"
open-pull-requests-limit: 1

- package-ecosystem: "github-actions"
directory: "/"
schedule:
Expand Down
19 changes: 13 additions & 6 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,18 @@
### Testing

* [ ] This submission was written on a forked copy of SingleCellOpenProblems
* [ ] GitHub Actions "Run Benchmark" tests are passing on this base branch of this pull request (include link to passed test: )
* [ ] If this pull request is not ready for review (including passing the "Run Benchmark" tests), I will open this PR as a draft (click on the down arrow next to the "Create Pull Request" button)
* [ ] GitHub Actions "Run Benchmark" tests are passing on this base branch of this pull
request (include link to passed test: )
* [ ] If this pull request is not ready for review (including passing the "Run
Benchmark" tests), I will open this PR as a draft (click on the down arrow next to the
"Create Pull Request" button)

### Submission guidelines

* [ ] This submission follows the guidelines in our [Contributing](../blob/master/CONTRIBUTING.md) document
* [ ] I have checked to ensure there aren't other open [Pull Requests](../pulls) for the same update/change
* [ ] This submission follows the guidelines in our
[Contributing](../blob/master/CONTRIBUTING.md) document
* [ ] I have checked to ensure there aren't other open [Pull Requests](../pulls) for the
same update/change

### PR review checklist

Expand All @@ -28,7 +33,9 @@ This PR will be evaluated on the basis of the following checks:
* [ ] The task addresses a valid open problem in single-cell analysis
* [ ] The latest version of master is merged and tested
* [ ] The methods/metrics are imported to `__init__.py` and were tested in the pipeline
* [ ] Method and metric decorators are annotated with paper title, year, author, code version, and date
* [ ] Method and metric decorators are annotated with paper title, year, author, code
version, and date
* [ ] The README gives an outline of the methods, metrics and datasets in the folder
* [ ] The README provides a satisfactory task explanation (for new tasks)
* [ ] The sample test data is appropriate to test implementation of all methods and metrics (for new tasks)
* [ ] The sample test data is appropriate to test implementation of all methods and
metrics (for new tasks)
32 changes: 29 additions & 3 deletions .github/workflows/check_r_dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,33 @@ jobs:
for REQUIREMENTS in $(ls -1 docker/*/r_requirements.txt); do
IMAGE=$(echo ${REQUIREMENTS} | sed 's:^docker/::' | sed 's:/.*::')
docker pull -q singlecellopenproblems/${IMAGE}
docker run -t --rm --user=root singlecellopenproblems/${IMAGE} \
Rscript /usr/src/singlecellopenproblems/scripts/upgrade_renv.R \
/usr/src/singlecellopenproblems/${REQUIREMENTS}
PKG_CHANGED=$(
docker run -t --rm --user=root \
-v $(pwd):/usr/src/singlecellopenproblems \
singlecellopenproblems/${IMAGE} \
Rscript /usr/src/singlecellopenproblems/scripts/upgrade_renv.R \
/usr/src/singlecellopenproblems/${REQUIREMENTS} | \
tee /dev/stderr | \
tail -n 1 | \
sed 's-::-/-g'
)
git diff --exit-code || break
PKG_CHANGED=""
done
echo "PKG_CHANGED=$(echo ${PKG_CHANGED} | sed 's/@/ to /')" >> $GITHUB_ENV
echo "UPDATE_BRANCH_NAME=dependencies/r/${PKG_CHANGED}" >> $GITHUB_ENV

- name: Create Pull Request
if: >-
env.PKG_CHANGED != ''
uses: peter-evans/create-pull-request@v4
with:
branch: ${{ env.UPDATE_BRANCH_NAME }}
delete-branch: true
base: main
labels: dependencies,r
title: "Update ${{ env.PKG_CHANGED }}"
committer: "openproblems-bio <[email protected]>"
author: "openproblems-bio <[email protected]>"
commit-message: "Update ${{ env.PKG_CHANGED }}"
draft: true
8 changes: 4 additions & 4 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ jobs:

steps:
- name: Cancel Previous Runs
uses: styfle/[email protected].0
uses: styfle/[email protected].1
with:
access_token: ${{ github.token }}

- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0

Expand All @@ -47,15 +47,15 @@ jobs:
if: startsWith(runner.os, 'Linux')
with:
path: /usr/local/lib/R/site-library
key: precommit-${{env.LINUX_VERSION}}-${{env.R_VERSION}}-renv-${{ hashFiles('.pre-commit.r_requirements.txt') }}-
key: precommit-${{env.LINUX_VERSION}}-${{env.R_VERSION}}-renv-${{ hashFiles('./docker/openproblems-github-actions/r_requirements.txt') }}-
restore-keys: |
precommit-${{env.LINUX_VERSION}}-${{env.R_VERSION}}-renv-

- name: Install R packages
run: |
renv::restore()
source("./scripts/install_renv.R")
install_renv(".pre-commit.r_requirements.txt")
install_renv("./docker/openproblems-github-actions/r_requirements.txt")
shell: Rscript {0}

- name: Cache pre-commit
Expand Down
39 changes: 27 additions & 12 deletions .github/workflows/process_results.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,10 @@ jobs:
S3_URI="s3://openproblems-nextflow/cwd_example"
fi
aws s3 cp --quiet --recursive "${S3_URI}" /tmp/results/
rm -r website/data/results/*/
rm -r website/content/benchmarks/*/
python openproblems/workflow/parse_nextflow.py /tmp website/data/results
python openproblems/workflow/generate_website_markdown.py website/content/tasks
python openproblems/workflow/generate_website_markdown.py website/content/benchmarks

- name: AWS S3 cleanup
if: "github.event_name == 'repository_dispatch'"
Expand All @@ -81,21 +83,18 @@ jobs:
aws s3 cp --recursive "s3://openproblems-nextflow/cwd_main" "s3://openproblems-nextflow/cwd_example"
aws s3 rm --recursive "s3://openproblems-nextflow/cwd_main"

- name: Commit result
uses: EndBug/add-and-commit@v9
- name: Push to openproblems-bio/website
if: "github.event_name == 'repository_dispatch'"
with:
author_name: openproblems-bio
author_email: [email protected]
message: 'Update benchmark results # ci skip'
add: "['data/results', 'content/tasks']"
new_branch: ${{ env.UPDATE_BRANCH_NAME }}
push: true
cwd: './website'
shell: bash
working-directory: './website'
env:
GITHUB_TOKEN: ${{ secrets.GH_ACTIONS_WEBSITE_PAT }}
run: |
git push origin "${UPDATE_BRANCH_NAME}"

- name: Create Pull Request
if: "github.event_name == 'repository_dispatch'"
uses: peter-evans/create-pull-request@v3
uses: peter-evans/create-pull-request@v4
with:
branch: ${{ env.UPDATE_BRANCH_NAME }}
delete-branch: true
Expand All @@ -104,3 +103,19 @@ jobs:
reviewers: scottgigante, dburkhardt
path: './website'
token: ${{ secrets.GH_ACTIONS_WEBSITE_PAT }}
author: "openproblems-bio <[email protected]>"
commit-message: "Update benchmark results # ci skip"

- name: Upload results on test
if: "github.event_name != 'repository_dispatch'"
uses: actions/upload-artifact@main
with:
name: results
path: website/data/results

- name: Upload markdown on test
if: "github.event_name != 'repository_dispatch'"
uses: actions/upload-artifact@main
with:
name: markdown
path: website/content/benchmarks
Loading