From a63306423df5886270d40903454bdbce028a73a3 Mon Sep 17 00:00:00 2001 From: Peter Paul Kiefer Date: Sat, 27 Nov 2021 16:03:10 +0100 Subject: [PATCH 1/3] 1st attempt bring the appveyor build to life again --- appveyor.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f5faee5cc..dd89a2c47 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,13 +8,13 @@ environment: - PYTHON_VERSION: 3.5 MINICONDA: C:\Miniconda35-x64 - PYTHON_VERSION: 3.6 - MINICONDA: C:\Miniconda36-x64 + MINICONDA: C:\Miniconda3-x64 - PYTHON_VERSION: 3.7 - MINICONDA: C:\Miniconda36-x64 + MINICONDA: C:\Miniconda3-x64 - PYTHON_VERSION: 3.8 - MINICONDA: C:\Miniconda36-x64 + MINICONDA: C:\Miniconda3-x64 - PYTHON_VERSION: 3.9 - MINICONDA: C:\Miniconda36-x64 + MINICONDA: C:\Miniconda3-x64 #configuration: # - Debug From 299b3b023ac209f1fb449f1927eca1f0c4225b1d Mon Sep 17 00:00:00 2001 From: Peter Paul Kiefer Date: Sun, 28 Nov 2021 10:00:24 +0100 Subject: [PATCH 2/3] #955 fixing ci build on appveyor After bringing the miniconda env to work again, the wrong matplotlib version was used. This commit should fix that. --- appveyor.yml | 3 ++- setup.py | 12 ++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index dd89a2c47..4768a3fa9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -25,7 +25,8 @@ install: - conda config --set always_yes yes --set changeps1 no - conda update -q conda - conda info -a - - "conda create -q -n build-environment python=%PYTHON_VERSION% numpy scipy matplotlib" +# github issue #955: freez build versions of numpy, scipy and matplotlib + - "conda create -q -n build-environment python=%PYTHON_VERSION% numpy=1.19.2 scipy=1.5.2 matplotlib=3.3.4" - activate build-environment # We need wheel installed to build wheels - python -m pip install wheel diff --git a/setup.py b/setup.py index 73bfc0356..261a7c908 100644 --- a/setup.py +++ b/setup.py @@ -117,11 +117,13 @@ def ismac(): except ModuleNotFoundError: ext_mods = [] -install_requirements = ['numpy>=1.7', 'six', 'paramz>=0.9.0', 'cython>=0.29'] +# #955 +install_requirements = ['numpy==1.19.2', 'six', 'paramz>=0.9.0', 'cython>=0.29'] if sys.version_info < (3, 6): install_requirements += ['scipy>=1.3.0,<1.5.0'] else: - install_requirements += ['scipy>=1.3.0'] + # #955 + install_requirements += ['scipy==1.5.2'] setup(name = 'GPy', version = __version__, @@ -168,13 +170,15 @@ def ismac(): include_package_data = True, py_modules = ['GPy.__init__'], test_suite = 'GPy.testing', - setup_requires = ['numpy>=1.7'], + # #955 + setup_requires = ['numpy == 1.19.2'], install_requires = install_requirements, extras_require = {'docs':['sphinx'], 'optional':['mpi4py', 'ipython>=4.0.0', ], - 'plotting':['matplotlib >= 3.0', + #matplotlib Version see github issue #955 + 'plotting':['matplotlib == 3.3.4', 'plotly >= 1.8.6'], 'notebook':['jupyter_client >= 4.0.6', 'ipywidgets >= 4.0.3', From a93c4ace5f884db4f55e0faffd9f3287d5e86f35 Mon Sep 17 00:00:00 2001 From: Peter Paul Kiefer Date: Sun, 28 Nov 2021 10:25:18 +0100 Subject: [PATCH 3/3] #955 Fix CI build Freezing numpy and scipy was a bad idea. I freeze matplotlib dependend on the python version only. --- appveyor.yml | 9 +++++++-- setup.py | 13 ++++++------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 4768a3fa9..6bf3333cf 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,14 +7,19 @@ environment: matrix: - PYTHON_VERSION: 3.5 MINICONDA: C:\Miniconda35-x64 + MPL_VERSION: 3.0.0 - PYTHON_VERSION: 3.6 MINICONDA: C:\Miniconda3-x64 + MPL_VERSION: 3.3.4 - PYTHON_VERSION: 3.7 MINICONDA: C:\Miniconda3-x64 + MPL_VERSION: 3.3.4 - PYTHON_VERSION: 3.8 MINICONDA: C:\Miniconda3-x64 + MPL_VERSION: 3.3.4 - PYTHON_VERSION: 3.9 MINICONDA: C:\Miniconda3-x64 + MPL_VERSION: 3.3.4 #configuration: # - Debug @@ -25,8 +30,8 @@ install: - conda config --set always_yes yes --set changeps1 no - conda update -q conda - conda info -a -# github issue #955: freez build versions of numpy, scipy and matplotlib - - "conda create -q -n build-environment python=%PYTHON_VERSION% numpy=1.19.2 scipy=1.5.2 matplotlib=3.3.4" +# github issue #955: freeze build version of matplotlib + - "conda create -q -n build-environment python=%PYTHON_VERSION% numpy scipy matplotlib=%MPL_VERSION%" - activate build-environment # We need wheel installed to build wheels - python -m pip install wheel diff --git a/setup.py b/setup.py index 261a7c908..b79a0d12a 100644 --- a/setup.py +++ b/setup.py @@ -117,13 +117,13 @@ def ismac(): except ModuleNotFoundError: ext_mods = [] -# #955 -install_requirements = ['numpy==1.19.2', 'six', 'paramz>=0.9.0', 'cython>=0.29'] +install_requirements = ['numpy>=1.7', 'six', 'paramz>=0.9.0', 'cython>=0.29'] +matplotlib_version = 'matplotlib==3.3.4' if sys.version_info < (3, 6): install_requirements += ['scipy>=1.3.0,<1.5.0'] + matplotlib_version = 'matplotlib==3.0.0' else: - # #955 - install_requirements += ['scipy==1.5.2'] + install_requirements += ['scipy>=1.3.0'] setup(name = 'GPy', version = __version__, @@ -170,15 +170,14 @@ def ismac(): include_package_data = True, py_modules = ['GPy.__init__'], test_suite = 'GPy.testing', - # #955 - setup_requires = ['numpy == 1.19.2'], + setup_requires = ['numpy>=1.7'], install_requires = install_requirements, extras_require = {'docs':['sphinx'], 'optional':['mpi4py', 'ipython>=4.0.0', ], #matplotlib Version see github issue #955 - 'plotting':['matplotlib == 3.3.4', + 'plotting':[matplotlib_version, 'plotly >= 1.8.6'], 'notebook':['jupyter_client >= 4.0.6', 'ipywidgets >= 4.0.3',