Skip to content

Commit

Permalink
Update h5ad-to-arrow dependencies (#27)
Browse files Browse the repository at this point in the history
* h5ad_to_arrow: bump anndata to 0.7.1, h5ad to 2.10.0

Properly fixes this:

"""
Traceback (most recent call last):
  File "/main.py", line 67, in <module>
    main(args.input_dir, args.output_dir)
  File "/main.py", line 50, in main
    h5ad_to_arrow(input_path, arrow_path)
  File "/main.py", line 13, in h5ad_to_arrow
    ann_data = read_h5ad(h5ad_file)
  File "/opt/conda/lib/python3.7/site-packages/anndata/readwrite/read.py", line 447, in read_h5ad
    constructor_args = _read_args_from_h5ad(filename=filename, chunk_size=chunk_size)
  File "/opt/conda/lib/python3.7/site-packages/anndata/readwrite/read.py", line 486, in _read_args_from_h5ad
    _read_key_value_from_h5(f, d, key, chunk_size=chunk_size)
  File "/opt/conda/lib/python3.7/site-packages/anndata/readwrite/read.py", line 510, in _read_key_value_from_h5
    _read_key_value_from_h5(f, d[key_write], key + '/' + k, k, chunk_size)
  File "/opt/conda/lib/python3.7/site-packages/anndata/readwrite/read.py", line 510, in _read_key_value_from_h5
    _read_key_value_from_h5(f, d[key_write], key + '/' + k, k, chunk_size)
  File "/opt/conda/lib/python3.7/site-packages/anndata/readwrite/read.py", line 544, in _read_key_value_from_h5
    key, value = postprocess_reading(key, value)
  File "/opt/conda/lib/python3.7/site-packages/anndata/readwrite/read.py", line 541, in postprocess_reading
    value = value.astype(new_dtype)
ValueError: invalid shape in fixed-type tuple.
"""

* Ignore .idea/ (PyCharm project directory)

* h5ad-to-arrow.cwl: bump container version to new 0.0.2

In a conversation with Ilan just now, he said that I should tag and push a
new container with updated dependencies. As a bonus, this will hopefully
cause the Travis build to succeed now that the dependencies match what's in
`requirements-freeze.txt`.

* h5ad-to-arrow/.../requirements-freeze.txt: Add new auto-pulled packages
  • Loading branch information
mruffalo authored May 14, 2020
1 parent e5833fb commit 3cec360
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 5 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -132,3 +132,6 @@ dmypy.json

# Pyre type checker
.pyre/

# PyCharm project directory
.idea/
8 changes: 6 additions & 2 deletions containers/h5ad-to-arrow/context/requirements-freeze.txt
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
anndata==0.6.22.post1
anndata==0.7.1
asn1crypto==1.0.1
certifi==2019.11.28
cffi==1.12.3
chardet==3.0.4
conda==4.7.12
conda-package-handling==1.6.0
cryptography==2.7
h5py==2.9.0
h5py==2.10.0
idna==2.8
importlib-metadata==1.6.0
natsort==6.2.0
numpy==1.17.4
packaging==20.3
pandas==0.25.3
pyarrow==0.15.1
pycosat==0.6.3
pycparser==2.19
pyOpenSSL==19.0.0
pyparsing==2.4.7
PySocks==1.7.1
python-dateutil==2.8.1
pytz==2019.3
Expand All @@ -24,3 +27,4 @@ scipy==1.3.3
six==1.13.0
tqdm==4.36.1
urllib3==1.24.2
zipp==3.1.0
4 changes: 2 additions & 2 deletions containers/h5ad-to-arrow/context/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
anndata==0.6.22.post1
anndata==0.7.1
pyarrow==0.15.1
h5py==2.9.0 # anndata fails on some inputs: https://github.com/hubmapconsortium/portal-containers/issues/1
h5py==2.10.0
2 changes: 1 addition & 1 deletion h5ad-to-arrow.cwl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class: CommandLineTool
baseCommand: ['python', '/main.py', '--output_dir', '.', '--input_dir']
hints:
DockerRequirement:
dockerPull: hubmap/portal-container-h5ad-to-arrow:0.0.1
dockerPull: hubmap/portal-container-h5ad-to-arrow:0.0.2
inputs:
input_directory:
type: Directory
Expand Down

0 comments on commit 3cec360

Please sign in to comment.