Skip to content

MAINT: Fix wheel build to ensure futures is only required in Python 2 #2678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Aug 10, 2018
Merged

MAINT: Fix wheel build to ensure futures is only required in Python 2 #2678

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
43df2e4
CI: Build and store wheels as artifacts
effigies Aug 10, 2018
b61f4ff
CI: Bump...
effigies Aug 10, 2018
d8628c1
Revert "CI: Build and store wheels as artifacts"
effigies Aug 10, 2018
2034ec5
CI: Always run PyPI precheck
effigies Aug 10, 2018
ae913a2
CI: Store dist/ as artifacts
effigies Aug 10, 2018
8f744ec
CI: Install latest setuptools
effigies Aug 10, 2018
10ec7d9
CI: Check installation for futures, update deploy
effigies Aug 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 20 additions & 6 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,9 +339,25 @@ jobs:
- run:
name: Check pypi preconditions
command: |
pip install twine future wheel readme_renderer
pip install --upgrade twine future wheel readme_renderer setuptools
python setup.py check -r -s
python setup.py sdist bdist_wheel
- run:
name: Validate Python 2 installation
command: |
pyenv local 2.7.12
pip install dist/nipype-*-py2.py3-none-any.whl
# Futures should install in Python 2
pip show futures 2>/dev/null | grep "Name: futures"
- run:
name: Validate Python 3 installation
command: |
pyenv local 3.5.2
pip install dist/nipype-*-py2.py3-none-any.whl
# Futures should not install in Python 3
test $(pip show futures 2>/dev/null | wc -l) = "0"
- store_artifacts:
path: /home/circleci/nipype/dist

deploy_pypi:
machine: *machine_kwds
Expand All @@ -352,7 +368,7 @@ jobs:
- run:
name: Deploy to PyPI
command: |
pip install twine future wheel readme_renderer
pip install --upgrade twine future wheel readme_renderer setuptools
python setup.py check -r -s
python setup.py sdist bdist_wheel
twine upload dist/*
Expand Down Expand Up @@ -393,6 +409,7 @@ workflows:
version: 2
build_test_deploy:
jobs:
- pypi_precheck
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this running on every build or just tagged ones?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Every build. The idea is to get an error before we tag and have to re-tag. I was only doing it on rel/* branches, but it's a 2min job.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like doing it on rel/ branches since we'll tag after those pass - but 2 mins is not the end of the world for me

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll move it back in the rel branch.

- compare_base_dockerfiles:
filters:
tags:
Expand Down Expand Up @@ -428,6 +445,7 @@ workflows:
tags:
only: /.*/
requires:
- pypi_precheck
- test_pytest
- update_feedstock:
context: nipybot
Expand All @@ -436,7 +454,3 @@ workflows:
only: /rel\/.*/
tags:
only: /.*/
- pypi_precheck:
filters:
branches:
only: /rel\/.*/