Skip to content

Commit fa66d3a

Browse files
committed
Provide more flexible versioning in the setup.py and requirements.txt to allow usage of anaconda pre-built packages during installation
1 parent fa05115 commit fa66d3a

File tree

3 files changed

+17
-16
lines changed

3 files changed

+17
-16
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ pip-log.txt
2626
.coverage
2727
.tox
2828
nosetests.xml
29+
.ropeproject
2930

3031
# Translations
3132
*.mo

requirements.txt

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
numpy>=1.7.1
2-
pyparsing==1.5.7
3-
pysam==0.7.4
4-
cyvcf==0.1.7
5-
PyYAML==3.10
6-
pybedtools==0.6.2
7-
python-graph-core==1.8.2
8-
python-graph-dot==1.8.2
9-
bottle==0.11.6
10-
ipython-cluster-helper==0.1.7
2+
pyparsing>=1.5.6,<=1.5.7
3+
pysam>=0.6
4+
cyvcf>=0.1.7
5+
PyYAML>=3.10
6+
pybedtools>=0.6.2
7+
python-graph-core>=1.8.2
8+
python-graph-dot>=1.8.2
9+
bottle>=0.11.6
10+
ipython-cluster-helper>=0.1.9
1111
bx-python>=0.7.1
1212
git+https://github.com/arq5x/gemini.git

setup.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@
2020
setup(
2121
name="gemini",
2222
version=version,
23-
install_requires=['numpy>=1.6.0',
24-
'pyparsing>=1.5.6,<=1.5.7',
25-
'pysam>=0.7.4',
26-
'cyvcf>=0.1.7',
27-
'PyYAML >= 3.10',
28-
'pybedtools>=0.6.1',
23+
install_requires=['numpy>=1.6.0',
24+
'pyparsing>=1.5.6,<=1.5.7',
25+
'pysam>=0.6',
26+
'cyvcf>=0.1.7',
27+
'PyYAML >= 3.10',
28+
'pybedtools>=0.6.2',
2929
'python-graph-core >= 1.8.2',
3030
'python-graph-dot >= 1.8.2',
3131
'bottle >= 0.11',
32-
'ipython-cluster-helper >= 0.1.7',
32+
'ipython-cluster-helper >= 0.1.9',
3333
'bx-python >= 0.7.1'],
3434
dependency_links = ['http://github.com/arq5x/cyvcf/tarball/master#egg=cyvcf-0.1.5'],
3535
requires = ['python (>=2.5, <3.0)'],

0 commit comments

Comments
 (0)