From 43df2e41e9bee47d3a202343651fc6dcd07af95f Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Fri, 10 Aug 2018 12:12:51 -0400 Subject: [PATCH 1/7] CI: Build and store wheels as artifacts --- .circleci/config.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ef55a28734..c0d2a6ee8b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -342,6 +342,8 @@ jobs: pip install twine future wheel readme_renderer python setup.py check -r -s python setup.py sdist bdist_wheel + - store_artifacts: *store_artifacts_kwds + path: /home/circleci/nipype/dist deploy_pypi: machine: *machine_kwds @@ -436,7 +438,4 @@ workflows: only: /rel\/.*/ tags: only: /.*/ - - pypi_precheck: - filters: - branches: - only: /rel\/.*/ + - pypi_precheck From b61f4ffdd48612788395006d53d5eb4874ceb482 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Fri, 10 Aug 2018 12:26:08 -0400 Subject: [PATCH 2/7] CI: Bump... From d8628c119c1924bf865cb0d6956db2b22b1c0a12 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Fri, 10 Aug 2018 12:27:14 -0400 Subject: [PATCH 3/7] Revert "CI: Build and store wheels as artifacts" This reverts commit 43df2e41e9bee47d3a202343651fc6dcd07af95f. --- .circleci/config.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c0d2a6ee8b..ef55a28734 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -342,8 +342,6 @@ jobs: pip install twine future wheel readme_renderer python setup.py check -r -s python setup.py sdist bdist_wheel - - store_artifacts: *store_artifacts_kwds - path: /home/circleci/nipype/dist deploy_pypi: machine: *machine_kwds @@ -438,4 +436,7 @@ workflows: only: /rel\/.*/ tags: only: /.*/ - - pypi_precheck + - pypi_precheck: + filters: + branches: + only: /rel\/.*/ From 2034ec56efcbe5836ee71b1993d36edacd613c82 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Fri, 10 Aug 2018 12:28:57 -0400 Subject: [PATCH 4/7] CI: Always run PyPI precheck --- .circleci/config.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ef55a28734..c7d054776e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -436,7 +436,4 @@ workflows: only: /rel\/.*/ tags: only: /.*/ - - pypi_precheck: - filters: - branches: - only: /rel\/.*/ + - pypi_precheck From ae913a2b2e5e15967af5a1393fcf800ae99f4ab2 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Fri, 10 Aug 2018 12:31:00 -0400 Subject: [PATCH 5/7] CI: Store dist/ as artifacts --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index c7d054776e..f0cd5d4682 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -342,6 +342,8 @@ jobs: pip install twine future wheel readme_renderer python setup.py check -r -s python setup.py sdist bdist_wheel + - store_artifacts: + path: /home/circleci/nipype/dist deploy_pypi: machine: *machine_kwds From 8f744ec339de6cca78b5dc8546b9fdac2477c05e Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Fri, 10 Aug 2018 12:33:54 -0400 Subject: [PATCH 6/7] CI: Install latest setuptools --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f0cd5d4682..e6e0f0a2c3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -339,7 +339,7 @@ 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 - store_artifacts: From 10ec7d93a4bd0f2db0e58e586bf757623ce02528 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Fri, 10 Aug 2018 13:29:32 -0400 Subject: [PATCH 7/7] CI: Check installation for futures, update deploy --- .circleci/config.yml | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e6e0f0a2c3..502c5f5d78 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -342,6 +342,20 @@ jobs: 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 @@ -354,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/* @@ -395,6 +409,7 @@ workflows: version: 2 build_test_deploy: jobs: + - pypi_precheck - compare_base_dockerfiles: filters: tags: @@ -430,6 +445,7 @@ workflows: tags: only: /.*/ requires: + - pypi_precheck - test_pytest - update_feedstock: context: nipybot @@ -438,4 +454,3 @@ workflows: only: /rel\/.*/ tags: only: /.*/ - - pypi_precheck