Skip to content

Commit 0012682

Browse files
authored
Merge pull request #20 from openpipelines-bio/enable-deflate64-compression
enable deflate64 compression
2 parents 664c73a + b840204 commit 0012682

File tree

11 files changed

+38
-14
lines changed

11 files changed

+38
-14
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
## NEW FUNCTIONALITY
1414

15-
* `convert`: Updated multiple components to accept spatial output bundles in .zip format (for CosMx, Xenium and Aviti) as input (PR #19).
15+
* `convert`: Updated multiple components to accept spatial output bundles in .zip format (for CosMx, Xenium and Aviti) as input (PR #19, PR #20).
1616

1717
# openpipeline_spatial 0.1.0
1818

src/convert/from_cells2stats_to_h5mu/config.vsh.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,15 @@ engines:
114114
- type: apt
115115
packages:
116116
- procps
117+
- build-essential
118+
- zlib1g-dev
119+
- git
117120
- type: python
118121
__merge__: [/src/base/requirements/anndata_mudata.yaml, .]
119-
packages:
120-
- pyarrow
122+
packages: [ pyarrow ]
123+
# Windows explorer uses DEFLATE64 compression for large ZIP files,
124+
# which is not supported by most standard library zipfile module
125+
git: [ https://codeberg.org/miurahr/[email protected] ]
121126
test_setup:
122127
- type: apt
123128
packages:

src/convert/from_cells2stats_to_h5mu/script.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import anndata as ad
77
import re
88
import json
9-
import zipfile
9+
import zipfile_inflate64 as zipfile
1010
import os
1111

1212
## VIASH START

src/convert/from_cosmx_to_h5mu/config.vsh.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,15 @@ engines:
5454
- type: apt
5555
packages:
5656
- procps
57+
- build-essential
58+
- zlib1g-dev
59+
- git
5760
- type: python
58-
__merge__: [/src/base/requirements/anndata_mudata.yaml, /src/base/requirements/squidpy.yaml]
61+
__merge__: [/src/base/requirements/anndata_mudata.yaml, /src/base/requirements/squidpy.yaml, .]
62+
packages: [ pyarrow ]
63+
# Windows explorer uses DEFLATE64 compression for large ZIP files,
64+
# which is not supported by most standard library zipfile module
65+
git: [ https://codeberg.org/miurahr/[email protected] ]
5966
test_setup:
6067
- type: apt
6168
packages:

src/convert/from_cosmx_to_h5mu/script.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import os
33
import squidpy as sq
44
import mudata as mu
5-
import zipfile
5+
import zipfile_inflate64 as zipfile
66
from pathlib import Path
77

88
## VIASH START

src/convert/from_cosmx_to_spatialexperiment/test.R

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,9 @@ spe <- paste0(meta[["resources_dir"]], "/Lung5_Rep2_tiny")
7575
out_rds <- "output.rds"
7676

7777
create_folder_archive <- function(
78-
folder_path,
79-
archive = "Lung5_Rep2_tiny.zip") {
78+
folder_path,
79+
archive = "Lung5_Rep2_tiny.zip"
80+
) {
8081
old_wd <- getwd()
8182
on.exit(setwd(old_wd))
8283
setwd(meta$resources_dir)

src/convert/from_xenium_to_h5mu/config.vsh.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,15 @@ engines:
5656
- type: apt
5757
packages:
5858
- procps
59+
- build-essential
60+
- zlib1g-dev
61+
- git
5962
- type: python
6063
__merge__: [/src/base/requirements/anndata_mudata.yaml, /src/base/requirements/scanpy.yaml, .]
61-
packages:
62-
- pyarrow
64+
packages: [ pyarrow ]
65+
# Windows explorer uses DEFLATE64 compression for large ZIP files,
66+
# which is not supported by most standard library zipfile module
67+
git: [ https://codeberg.org/miurahr/[email protected] ]
6368
test_setup:
6469
- type: apt
6570
packages:

src/convert/from_xenium_to_h5mu/script.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import scanpy as sc
44
import pandas as pd
55
import mudata as mu
6-
import zipfile
6+
import zipfile_inflate64 as zipfile
77
import json
88
import os
99

src/convert/from_xenium_to_spatialdata/config.vsh.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,14 @@ engines:
9191
- type: apt
9292
packages:
9393
- procps
94+
- build-essential
95+
- zlib1g-dev
96+
- git
9497
- type: python
95-
__merge__: [ /src/base/requirements/spatialdata-io.yaml ]
98+
# Windows explorer uses DEFLATE64 compression for large ZIP files,
99+
# which is not supported by most standard library zipfile module
100+
git: [ https://codeberg.org/miurahr/[email protected] ]
101+
__merge__: [ /src/base/requirements/spatialdata-io.yaml, . ]
96102
test_setup:
97103
- type: apt
98104
packages:

src/convert/from_xenium_to_spatialdata/script.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import sys
22
from spatialdata_io import xenium
3-
import zipfile
3+
import zipfile_inflate64 as zipfile
44
from pathlib import Path
55

66
## VIASH START

0 commit comments

Comments
 (0)