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

Added in srst2 recipes for 0.1.4.6 and 0.2.0 #3767

Merged
merged 1 commit into from
Feb 13, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions recipes/srst2/0.1.4.6/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash

python setup.py install
38 changes: 38 additions & 0 deletions recipes/srst2/0.1.4.6/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package:
name: srst2
version: 0.1.4.6

source:
fn: v0.1.6.tar.gz
url: https://github.com/katholt/srst2/archive/v0.1.6.tar.gz
sha256: 24cbd03933d4cc14bbfa7f8a073c9b0caafb13d55afb3bfa25f8b093fc5bc615
patches:
- use_setuptools.patch

build:
number: 0
skip: True #[not py27]

requirements:
build:
- python
- setuptools
- numpy >=1.7.1
- scipy >=0.12.0

run:
- python
- numpy >=1.7.1
- scipy >=0.12.0
- bowtie2 >=2.1.0
- samtools ==0.1.18
Copy link
Member

Choose a reason for hiding this comment

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

Maybe this can be removed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not sure what your askin. If it is in regards to the 0.1.4.6 recipe, I do need it as we have a galaxy tool for 0.1.4.6 that we would like to continue using until we have time to validate 0.2 for our purposes.


test:
commands:
- srst2 -h 2>&1 | grep 'SRST2 - Short Read Sequence Typer' > /dev/null
- getmlst.py -h 2>&1 | grep 'usage' > /dev/null

about:
home: https://github.com/katholt/srst2
license: BSD
summary: 'Short Read Sequence Typing for Bacterial Pathogens'
12 changes: 12 additions & 0 deletions recipes/srst2/0.1.4.6/use_setuptools.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/setup.py b/setup.py
index 37f4ca0..dbd1308 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python

-from distutils.core import setup
+from setuptools import setup

setup(
name='srst2',
3 changes: 3 additions & 0 deletions recipes/srst2/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash

python setup.py install
38 changes: 38 additions & 0 deletions recipes/srst2/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package:
name: srst2
version: 0.2.0

source:
fn: v0.2.0.tar.gz
url: https://github.com/katholt/srst2/archive/v0.2.0.tar.gz
sha256: 352c59bdf00039dfa5610a4b88049a0eb114d7c2a305d4924b6e605cc6d15123
patches:
- use_setuptools.patch

build:
number: 0
skip: True #[not py27]

requirements:
build:
- python
- setuptools
- numpy >=1.7.1
- scipy >=0.12.0

run:
- python
- numpy >=1.7.1
- scipy >=0.12.0
- bowtie2 >=2.1.0
- samtools ==0.1.18
Copy link
Member

Choose a reason for hiding this comment

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

do you need setuptools in your run section?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

setuptools is just needed to be able to install the python package, from looking at other recipes it only appears to be included in the build section.


test:
commands:
- srst2 -h 2>&1 | grep 'SRST2 - Short Read Sequence Typer' > /dev/null
- getmlst.py -h 2>&1 | grep 'usage' > /dev/null

about:
home: https://github.com/katholt/srst2
license: BSD
summary: 'Short Read Sequence Typing for Bacterial Pathogens'
12 changes: 12 additions & 0 deletions recipes/srst2/use_setuptools.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/setup.py b/setup.py
index 37f4ca0..dbd1308 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python

-from distutils.core import setup
+from setuptools import setup

setup(
name='srst2',