apunkt/GPy
1
0
Fork 0
mirror of https://github.com/SheffieldML/GPy.git synced 2026-07-11 16:22:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

#955 Fix CI build

Browse source 
Freezing numpy and scipy was a bad idea.
I freeze matplotlib  dependend  on the python version only.
This commit is contained in:
Peter Paul Kiefer 2021-11-28 10:25:18 +01:00
parent 299b3b023a
commit a93c4ace5f
2 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
appveyor.yml
View file

@ -7,14 +7,19 @@ environment:
matrix: matrix:
- PYTHON_VERSION: 3.5 - PYTHON_VERSION: 3.5
MINICONDA: C:\Miniconda35-x64 MINICONDA: C:\Miniconda35-x64
MPL_VERSION: 3.0.0
- PYTHON_VERSION: 3.6 - PYTHON_VERSION: 3.6
MINICONDA: C:\Miniconda3-x64 MINICONDA: C:\Miniconda3-x64
MPL_VERSION: 3.3.4
- PYTHON_VERSION: 3.7 - PYTHON_VERSION: 3.7
MINICONDA: C:\Miniconda3-x64 MINICONDA: C:\Miniconda3-x64
MPL_VERSION: 3.3.4
- PYTHON_VERSION: 3.8 - PYTHON_VERSION: 3.8
MINICONDA: C:\Miniconda3-x64 MINICONDA: C:\Miniconda3-x64
MPL_VERSION: 3.3.4
- PYTHON_VERSION: 3.9 - PYTHON_VERSION: 3.9
MINICONDA: C:\Miniconda3-x64 MINICONDA: C:\Miniconda3-x64
MPL_VERSION: 3.3.4
#configuration: #configuration:
# - Debug # - Debug
@ -25,8 +30,8 @@ install:
- conda config --set always_yes yes --set changeps1 no - conda config --set always_yes yes --set changeps1 no
- conda update -q conda - conda update -q conda
- conda info -a - conda info -a
# github issue #955: freez build versions of numpy, scipy and matplotlib # github issue #955: freeze build version of matplotlib
- "conda create -q -n build-environment python=%PYTHON_VERSION% numpy=1.19.2 scipy=1.5.2 matplotlib=3.3.4" - "conda create -q -n build-environment python=%PYTHON_VERSION% numpy scipy matplotlib=%MPL_VERSION%"
- activate build-environment - activate build-environment
# We need wheel installed to build wheels # We need wheel installed to build wheels
- python -m pip install wheel - python -m pip install wheel

13
setup.py
View file

@ -117,13 +117,13 @@ try:
except ModuleNotFoundError: except ModuleNotFoundError:
ext_mods = [] ext_mods = []
# #955 install_requirements = ['numpy>=1.7', 'six', 'paramz>=0.9.0', 'cython>=0.29']
install_requirements = ['numpy==1.19.2', 'six', 'paramz>=0.9.0', 'cython>=0.29'] matplotlib_version = 'matplotlib==3.3.4'
if sys.version_info < (3, 6): if sys.version_info < (3, 6):
install_requirements += ['scipy>=1.3.0,<1.5.0'] install_requirements += ['scipy>=1.3.0,<1.5.0']
matplotlib_version = 'matplotlib==3.0.0'
else: else:
# #955 install_requirements += ['scipy>=1.3.0']
install_requirements += ['scipy==1.5.2']
setup(name = 'GPy', setup(name = 'GPy',
version = __version__, version = __version__,
@ -170,15 +170,14 @@ setup(name = 'GPy',
include_package_data = True, include_package_data = True,
py_modules = ['GPy.__init__'], py_modules = ['GPy.__init__'],
test_suite = 'GPy.testing', test_suite = 'GPy.testing',
# #955 setup_requires = ['numpy>=1.7'],
setup_requires = ['numpy == 1.19.2'],
install_requires = install_requirements, install_requires = install_requirements,
extras_require = {'docs':['sphinx'], extras_require = {'docs':['sphinx'],
'optional':['mpi4py', 'optional':['mpi4py',
'ipython>=4.0.0', 'ipython>=4.0.0',
], ],
#matplotlib Version see github issue #955 #matplotlib Version see github issue #955
'plotting':['matplotlib == 3.3.4', 'plotting':[matplotlib_version,
'plotly >= 1.8.6'], 'plotly >= 1.8.6'],
'notebook':['jupyter_client >= 4.0.6', 'notebook':['jupyter_client >= 4.0.6',
'ipywidgets >= 4.0.3', 'ipywidgets >= 4.0.3',