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.

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

Move the most of metadata into PEP 621-compliant pyproject.toml. #1006

Merged
merged 3 commits into from
Jun 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 87 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
[build-system]
requires = ["setuptools>=61.2", "numpy>=1.7",]
build-backend = "setuptools.build_meta"

[project]
name = "GPy"
authors = [{name = "GPy Authors: https://github.com/SheffieldML/GPy/graphs/contributors", email = "gpy.authors@gmail.com"},]
license = {text = "BSD-3-Clause"}
description = "The Gaussian Process Toolbox"
readme = "README.rst"
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
readme = "README.rst"
readme = "README.md"

keywords = ["machine-learning", "gaussian-processes", "kernels",]
classifiers = [
"License :: OSI Approved :: BSD License",
"Natural Language :: English",
"Operating System :: MacOS :: MacOS X",
"Operating System :: Microsoft :: Windows",
"Operating System :: POSIX :: Linux",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
Comment on lines +18 to +22
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",

"Framework :: IPython",
"Intended Audience :: Science/Research",
"Intended Audience :: Developers",
"Topic :: Software Development",
"Topic :: Software Development :: Libraries :: Python Modules",
]
dependencies = [
"numpy>=1.7",
"six",
"paramz>=0.9.0",
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
"paramz>=0.9.0",
"paramz>=0.9.6",

"cython>=0.29",
"scipy>=1.3.0; python_version >= '3.6'",
"scipy>=1.3.0,<1.5.0; python_version < '3.6'",
Comment on lines +34 to +35
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
"scipy>=1.3.0; python_version >= '3.6'",
"scipy>=1.3.0,<1.5.0; python_version < '3.6'",
"scipy>=1.3.0,<=1.12.0"

]
dynamic = ["version",]

[project.urls]
Homepage = "https://sheffieldml.github.io/GPy/"
Download = "https://github.com/SheffieldML/GPy/archive/refs/heads/devel.zip"
"Source Code" = "https://github.com/SheffieldML/GPy"
"Bug Tracker" = "https://github.com/SheffieldML/GPy/issues"

[project.optional-dependencies]
docs = ["sphinx"]
optional = ["mpi4py", "ipython>=4.0.0"]
plotting = [
"matplotlib==3.3.4; python_version >= '3.6'",
"matplotlib==3.0.0; python_version < '3.6'",
Comment on lines +49 to +50
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
"matplotlib==3.3.4; python_version >= '3.6'",
"matplotlib==3.0.0; python_version < '3.6'",
"matplotlib>=3.3.4",

"plotly >= 1.8.6",
]
notebook = [
"jupyter_client >= 4.0.6",
"ipywidgets >= 4.0.3",
"ipykernel >= 4.1.0",
"notebook >= 4.0.5",
]

[tool.setuptools]
package-dir = {GPy = "GPy"}
py-modules = ["GPy.__init__"]
packages = [
"GPy",
"GPy.core",
"GPy.core.parameterization",
"GPy.kern",
"GPy.kern.src",
"GPy.kern.src.psi_comp",
"GPy.models",
"GPy.inference",
"GPy.inference.optimization",
"GPy.inference.mcmc",
"GPy.inference.latent_function_inference",
"GPy.likelihoods",
"GPy.mappings",
"GPy.examples",
"GPy.testing",
"GPy.util",
"GPy.plotting",
"GPy.plotting.gpy_plot",
"GPy.plotting.matplot_dep",
"GPy.plotting.matplot_dep.controllers",
"GPy.plotting.plotly_dep",
]
include-package-data = true
#test-suite = "GPy.testing"
21 changes: 17 additions & 4 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
[options]
test_suite = GPy.testing

[options.extras_require]
docs = sphinx
optional = mpi4py; ipython>=4.0.0
# matplotlib Version see github issue #955
plotting =
matplotlib==3.3.4; python_version >= '3.6'
matplotlib==3.0.0; python_version < '3.6'
plotly >= 1.8.6
notebook =
jupyter_client >= 4.0.6
ipywidgets >= 4.0.3
ipykernel >= 4.1.0
notebook >= 4.0.5

[bumpversion]
current_version = 1.9.9
tag = True
Expand All @@ -9,7 +26,3 @@ commit = True

[upload_docs]
upload-dir = doc/build/html

[medatdata]
description-file = README.rst

83 changes: 1 addition & 82 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,91 +117,10 @@ 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']

setup(name = 'GPy',
setup(
version = __version__,
author = read_to_rst('AUTHORS.txt'),
author_email = "gpy.authors@gmail.com",
description = ("The Gaussian Process Toolbox"),
long_description = desc,
license = "BSD 3-clause",
keywords = "machine-learning gaussian-processes kernels",
url = "http://sheffieldml.github.com/GPy/",
download_url='https://github.com/SheffieldML/GPy/',
ext_modules = ext_mods,
packages = ["GPy",
"GPy.core",
"GPy.core.parameterization",
"GPy.kern",
"GPy.kern.src",
"GPy.kern.src.psi_comp",
"GPy.models",
"GPy.inference",
"GPy.inference.optimization",
"GPy.inference.mcmc",
"GPy.inference.latent_function_inference",
"GPy.likelihoods",
"GPy.mappings",
"GPy.examples",
"GPy.testing",
"GPy.util",
"GPy.plotting",
"GPy.plotting.gpy_plot",
"GPy.plotting.matplot_dep",
"GPy.plotting.matplot_dep.controllers",
"GPy.plotting.plotly_dep",
],
package_dir={'GPy': 'GPy'},
#package_data = {'GPy': ['defaults.cfg', 'installation.cfg',
# 'util/data_resources.json',
# 'util/football_teams.json',
# 'testing/plotting_tests/baseline/*.png'
# ]},
#data_files=[('GPy/testing/plotting_tests/baseline', 'testing/plotting_tests/baseline/*.png'),
# ('GPy/testing/', 'GPy/testing/pickle_test.pickle'),
# ],
include_package_data = True,
py_modules = ['GPy.__init__'],
test_suite = 'GPy.testing',
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_version,
'plotly >= 1.8.6'],
'notebook':['jupyter_client >= 4.0.6',
'ipywidgets >= 4.0.3',
'ipykernel >= 4.1.0',
'notebook >= 4.0.5',
],
},
classifiers=['License :: OSI Approved :: BSD License',
'Natural Language :: English',
'Operating System :: MacOS :: MacOS X',
'Operating System :: Microsoft :: Windows',
'Operating System :: POSIX :: Linux',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Framework :: IPython',
'Intended Audience :: Science/Research',
'Intended Audience :: Developers',
'Topic :: Software Development',
'Topic :: Software Development :: Libraries :: Python Modules',

]
)


Expand Down