Skip to content

Commit c38a48c

Browse files
authored
Merge pull request #276 from AlexsLemonade/jashapiro/unslim-a-bit
Add rtracklayer and updates
2 parents 114af48 + c3fd477 commit c38a48c

7 files changed

+375
-249
lines changed

.github/workflows/build-docker.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ jobs:
3939
tags: |
4040
type=semver,pattern={{raw}}
4141
type=edge,branch=main
42+
type=ref,event=pr
4243
4344
- name: Build full image
4445
uses: docker/build-push-action@v5

docker/make-requirements.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pip-compile --no-annotate --strip-extras --output-file=requirements_anndata.txt
1414
pip-compile --no-annotate --strip-extras --output-file=requirements_scvi.txt requirements_scvi.in
1515

1616
# slim lockfile
17-
Rscript scripts/make-lockfile.R -f renv_slim.lock -p batchelor
17+
Rscript scripts/make-lockfile.R -f renv_slim.lock -p batchelor,rtracklayer
1818

1919
# reports lockfile
2020
Rscript scripts/make-lockfile.R -f renv_reports.lock -p ComplexHeatmap,ggforce,kableExtra,rmarkdown

docker/renv_reports.lock

+34-44
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,13 @@
6868
},
6969
"BiocManager": {
7070
"Package": "BiocManager",
71-
"Version": "1.30.22",
71+
"Version": "1.30.23",
7272
"Source": "Repository",
73-
"Repository": "CRAN",
73+
"Repository": "RSPM",
7474
"Requirements": [
7575
"utils"
7676
],
77-
"Hash": "d57e43105a1aa9cb54fdb4629725acb1"
77+
"Hash": "47e968dfe563c1b22c2e20a067ec21d5"
7878
},
7979
"BiocNeighbors": {
8080
"Package": "BiocNeighbors",
@@ -652,7 +652,7 @@
652652
},
653653
"SparseArray": {
654654
"Package": "SparseArray",
655-
"Version": "1.4.0",
655+
"Version": "1.4.1",
656656
"Source": "Bioconductor",
657657
"Repository": "Bioconductor 3.19",
658658
"Requirements": [
@@ -666,9 +666,10 @@
666666
"XVector",
667667
"matrixStats",
668668
"methods",
669-
"stats"
669+
"stats",
670+
"utils"
670671
],
671-
"Hash": "84697af365cd2a6367fa5d2c1086298c"
672+
"Hash": "c309b75cfb1f52407e40ebbd151af932"
672673
},
673674
"SummarizedExperiment": {
674675
"Package": "SummarizedExperiment",
@@ -852,14 +853,13 @@
852853
},
853854
"broom": {
854855
"Package": "broom",
855-
"Version": "1.0.5",
856+
"Version": "1.0.6",
856857
"Source": "Repository",
857858
"Repository": "RSPM",
858859
"Requirements": [
859860
"R",
860861
"backports",
861862
"dplyr",
862-
"ellipsis",
863863
"generics",
864864
"glue",
865865
"lifecycle",
@@ -869,7 +869,7 @@
869869
"tibble",
870870
"tidyr"
871871
],
872-
"Hash": "fd25391c3c4f6ecf0fa95f1e6d15378c"
872+
"Hash": "a4652c36d1f8abfc3ddf4774f768c934"
873873
},
874874
"bslib": {
875875
"Package": "bslib",
@@ -895,14 +895,14 @@
895895
},
896896
"cachem": {
897897
"Package": "cachem",
898-
"Version": "1.0.8",
898+
"Version": "1.1.0",
899899
"Source": "Repository",
900900
"Repository": "RSPM",
901901
"Requirements": [
902902
"fastmap",
903903
"rlang"
904904
],
905-
"Hash": "c35768291560ce302c0a6589f92e837d"
905+
"Hash": "cd9a672193789068eb5a2aad65a0dedf"
906906
},
907907
"callr": {
908908
"Package": "callr",
@@ -1155,7 +1155,7 @@
11551155
},
11561156
"dqrng": {
11571157
"Package": "dqrng",
1158-
"Version": "0.3.2",
1158+
"Version": "0.4.0",
11591159
"Source": "Repository",
11601160
"Repository": "RSPM",
11611161
"Requirements": [
@@ -1164,7 +1164,7 @@
11641164
"Rcpp",
11651165
"sitmo"
11661166
],
1167-
"Hash": "824df2aeba88d701df5e79018b35b815"
1167+
"Hash": "b31198e6268008976689b196bf9d883f"
11681168
},
11691169
"dtplyr": {
11701170
"Package": "dtplyr",
@@ -1202,17 +1202,6 @@
12021202
],
12031203
"Hash": "20783ecb7e7cea3f351e8b21153e3eb8"
12041204
},
1205-
"ellipsis": {
1206-
"Package": "ellipsis",
1207-
"Version": "0.3.2",
1208-
"Source": "Repository",
1209-
"Repository": "RSPM",
1210-
"Requirements": [
1211-
"R",
1212-
"rlang"
1213-
],
1214-
"Hash": "bb0eec2fe32e88d9e2836c2f73ea2077"
1215-
},
12161205
"evaluate": {
12171206
"Package": "evaluate",
12181207
"Version": "0.23",
@@ -1238,17 +1227,17 @@
12381227
},
12391228
"farver": {
12401229
"Package": "farver",
1241-
"Version": "2.1.1",
1230+
"Version": "2.1.2",
12421231
"Source": "Repository",
12431232
"Repository": "RSPM",
1244-
"Hash": "8106d78941f34855c440ddb946b8f7a5"
1233+
"Hash": "680887028577f3fa2a81e410ed0d6e42"
12451234
},
12461235
"fastmap": {
12471236
"Package": "fastmap",
1248-
"Version": "1.1.1",
1237+
"Version": "1.2.0",
12491238
"Source": "Repository",
12501239
"Repository": "RSPM",
1251-
"Hash": "f7736a18de97dea803bde0a2daaafb27"
1240+
"Hash": "aa5e1cd11c2d15497494c5292d7ffcc8"
12521241
},
12531242
"fishpond": {
12541243
"Package": "fishpond",
@@ -2077,13 +2066,13 @@
20772066
},
20782067
"openssl": {
20792068
"Package": "openssl",
2080-
"Version": "2.1.2",
2069+
"Version": "2.2.0",
20812070
"Source": "Repository",
2082-
"Repository": "CRAN",
2071+
"Repository": "RSPM",
20832072
"Requirements": [
20842073
"askpass"
20852074
],
2086-
"Hash": "ea2475b073243d9d338aa8f086ce973e"
2075+
"Hash": "2bcca3848e4734eb3b16103bc9aa4b8e"
20872076
},
20882077
"optparse": {
20892078
"Package": "optparse",
@@ -2251,14 +2240,14 @@
22512240
},
22522241
"ragg": {
22532242
"Package": "ragg",
2254-
"Version": "1.3.0",
2243+
"Version": "1.3.2",
22552244
"Source": "Repository",
22562245
"Repository": "RSPM",
22572246
"Requirements": [
22582247
"systemfonts",
22592248
"textshaping"
22602249
],
2261-
"Hash": "082e1a198e3329d571f4448ef0ede4bc"
2250+
"Hash": "e3087db406e079a8a2fd87f413918ed3"
22622251
},
22632252
"rappdirs": {
22642253
"Package": "rappdirs",
@@ -2406,7 +2395,7 @@
24062395
},
24072396
"rmarkdown": {
24082397
"Package": "rmarkdown",
2409-
"Version": "2.26",
2398+
"Version": "2.27",
24102399
"Source": "Repository",
24112400
"Repository": "RSPM",
24122401
"Requirements": [
@@ -2425,7 +2414,7 @@
24252414
"xfun",
24262415
"yaml"
24272416
],
2428-
"Hash": "9b148e7f95d33aac01f31282d49e4f44"
2417+
"Hash": "27f9502e1cdbfa195f94e03b0f517484"
24292418
},
24302419
"rstudioapi": {
24312420
"Package": "rstudioapi",
@@ -2664,7 +2653,7 @@
26642653
},
26652654
"stringi": {
26662655
"Package": "stringi",
2667-
"Version": "1.8.3",
2656+
"Version": "1.8.4",
26682657
"Source": "Repository",
26692658
"Repository": "RSPM",
26702659
"Requirements": [
@@ -2673,7 +2662,7 @@
26732662
"tools",
26742663
"utils"
26752664
],
2676-
"Hash": "058aebddea264f4c99401515182e656a"
2665+
"Hash": "39e1144fd75428983dc3f63aa53dfa91"
26772666
},
26782667
"stringr": {
26792668
"Package": "stringr",
@@ -2727,14 +2716,15 @@
27272716
},
27282717
"systemfonts": {
27292718
"Package": "systemfonts",
2730-
"Version": "1.0.6",
2719+
"Version": "1.1.0",
27312720
"Source": "Repository",
27322721
"Repository": "RSPM",
27332722
"Requirements": [
27342723
"R",
2735-
"cpp11"
2724+
"cpp11",
2725+
"lifecycle"
27362726
],
2737-
"Hash": "6d538cff441f0f1f36db2209ac7495ac"
2727+
"Hash": "213b6b8ed5afbf934843e6c3b090d418"
27382728
},
27392729
"textshaping": {
27402730
"Package": "textshaping",
@@ -2859,13 +2849,13 @@
28592849
},
28602850
"tinytex": {
28612851
"Package": "tinytex",
2862-
"Version": "0.50",
2852+
"Version": "0.51",
28632853
"Source": "Repository",
28642854
"Repository": "RSPM",
28652855
"Requirements": [
28662856
"xfun"
28672857
],
2868-
"Hash": "be7a76845222ad20adb761f462eed3ea"
2858+
"Hash": "d44e2fcd2e4e076f0aac540208559d1d"
28692859
},
28702860
"tweenr": {
28712861
"Package": "tweenr",
@@ -3032,15 +3022,15 @@
30323022
},
30333023
"xfun": {
30343024
"Package": "xfun",
3035-
"Version": "0.43",
3025+
"Version": "0.44",
30363026
"Source": "Repository",
30373027
"Repository": "RSPM",
30383028
"Requirements": [
30393029
"grDevices",
30403030
"stats",
30413031
"tools"
30423032
],
3043-
"Hash": "ab6371d8653ce5f2f9290f4ec7b42a8e"
3033+
"Hash": "317a0538d32f4a009658bcedb7923f4b"
30443034
},
30453035
"xml2": {
30463036
"Package": "xml2",

0 commit comments

Comments
 (0)