Skip to content

Commit 4ecfa7d

Browse files
authored
Merge pull request #39 from DerThorsten/ci_fix
removed kipoi docker,use as many deps from conda as possible
2 parents 1cc380e + a54118b commit 4ecfa7d

1 file changed

Lines changed: 28 additions & 31 deletions

File tree

.circleci/config.yml

Lines changed: 28 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -5,58 +5,77 @@ variables:
55
run:
66
name: Update conda
77
command: conda update --yes conda
8+
create_env: &create_env
9+
run:
10+
name: create env
11+
command: |
12+
conda create -n kipoi-dev python=3.6
813
install_git_lfs: &install_git_lfs
914
run:
1015
name: Install git-lfs
1116
command: |
17+
source activate kipoi-dev
1218
conda install --yes -c conda-forge git-lfs
1319
cp .circleci/gitconfig ~/.gitconfig
1420
update_pytorch: &update_pytorch
1521
run:
1622
name: Update pytorch
1723
command: |
24+
source activate kipoi-dev
1825
conda install --yes pytorch-cpu -c pytorch
1926
icondaall_pip_deps: &install_pip_deps
2027
run:
2128
name: Install pip dependencies
2229
command: |
30+
source activate kipoi-dev
2331
pip install genomelake --no-deps
2432
pip install pyfaidx
2533
install_conda_deps: &install_conda_deps
2634
run:
2735
name: Install conda dependencies
2836
command: |
29-
conda install genomelake pyfaidx -c bioconda
37+
source activate kipoi-dev
38+
conda install -c bioconda cyvcf2 pybedtools genomelake pyfaidx
3039
install_kipoi: &install_kipoi
3140
run:
3241
name: Install Kipoi
3342
command: |
43+
source activate kipoi-dev
3444
git clone git@github.com:kipoi/kipoi.git kipoi_pkg
3545
cd kipoi_pkg
3646
pip install '.'
3747
cd ..
3848
install_kipoiseq: &install_kipoiseq
3949
run:
4050
name: Install kipoiseq
41-
command: pip install '.[develop]'
51+
command: |
52+
source activate kipoi-dev
53+
pip install '.[develop]'
4254
install_requests: &install_requests
4355
run:
4456
name: Install requirements for requests correctly
45-
command: pip install requests
57+
command: |
58+
source activate kipoi-dev
59+
pip install requests
4660
kipoi_ls: &kipoi_ls
4761
run:
4862
name: List kipoi packages
49-
command: kipoi ls
63+
command: |
64+
source activate kipoi-dev
65+
kipoi ls
5066
run_tests: &run_tests
5167
run:
5268
name: Run tests
5369
command: |
70+
source activate kipoi-dev
5471
mkdir test-reports
5572
py.test --cov=kipoiseq/ tests/ -n 1 --no-cov-on-fail --junitxml=test-reports/junit.xml
5673
run_coveralls: &run_coveralls
5774
run:
5875
name: run coveralls
59-
command: coveralls || true
76+
command: |
77+
source activate kipoi-dev
78+
coveralls || true
6079
store_test_results: &store_test_results
6180
store_test_results:
6281
path: test-reports
@@ -70,12 +89,12 @@ jobs:
7089

7190
test-py36:
7291
docker:
73-
- image: kipoi/miniconda3:4.3.14
92+
- image: continuumio/miniconda3:4.5.12
7493
working_directory: ~/repo
7594
steps:
7695
- checkout
7796
- *update_conda
78-
- *install_git_lfs
97+
- *create_env
7998
- *update_pytorch
8099
- *install_conda_deps
81100
- *install_kipoi
@@ -86,29 +105,11 @@ jobs:
86105
- *store_test_results
87106
- *store_test_artifacts
88107

89-
test-py27:
90-
docker:
91-
- image: kipoi/miniconda:4.3.14
92-
working_directory: ~/repo
93-
steps:
94-
- checkout
95-
- *update_conda
96-
- *install_git_lfs
97-
- *update_pytorch
98-
- *install_conda_deps
99-
- *install_kipoi
100-
- *install_kipoiseq
101-
- *kipoi_ls
102-
- *run_tests
103-
- *store_test_results
104-
- *store_test_artifacts
108+
105109

106110
build-deploy-docs:
107111
docker:
108-
# - image: continuumio/miniconda3:4.3.14
109-
- image: kipoi/miniconda3:4.3.14
110-
# - image: continuumio/anaconda3:5.0.1
111-
# - image: circleci/python:3.5
112+
- image: continuumio/miniconda3:4.5.12
112113
working_directory: ~/repo
113114
steps:
114115
- add_ssh_keys:
@@ -123,7 +124,6 @@ jobs:
123124
command: pip install -e .
124125
- run:
125126
name: Install build deps
126-
# use custom pydoc-markdown
127127
command: pip install nbconvert mkdocs git+https://github.com/kipoi/pydoc-markdown@master
128128
- run:
129129
name: Build docs
@@ -138,15 +138,12 @@ jobs:
138138

139139
workflows:
140140
version: 2
141-
142141
test:
143142
jobs:
144143
- test-py36
145-
- test-py27
146144
- build-deploy-docs:
147145
requires:
148146
- test-py36
149-
- test-py27
150147
filters:
151148
branches:
152149
only:

0 commit comments

Comments
 (0)