From 5bfba75449f0ab2457dab35f9eafb1a6cb758976 Mon Sep 17 00:00:00 2001 From: Maithu Venkatesh Date: Sat, 24 Aug 2019 15:46:35 -0400 Subject: [PATCH 1/7] Run check-manifest --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index c163c270..61c4dffc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,7 @@ env: - DAILY_COMMIT=master - DAILY_BUILD=false - WHEELHOUSE_UPLOADER_USERNAME=travis-worker + - MANIFEST_BLACKLIST="benchmarks/*,benchmarks,build_tools/*,build_tools,Makefile,maint_tools/*,maint_tools,.mailmap,.circleci,.circleci/*,*.yml,*.md,.coveragerc,*.in" # Following generated with # travis encrypt -r MacPython/scikit-learn-wheels WHEELHOUSE_UPLOADER_SECRET= - secure: "Lyhm6qFtf/hY5D3UHMANNhh8Ar/PARF1nH/ebArWLtb24prrSYt+AAVJqZ81I58AdQK12Kn8mmuZVyVJT+FrRd8q6OyMijQ/wKrsx8EH+lDTTgUueBJtLql01KsaMRTDpAd04bREh1MppIsFFCHKVNxY2mW17XwsNQ+MUka4Bos=" @@ -93,6 +94,7 @@ before_install: UPLOAD_ARGS="--no-update-index" fi - echo "Building scikit-learn-$BUILD_COMMIT" + - check_manifest -v --ignore $MANIFEST_BLACKLIST - BUILD_DEPENDS="$NP_BUILD_DEP $CYTHON_BUILD_DEP $SCIPY_BUILD_DEP $JOBLIB_BUILD_DEP" - TEST_DEPENDS="$NP_TEST_DEP pytest $CYTHON_TEST_DEP $SCIPY_TEST_DEP $JOBLIB_TEST_DEP" - source multibuild/common_utils.sh From 6189644e15d10fc87b818ae00079e59cce357cc2 Mon Sep 17 00:00:00 2001 From: Joel Nothman Date: Thu, 21 Nov 2019 11:23:25 +1100 Subject: [PATCH 2/7] Install check-manifest first Also move to after_success to avoid any dependency contamination --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 61c4dffc..07071467 100644 --- a/.travis.yml +++ b/.travis.yml @@ -94,7 +94,6 @@ before_install: UPLOAD_ARGS="--no-update-index" fi - echo "Building scikit-learn-$BUILD_COMMIT" - - check_manifest -v --ignore $MANIFEST_BLACKLIST - BUILD_DEPENDS="$NP_BUILD_DEP $CYTHON_BUILD_DEP $SCIPY_BUILD_DEP $JOBLIB_BUILD_DEP" - TEST_DEPENDS="$NP_TEST_DEP pytest $CYTHON_TEST_DEP $SCIPY_TEST_DEP $JOBLIB_TEST_DEP" - source multibuild/common_utils.sh @@ -113,6 +112,8 @@ script: - install_run $PLAT after_success: + - pip install check-manifest + - check_manifest -v --ignore $MANIFEST_BLACKLIST # Upload wheels to Rackspace container - pip install wheelhouse-uploader - python -m wheelhouse_uploader upload --local-folder From 9a6785b475282cc1ce9a6ec84236cac854112d4c Mon Sep 17 00:00:00 2001 From: Joel Nothman Date: Thu, 21 Nov 2019 15:39:26 +1100 Subject: [PATCH 3/7] correct command name --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 07071467..499a2e1d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -113,7 +113,7 @@ script: after_success: - pip install check-manifest - - check_manifest -v --ignore $MANIFEST_BLACKLIST + - check-manifest -v --ignore $MANIFEST_BLACKLIST # Upload wheels to Rackspace container - pip install wheelhouse-uploader - python -m wheelhouse_uploader upload --local-folder From 6e3db6621fbc0a5421a78997fa4fc5b9989c6a6d Mon Sep 17 00:00:00 2001 From: Joel Nothman Date: Thu, 21 Nov 2019 15:50:47 +1100 Subject: [PATCH 4/7] More exclusions from manifest --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 499a2e1d..c942c55b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ env: - DAILY_COMMIT=master - DAILY_BUILD=false - WHEELHOUSE_UPLOADER_USERNAME=travis-worker - - MANIFEST_BLACKLIST="benchmarks/*,benchmarks,build_tools/*,build_tools,Makefile,maint_tools/*,maint_tools,.mailmap,.circleci,.circleci/*,*.yml,*.md,.coveragerc,*.in" + - MANIFEST_BLACKLIST="benchmarks/*,benchmarks,build_tools/*,build_tools,Makefile,maint_tools/*,maint_tools,.binder,conftest.py,site.cfg,sklearn/externals/README,.mailmap,.circleci,.circleci/*,*.yml,*.md,.coveragerc,*.in" # Following generated with # travis encrypt -r MacPython/scikit-learn-wheels WHEELHOUSE_UPLOADER_SECRET= - secure: "Lyhm6qFtf/hY5D3UHMANNhh8Ar/PARF1nH/ebArWLtb24prrSYt+AAVJqZ81I58AdQK12Kn8mmuZVyVJT+FrRd8q6OyMijQ/wKrsx8EH+lDTTgUueBJtLql01KsaMRTDpAd04bREh1MppIsFFCHKVNxY2mW17XwsNQ+MUka4Bos=" From a8c367db30240754c751175c50403e8dd95fabd7 Mon Sep 17 00:00:00 2001 From: Joel Nothman Date: Thu, 21 Nov 2019 15:53:31 +1100 Subject: [PATCH 5/7] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c942c55b..692a0586 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ env: - DAILY_COMMIT=master - DAILY_BUILD=false - WHEELHOUSE_UPLOADER_USERNAME=travis-worker - - MANIFEST_BLACKLIST="benchmarks/*,benchmarks,build_tools/*,build_tools,Makefile,maint_tools/*,maint_tools,.binder,conftest.py,site.cfg,sklearn/externals/README,.mailmap,.circleci,.circleci/*,*.yml,*.md,.coveragerc,*.in" + - MANIFEST_BLACKLIST="benchmarks/*,benchmarks,build_tools/*,build_tools,Makefile,maint_tools/*,maint_tools,.binder/*,conftest.py,site.cfg,sklearn/externals/README,.mailmap,.circleci,.circleci/*,*.yml,*.md,.coveragerc,*.in" # Following generated with # travis encrypt -r MacPython/scikit-learn-wheels WHEELHOUSE_UPLOADER_SECRET= - secure: "Lyhm6qFtf/hY5D3UHMANNhh8Ar/PARF1nH/ebArWLtb24prrSYt+AAVJqZ81I58AdQK12Kn8mmuZVyVJT+FrRd8q6OyMijQ/wKrsx8EH+lDTTgUueBJtLql01KsaMRTDpAd04bREh1MppIsFFCHKVNxY2mW17XwsNQ+MUka4Bos=" From e4b37b8a3cdcef41eeae6ba39eef29fc30da6e69 Mon Sep 17 00:00:00 2001 From: Joel Nothman Date: Thu, 21 Nov 2019 16:00:22 +1100 Subject: [PATCH 6/7] check-manifest is quite pedantic I need to explicitly ignore both directories and their contents! --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 692a0586..495e90fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ env: - DAILY_COMMIT=master - DAILY_BUILD=false - WHEELHOUSE_UPLOADER_USERNAME=travis-worker - - MANIFEST_BLACKLIST="benchmarks/*,benchmarks,build_tools/*,build_tools,Makefile,maint_tools/*,maint_tools,.binder/*,conftest.py,site.cfg,sklearn/externals/README,.mailmap,.circleci,.circleci/*,*.yml,*.md,.coveragerc,*.in" + - MANIFEST_BLACKLIST="benchmarks/*,benchmarks,build_tools/*,build_tools,Makefile,maint_tools/*,maint_tools,.binder,.binder/*,conftest.py,site.cfg,sklearn/externals/README,.mailmap,.circleci,.circleci/*,*.yml,*.md,.coveragerc,*.in" # Following generated with # travis encrypt -r MacPython/scikit-learn-wheels WHEELHOUSE_UPLOADER_SECRET= - secure: "Lyhm6qFtf/hY5D3UHMANNhh8Ar/PARF1nH/ebArWLtb24prrSYt+AAVJqZ81I58AdQK12Kn8mmuZVyVJT+FrRd8q6OyMijQ/wKrsx8EH+lDTTgUueBJtLql01KsaMRTDpAd04bREh1MppIsFFCHKVNxY2mW17XwsNQ+MUka4Bos=" From 7ce7f4b1c4c04c7e6ce10f44e60bb037ea414203 Mon Sep 17 00:00:00 2001 From: Joel Nothman Date: Sat, 23 Nov 2019 23:23:02 +1100 Subject: [PATCH 7/7] Update .travis.yml