From 42ec1cf6974352c4215a66d92c493a36c0e260af Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Thu, 18 Jan 2018 21:57:29 +0100 Subject: [PATCH 1/4] MAINT Update build appveyor --- appveyor.yml | 30 +++++------------------------- build_tools/appveyor/test.ps1 | 12 ------------ 2 files changed, 5 insertions(+), 37 deletions(-) delete mode 100644 build_tools/appveyor/test.ps1 diff --git a/appveyor.yml b/appveyor.yml index 4fd636df6..62d8960f6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -30,31 +30,11 @@ install: # Add Library/bin directory to fix issue # https://github.com/conda/conda/issues/1753 - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PYTHON%\\Library\\bin;%PATH%" + - conda install pip scipy numpy scikit-learn=0.19 pandas -y -q + - pip install . - # Check that we have the expected version and architecture for Python - - "python --version" - - "python -c \"import struct; print(struct.calcsize('P') * 8)\"" - - # Installed prebuilt dependencies from conda - - "conda install pip numpy scipy scikit-learn=0.19.0 pandas nose wheel matplotlib -y -q" - - # Install other nilearn dependencies - - "pip install coverage nose-timer pytest pytest-cov" - - "python setup.py bdist_wheel" - - ps: "ls dist" - - # Install the generated wheel package to test it - - "pip install --pre --no-index --find-links dist/ imbalanced-learn" - -# Not a .NET project, we build in the install step instead -build: false test_script: - - powershell ./build_tools/appveyor/test.ps1 - -artifacts: - # Archive the generated packages in the ci.appveyor.com build report. - - path: dist\* - -#on_success: -# - TODO: upload the content of dist/*.whl to a public wheelhouse + - mkdir for_test + - cd for_test + - pytest --pyargs imblearn --cov-report term-missing --cov=imblearn diff --git a/build_tools/appveyor/test.ps1 b/build_tools/appveyor/test.ps1 deleted file mode 100644 index 37526b85d..000000000 --- a/build_tools/appveyor/test.ps1 +++ /dev/null @@ -1,12 +0,0 @@ -# Change to a non-source folder to make sure we run the tests on the -# installed library. -- "cd C:\\" - -$installed_imblearn_folder = $(python -c "import os; os.chdir('c:/'); import imblearn;\ -print(os.path.dirname(imblearn.__file__))") -echo "imblearn found in: $installed_imblearn_folder" - -# --pyargs argument is used to make sure we run the tests on the -# installed package rather than on the local folder -py.test --pyargs imblearn $installed_imblearn_folder -exit $LastExitCode From ca33444af7136076f2b063ab052c9fa5800fab57 Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Thu, 18 Jan 2018 22:05:32 +0100 Subject: [PATCH 2/4] iter --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 62d8960f6..76dcb91f8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,3 +1,5 @@ +build: false + environment: # There is no need to run the build for all the Python version / # architectures combo as the generated nilearn wheel is the same on all @@ -33,7 +35,6 @@ install: - conda install pip scipy numpy scikit-learn=0.19 pandas -y -q - pip install . - test_script: - mkdir for_test - cd for_test From 410a7a8a10c600ff6419883b122446bf29872cff Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Thu, 18 Jan 2018 22:09:45 +0100 Subject: [PATCH 3/4] iter --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 76dcb91f8..7fa5744ac 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -33,6 +33,7 @@ install: # https://github.com/conda/conda/issues/1753 - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PYTHON%\\Library\\bin;%PATH%" - conda install pip scipy numpy scikit-learn=0.19 pandas -y -q + - conda install pytest pytest-cov -y -q - pip install . test_script: From c0ebaf3de2025fdc2336a3e3ecdf1193f66f47fc Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Thu, 18 Jan 2018 22:22:26 +0100 Subject: [PATCH 4/4] iter --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 7fa5744ac..a09272080 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -34,6 +34,7 @@ install: - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PYTHON%\\Library\\bin;%PATH%" - conda install pip scipy numpy scikit-learn=0.19 pandas -y -q - conda install pytest pytest-cov -y -q + - conda install nose -y -q # FIXME: remove this line when using sklearn > 0.19 - pip install . test_script: