Skip to content

Commit 297a24c

Browse files
authored
Merge pull request #2678 from effigies/maint/wheels
MAINT: Fix wheel build to ensure futures is only required in Python 2
2 parents a2c2d79 + 10ec7d9 commit 297a24c

File tree

1 file changed

+20
-6
lines changed

1 file changed

+20
-6
lines changed

.circleci/config.yml

+20-6
Original file line numberDiff line numberDiff line change
@@ -339,9 +339,25 @@ jobs:
339339
- run:
340340
name: Check pypi preconditions
341341
command: |
342-
pip install twine future wheel readme_renderer
342+
pip install --upgrade twine future wheel readme_renderer setuptools
343343
python setup.py check -r -s
344344
python setup.py sdist bdist_wheel
345+
- run:
346+
name: Validate Python 2 installation
347+
command: |
348+
pyenv local 2.7.12
349+
pip install dist/nipype-*-py2.py3-none-any.whl
350+
# Futures should install in Python 2
351+
pip show futures 2>/dev/null | grep "Name: futures"
352+
- run:
353+
name: Validate Python 3 installation
354+
command: |
355+
pyenv local 3.5.2
356+
pip install dist/nipype-*-py2.py3-none-any.whl
357+
# Futures should not install in Python 3
358+
test $(pip show futures 2>/dev/null | wc -l) = "0"
359+
- store_artifacts:
360+
path: /home/circleci/nipype/dist
345361

346362
deploy_pypi:
347363
machine: *machine_kwds
@@ -352,7 +368,7 @@ jobs:
352368
- run:
353369
name: Deploy to PyPI
354370
command: |
355-
pip install twine future wheel readme_renderer
371+
pip install --upgrade twine future wheel readme_renderer setuptools
356372
python setup.py check -r -s
357373
python setup.py sdist bdist_wheel
358374
twine upload dist/*
@@ -393,6 +409,7 @@ workflows:
393409
version: 2
394410
build_test_deploy:
395411
jobs:
412+
- pypi_precheck
396413
- compare_base_dockerfiles:
397414
filters:
398415
tags:
@@ -428,6 +445,7 @@ workflows:
428445
tags:
429446
only: /.*/
430447
requires:
448+
- pypi_precheck
431449
- test_pytest
432450
- update_feedstock:
433451
context: nipybot
@@ -436,7 +454,3 @@ workflows:
436454
only: /rel\/.*/
437455
tags:
438456
only: /.*/
439-
- pypi_precheck:
440-
filters:
441-
branches:
442-
only: /rel\/.*/

0 commit comments

Comments
 (0)