Skip to content

Commit 56dfd7a

Browse files
committed
fix: revert replacing requirements.txt with setup.cfg
1 parent 3394fd0 commit 56dfd7a

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

.circleci/config.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ jobs:
1010

1111
- restore_cache:
1212
keys:
13-
- deps-v5-{{ checksum "/tmp/src/templateflow/setup.cfg"}}-{{ epoch }}
14-
- deps-v5-{{ checksum "/tmp/src/templateflow/setup.cfg"}}-
13+
- deps-v5-{{ checksum "/tmp/src/templateflow/requirements.txt"}}-{{ epoch }}
14+
- deps-v5-{{ checksum "/tmp/src/templateflow/requirements.txt"}}-
1515
- deps-v5-
1616

1717
- run:
@@ -29,7 +29,7 @@ jobs:
2929
pyenv global 3.5.2
3030
virtualenv venv
3131
pip install -U pip
32-
pip install -r /tmp/src/templateflow/setup.cfg
32+
pip install -r /tmp/src/templateflow/requirements.txt
3333
pip install datalad
3434
pip install "setuptools>=27.0" twine codecov
3535
@@ -49,7 +49,7 @@ jobs:
4949
git config --global user.email "[email protected]"
5050
5151
- save_cache:
52-
key: deps-v5-{{ checksum "/tmp/src/templateflow/setup.cfg"}}-{{ epoch }}
52+
key: deps-v5-{{ checksum "/tmp/src/templateflow/requirements.txt"}}-{{ epoch }}
5353
paths:
5454
- "/opt/circleci/.pyenv/versions/3.5.2"
5555
- "/tmp/data/templateflow"
@@ -85,7 +85,7 @@ jobs:
8585
name: Submit api test coverage
8686
command: |
8787
codecov --file /tmp/cov_api_dl.xml --root /tmp/src/templateflow \
88-
--flags api -e CIRCLE_JOB
88+
--flags api,datalad -e CIRCLE_JOB
8989
9090
- run:
9191
name: Update TemplateFlow skeleton
@@ -118,7 +118,7 @@ jobs:
118118
name: Submit api test coverage
119119
command: |
120120
codecov --file /tmp/cov_api_nodl.xml --root /tmp/src/templateflow \
121-
--flags api -e CIRCLE_JOB
121+
--flags api,nodatalad -e CIRCLE_JOB
122122
123123
- run:
124124
name: Run tests (pulling from S3)
@@ -136,7 +136,7 @@ jobs:
136136
name: Submit api test coverage
137137
command: |
138138
codecov --file /tmp/cov_api_s3.xml --root /tmp/src/templateflow \
139-
--flags api -e CIRCLE_JOB
139+
--flags api,s3 -e CIRCLE_JOB
140140
141141
- run:
142142
name: Run tests (w/ DataLad, bypassed via S3)
@@ -158,7 +158,7 @@ jobs:
158158
name: Submit api test coverage
159159
command: |
160160
codecov --file /tmp/cov_api_dl_s3.xml --root /tmp/src/templateflow \
161-
--flags api -e CIRCLE_JOB
161+
--flags api,dls3 -e CIRCLE_JOB
162162
163163
- store_test_results:
164164
path: /tmp/tests
@@ -190,8 +190,8 @@ jobs:
190190

191191
- restore_cache:
192192
keys:
193-
- deps-v5-{{ checksum "/tmp/src/templateflow/setup.cfg"}}-{{ epoch }}
194-
- deps-v5-{{ checksum "/tmp/src/templateflow/setup.cfg"}}-
193+
- deps-v5-{{ checksum "/tmp/src/templateflow/requirements.txt"}}-{{ epoch }}
194+
- deps-v5-{{ checksum "/tmp/src/templateflow/requirements.txt"}}-
195195
- deps-v5-
196196

197197
- add_ssh_keys:
@@ -207,7 +207,7 @@ jobs:
207207
git checkout -f origin/master
208208
cp /tmp/resources/templateflow-skel.zip templateflow/conf/
209209
git add templateflow/conf/templateflow-skel.zip
210-
git commit -m "rel(${CIRCLE_TAG}): Update S3 skeleton file [skip ci]"
210+
git commit -m "auto: Update S3 skeleton file [skip ci]"
211211
git push origin HEAD:master
212212
213213
deploy_pypi:
@@ -223,8 +223,8 @@ jobs:
223223

224224
- restore_cache:
225225
keys:
226-
- deps-v5-{{ checksum "/tmp/src/templateflow/setup.cfg"}}-{{ epoch }}
227-
- deps-v5-{{ checksum "/tmp/src/templateflow/setup.cfg"}}-
226+
- deps-v5-{{ checksum "/tmp/src/templateflow/requirements.txt"}}-{{ epoch }}
227+
- deps-v5-{{ checksum "/tmp/src/templateflow/requirements.txt"}}-
228228
- deps-v5-
229229

230230
- run:

0 commit comments

Comments
 (0)