Skip to content

Commit

Permalink
Merge pull request #229 from broadinstitute/ct-update-reqs
Browse files Browse the repository at this point in the history
update dateutil and paramiko
  • Loading branch information
tomkinsc committed Sep 26, 2018
2 parents 3fbb697 + 5d3a1e5 commit 4743ffd
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
4 changes: 2 additions & 2 deletions conda-environment_py2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies:
- htslib=1.3.1=0
- peewee=2.8.0
- pysam=0.9.1
- python-dateutil=2.3
- python-dateutil=2.7.3
- samtools=1.3.1
- selscan=1.1.0b
- biopython=1.67
Expand All @@ -34,7 +34,7 @@ dependencies:
- ncurses=5.9
- openssl=1.0.2h
- pandas=0.18.1
- paramiko=1.16.0
- paramiko=2.4.1
- pip=8.1.2
- pycrypto=2.6.1
- pygments=2.1.3
Expand Down
4 changes: 2 additions & 2 deletions conda-environment_py3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies:
- htslib=1.3.1=0
- peewee=2.8.0
- pysam=0.9.1
- python-dateutil=2.3
- python-dateutil=2.7.3
- samtools=1.3.1
- selscan=1.1.0b
- biopython=1.67
Expand All @@ -34,7 +34,7 @@ dependencies:
- ncurses=5.9
- openssl=1.0.2h
- pandas=0.18.1
- paramiko=1.16.0
- paramiko=2.4.1
- pip=8.1.2
- pycrypto=2.6.1
- pygments=2.1.3
Expand Down
1 change: 0 additions & 1 deletion requirements-docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ biopython==1.65
pysam==0.8.2.1
numpy==1.8.0
pandas==0.16.0
paramiko==1.15.2
crypto==1.3.4
boltons==0.6.3
peewee==2.8.0
Expand Down
4 changes: 2 additions & 2 deletions travis/install-conda.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ else # if it does not exist, we need to install miniconda
conda config --add channels bioconda
conda config --add channels r
conda config --add channels conda-forge
conda install -y -q conda=4.2 # pin to 4.2.* until this is fixed: https://github.com/conda/conda-build/issues/1666
conda install -y -q conda #=4.2 # pin to 4.2.* until this is fixed: https://github.com/conda/conda-build/issues/1666
conda config --set auto_update_conda false
conda install -y java-jdk==8.0.112
conda install -y conda-build # needed to build recipe
conda install -y anaconda-client # needed to upload build package to anaconda.org
conda install -y -c conda-forge -f curl # the bioconda curl is broken as of 21 Feb 2017
fi

conda info -a # for debugging
conda info -a # for debugging

0 comments on commit 4743ffd

Please sign in to comment.