From dfc635e9cc0b57aad05c713e402d4dd1b1ff1071 Mon Sep 17 00:00:00 2001 From: MilesCranmer Date: Fri, 23 Aug 2024 11:45:25 +0800 Subject: [PATCH 1/3] build: switch to pyproject.toml --- pyproject.toml | 25 +++++++++++++++++++++++++ setup.cfg | 25 ------------------------- 2 files changed, 25 insertions(+), 25 deletions(-) delete mode 100644 setup.cfg diff --git a/pyproject.toml b/pyproject.toml index 8fe2f47a..9dbb621f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,28 @@ [build-system] requires = ["setuptools>=42", "wheel"] build-backend = "setuptools.build_meta" + +[project] +name = "juliacall" +version = "0.9.23" +description = "Julia and Python in seamless harmony" +readme = "README.md" +readme-content-type = "text/markdown" +homepage = "http://github.com/JuliaPy/PythonCall.jl" +classifiers = [ + "Programming Language :: Python :: 3", + "License :: OSI Approved :: MIT License", + "Operating System :: OS Independent" +] +requires-python = ">=3.8" +dependencies = ["juliapkg ~=0.1.8"] + +[tool.setuptools] +zip-safe = false + +[tool.setuptools.packages.find] +where = ["pysrc"] +include = ["juliacall"] + +[tool.setuptools.package-data] +"juliacall" = ["*.json", "*.jl"] diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 54c6d93a..00000000 --- a/setup.cfg +++ /dev/null @@ -1,25 +0,0 @@ -[metadata] -name = juliacall -version = 0.9.23 -description = Julia and Python in seamless harmony -long_description = file: README.md -long_description_content_type = text/markdown -url = http://github.com/JuliaPy/PythonCall.jl -classifiers = - Programming Language :: Python :: 3 - License :: OSI Approved :: MIT License - Operating System :: OS Independent - -[options] -zip_safe = False -package_dir = - =pysrc -packages = juliacall -python_requires = ~=3.8 -install_requires = - juliapkg ~=0.1.8 - -[options.package_data] -juliacall = - *.json - *.jl From 0958a7f3f85db7255ff93efbce45b47ee6f7c644 Mon Sep 17 00:00:00 2001 From: MilesCranmer Date: Fri, 23 Aug 2024 11:49:25 +0800 Subject: [PATCH 2/3] build: update `bump.jl` with pyproject.toml --- bump.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bump.jl b/bump.jl index f02f6913..527740eb 100644 --- a/bump.jl +++ b/bump.jl @@ -22,7 +22,7 @@ function bumpver(file, pattern, oldver, newver) end bumpver("Project.toml", "version = \"{}\"\n", oldver, newver) -bumpver("setup.cfg", "version = {}\n", oldver, newver) +bumpver("pyproject.toml", "version = \"{}\"\n", oldver, newver) bumpver("pysrc/juliacall/__init__.py", "__version__ = '{}'\n", oldver, newver) bumpver("pysrc/juliacall/juliapkg.json", "\"version\": \"={}\"", oldver, newver) bumpver("pysrc/juliacall/juliapkg-dev.json", "\"version\": \"={}\"", oldver, newver) From 6e44b9d8019428ec98b2436d4da6e3d92d5f88d2 Mon Sep 17 00:00:00 2001 From: MilesCranmer Date: Fri, 23 Aug 2024 11:51:37 +0800 Subject: [PATCH 3/3] build: move homepage spec --- pyproject.toml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 9dbb621f..ffd69434 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,9 +6,7 @@ build-backend = "setuptools.build_meta" name = "juliacall" version = "0.9.23" description = "Julia and Python in seamless harmony" -readme = "README.md" -readme-content-type = "text/markdown" -homepage = "http://github.com/JuliaPy/PythonCall.jl" +readme = { file = "README.md", content-type = "text/markdown" } classifiers = [ "Programming Language :: Python :: 3", "License :: OSI Approved :: MIT License",