Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pep508 dependency specification #1000

Open
wants to merge 3 commits into
base: devel
Choose a base branch
from
Open

pep508 dependency specification #1000

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
accdb14
pep508 dependency specification
jccalvojackson Jan 11, 2023
6a7f335
explicit matplotlib deps
jccalvojackson Jan 11, 2023
950b7d5
matplotlib optional
jccalvojackson Jan 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 21 additions & 10 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,12 @@
#===============================================================================

from __future__ import print_function

import codecs
import os
import sys
from setuptools import setup, Extension
import codecs

from setuptools import Extension, setup

try:
ModuleNotFoundError
Expand Down Expand Up @@ -117,13 +119,22 @@ def ismac():
except ModuleNotFoundError:
ext_mods = []

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:
install_requirements += ['scipy>=1.3.0']
install_requirements = [
"numpy>=1.7",
"six",
"paramz>=0.9.0",
"cython>=0.29",
'scipy>=1.3.0,<1.5.0;python_version<"3.6"',
'scipy>=1.3.0;python_version>="3.6"',
]

matplotlib_version = [
'matplotlib==3.0.0;python_version<"3.6"',
'matplotlib==3.3.4;python_version>="3.6"',
]

install_requirements += matplotlib_version
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this makes matplotlib an unconditional dependency, which I don't think it was previously

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you are right.



setup(name = 'GPy',
version = __version__,
Expand Down Expand Up @@ -177,7 +188,7 @@ def ismac():
'ipython>=4.0.0',
],
#matplotlib Version see github issue #955
'plotting':[matplotlib_version,
'plotting':[*matplotlib_version,
'plotly >= 1.8.6'],
'notebook':['jupyter_client >= 4.0.6',
'ipywidgets >= 4.0.3',
Expand Down