Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Scanpy scripts #11413

Merged
merged 20 commits into from
Oct 23, 2018
Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
7ceae2d
Bump version
pinin4fjords Sep 3, 2018
d1e1b69
Merge remote-tracking branch 'upstream/master'
pinin4fjords Sep 4, 2018
d858ecd
Merge remote-tracking branch 'upstream/master'
pinin4fjords Sep 4, 2018
63d48c8
Merge remote-tracking branch 'upstream/master'
pinin4fjords Sep 5, 2018
9958fb2
Merge remote-tracking branch 'upstream/master'
pinin4fjords Sep 5, 2018
f402a12
Merge remote-tracking branch 'upstream/master'
pinin4fjords Sep 10, 2018
c412893
Merge remote-tracking branch 'upstream/master'
pinin4fjords Sep 24, 2018
23b80d2
Merge remote-tracking branch 'upstream/master'
pinin4fjords Oct 8, 2018
d3eeee3
Merge remote-tracking branch 'upstream/master'
pinin4fjords Oct 8, 2018
68a3067
Merge remote-tracking branch 'upstream/master'
pinin4fjords Oct 10, 2018
81d85c0
Merge remote-tracking branch 'upstream/master'
pinin4fjords Oct 16, 2018
a1a9fcb
First implementation of scanpy-scripts bioconda recipe.
nh3 Oct 19, 2018
5202d60
fix path in build.sh
nh3 Oct 19, 2018
02d9e08
Remove "noarch" flag as requested by bioconda recipe checklist
nh3 Oct 19, 2018
0b194c3
Add a post install notice that post install test needs bats-core.
nh3 Oct 19, 2018
ad88fe8
Add more dependencies
nh3 Oct 19, 2018
e106a53
Skip building for python versions other than 3.6
nh3 Oct 19, 2018
9d1551b
Target v0.0.2 which has non-ascii characters removed
nh3 Oct 22, 2018
60f85db
Lower version requirement for pandas and matplotlib to be the same as…
nh3 Oct 23, 2018
efe0cf1
Requirement matplotlib>=3.0.0, declare noarch
nh3 Oct 23, 2018
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
5 changes: 5 additions & 0 deletions recipes/scanpy-scripts/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/usr/bin/env bash

mkdir -p $PREFIX/bin
cp *.py $PREFIX/bin
cp *.sh $PREFIX/bin
48 changes: 48 additions & 0 deletions recipes/scanpy-scripts/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{% set version = '0.0.2' %}

package:
name: scanpy-scripts
version: {{ version }}

source:
url: https://github.com/ebi-gene-expression-group/scanpy-scripts/archive/v{{ version }}.tar.gz
sha256: 4d9d3193857e5f801540236db547aa91db6c1db47c43943915f130c4fa8a31b2

build:
number: 0
Copy link
Member

Choose a reason for hiding this comment

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

This package could be a noarch: python package isn't it?

Is this working under python 3.7?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, it's pure python, haven't tested it on 3.7 yet, but should be fine. I removed the noarch flag according to:

Update 7 Feb 2018: Previously we had recommended that if the recipe is a pure Python package, it should be marked as a “noarch” package (details). However due to technical incompatibilies we can’t do this – so please DO NOT use "noarch" for now.

Is it obsolete now?

I'll have one more check to see if lower version of pandas and matplotlib works then it's good to merge.

Copy link
Member

Choose a reason for hiding this comment

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

Yes sorry, this is outdated.

Copy link
Contributor Author

@nh3 nh3 Oct 23, 2018

Choose a reason for hiding this comment

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

@bgruening py37 would only work with matplotlib>=3.0, where py36 work with matplotlib>=2.2. scanpy uses skip: True # [not py36] and requires matplotlib>=2.2.0. It probably makes sense to be consistent with it, so I am not doing noarch: generic for now. Is it ok?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Strangely, matplotlib>=2.2.0 brought back the "Failed to import any qt binding" error in mulled test, while it passed on my "local" mulled test. Bump the requirement back to matplotlib>=3.0.0 and declare noarch this time.

skip: True # [not py36]

requirements:
host:
- python>=3.6
run:
- python>=3.6
- pandas>=0.22
- matplotlib>=3.0.0
- scanpy>=1.3.2

test:
commands:
- scanpy-read-10x.py --help
- scanpy-filter-cells.py --help
- scanpy-filter-genes.py --help
- scanpy-normalise-data.py --help
- scanpy-find-variable-genes.py --help
- scanpy-scale-data.py --help
- scanpy-run-pca.py --help
- scanpy-neighbours.py --help
- scanpy-run-umap.py --help
- scanpy-run-tsne.py --help
- scanpy-find-cluster.py --help
- scanpy-find-markers.py --help
- which scanpy-scripts-post-install-tests.sh

about:
home: https://github.com/ebi-gene-expression-group/scanpy-scripts
dev_url: https://github.com/ebi-gene-expression-group/scanpy-scripts
license: GPL-3
summary: A set of wrappers for individual components of the scanpy package.
Functions in python packages are hard to call when building workflows
outside of python, so this package adds a set of simple wrappers with
robust argument parsing.
license_family: GPL
4 changes: 4 additions & 0 deletions recipes/scanpy-scripts/post-link.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env bash

echo 'Post install test script "scanpy-scripts-post-install-tests.sh" requires'
echo 'conda package "bats-core".'