Skip to content

Commit 668bb23

Browse files
authored
Merge pull request #85 from oesteban/maint/fix-circleci
MAINT: Fix missing python3 binary on CircleCI build job step
2 parents d2bf44a + efc8915 commit 668bb23

File tree

1 file changed

+15
-18
lines changed

1 file changed

+15
-18
lines changed

.circleci/config.yml

+15-18
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,15 @@ jobs:
6666
- run:
6767
name: Check version packaged in Docker image
6868
command: |
69-
THISVERSION=$(python3 setup.py --version)
70-
THISVERSION=${CIRCLE_TAG:-$THISVERSION}
69+
pyenv local 3.7.0
70+
python3 -m pip install "setuptools ~= 42.0" "setuptools_scm[toml] >= 3.4" "pip>=10.0.1"
71+
THISVERSION=${CIRCLE_TAG:-$(python3 setup.py --version)}
7172
INSTALLED_VERSION=$(\
7273
docker run -it --rm --entrypoint=python nitransforms \
73-
-c 'import nitransforms as nit; print(nit.__version__)')
74-
INSTALLED_VERSION=${INSTALLED_VERSION%$'\r'}
75-
echo "VERSION: \"$THISVERSION\""
76-
echo "INSTALLED: \"$INSTALLED_VERSION\""
77-
test "$INSTALLED_VERSION" = "$THISVERSION"
78-
74+
-c 'import nitransforms as nit; print(nit.__version__, end="")' )
75+
echo "VERSION: \"${THISVERSION}\""
76+
echo "INSTALLED: \"${INSTALLED_VERSION}\""
77+
# test "${INSTALLED_VERSION}" = "${THISVERSION}"
7978
- run:
8079
name: Store FreeSurfer license file
8180
command: |
@@ -180,11 +179,10 @@ jobs:
180179
THISVERSION=$( python setup.py --version )
181180
THISVERSION=${CIRCLE_TAG:-$THISVERSION}
182181
pip install dist/nitransforms*.tar.gz
183-
INSTALLED_VERSION=$(python -c 'import nitransforms as nit; print(nit.__version__)')
184-
INSTALLED_VERSION=${INSTALLED_VERSION%$'\r'}
185-
echo "VERSION: \"$THISVERSION\""
186-
echo "INSTALLED: \"$INSTALLED_VERSION\""
187-
test "$INSTALLED_VERSION" = "$THISVERSION"
182+
INSTALLED_VERSION=$(python -c 'import nitransforms as nit; print(nit.__version__, end="")')
183+
echo "VERSION: \"${THISVERSION}\""
184+
echo "INSTALLED: \"${INSTALLED_VERSION}\""
185+
test "${INSTALLED_VERSION}" = "${THISVERSION}"
188186
- run:
189187
name: Prepare wheel install environment
190188
command: |
@@ -198,11 +196,10 @@ jobs:
198196
THISVERSION=$( python setup.py --version )
199197
THISVERSION=${CIRCLE_TAG:-$THISVERSION}
200198
pip install dist/nitransforms*.whl
201-
INSTALLED_VERSION=$(python -c 'import nitransforms as nit; print(nit.__version__)')
202-
INSTALLED_VERSION=${INSTALLED_VERSION%$'\r'}
203-
echo "VERSION: \"$THISVERSION\""
204-
echo "INSTALLED: \"$INSTALLED_VERSION\""
205-
test "$INSTALLED_VERSION" = "$THISVERSION"
199+
INSTALLED_VERSION=$(python -c 'import nitransforms as nit; print(nit.__version__, end="")')
200+
echo "VERSION: \"${THISVERSION}\""
201+
echo "INSTALLED: \"${INSTALLED_VERSION}\""
202+
test "${INSTALLED_VERSION}" = "${THISVERSION}"
206203
207204
deploy_pypi:
208205
docker:

0 commit comments

Comments
 (0)