From 1a06bed4ee453ec2d67a2e03df34b88dbd071c99 Mon Sep 17 00:00:00 2001 From: DavAug Date: Sat, 27 Sep 2025 12:00:03 +0200 Subject: [PATCH 1/3] Replace setup.py by pyproject.toml --- pyproject.toml | 47 ++++++++++++++++++++++++++++++++++++++++++++ setup.py | 53 -------------------------------------------------- 2 files changed, 47 insertions(+), 53 deletions(-) create mode 100644 pyproject.toml delete mode 100644 setup.py diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 00000000..11732cfd --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,47 @@ +[build-system] +requires = ["setuptools>=61.0.0", "wheel"] +build-backend = "setuptools.build_meta" + +[project] +name = "chi-drm" +version = "1.0.2" +description = "A python package to model dose response dynamics." +readme = { file = "README.md" } +requires-python = ">=3.8" +license = { file = "LICENSE.md" } +authors = [ + { name = "David Augustin", email = "david.augustin@cervify.com" }, +] +keywords = ["python", "packaging", "example"] +classifiers = [ + "Programming Language :: Python :: 3", + "License :: OSI Approved :: BSD 3-clause license", + "Operating System :: OS Independent", +] + +dependencies = [ + 'arviz>=0.17', + 'myokit>=1.34', + 'numpy>=1.17', + 'pandas>=0.24', + 'pints>=0.4', + 'plotly>=4.8.1', + 'scipy>=1.11', # 07/2024 - ArviZ seems to not yet keep up with SciPy + 'tqdm>=4.46.1', + 'xarray>=0.19', +] + +[project.optional-dependencies] +docs = [ + 'sphinx-rtd-theme>=1.3', + 'sphinx>=1.5, !=1.7.3', # For doc generation + 'sphinx-copybutton>=0.5.2' +] + +notebooks = [ + 'jupyter==1.0.0', +] + +[project.urls] +Documentation = "https://chi.readthedocs.io" +Repository = "https://github.com/DavAug/chi" \ No newline at end of file diff --git a/setup.py b/setup.py deleted file mode 100644 index a67d3ecd..00000000 --- a/setup.py +++ /dev/null @@ -1,53 +0,0 @@ -from setuptools import setup, find_packages - -# Load text for description -with open('README.md') as f: - readme = f.read() - - -# Go! -setup( - # Module name - name='chi-drm', - version='1.0.2', - description='Package to model dose response dynamics', - long_description=readme, - long_description_content_type="text/markdown", - url="https://chi.readthedocs.io", - - # License name - license='BSD 3-clause license', - - # Maintainer information - maintainer='David Augustin', - maintainer_email='david.augustin@cs.ox.ac.uk', - - # Packages and data to include - packages=find_packages( - include=('chi', 'chi.*'), - exclude=('chi/tests',)), - include_package_data=True, - - # List of dependencies - install_requires=[ - 'arviz>=0.17', - 'myokit>=1.34', - 'numpy>=1.17', - 'pandas>=0.24', - 'pints>=0.4', - 'plotly>=4.8.1', - 'scipy>=1.11', # 07/2024 - ArviZ seems to not yet keep up with SciPy - 'tqdm>=4.46.1', - 'xarray>=0.19', - ], - extras_require={ - 'docs': [ - 'sphinx-rtd-theme>=1.3', - 'sphinx>=1.5, !=1.7.3', # For doc generation - 'sphinx-copybutton>=0.5.2' - ], - 'notebooks': [ - 'jupyter==1.0.0', - ] - }, -) From 34cb2d0ae435d9f0f556928db1903863cc961205 Mon Sep 17 00:00:00 2001 From: DavAug Date: Sat, 27 Sep 2025 12:04:02 +0200 Subject: [PATCH 2/3] Tweaks --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 11732cfd..c9155188 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,9 +6,9 @@ build-backend = "setuptools.build_meta" name = "chi-drm" version = "1.0.2" description = "A python package to model dose response dynamics." -readme = { file = "README.md" } +readme = "README.md" requires-python = ">=3.8" -license = { file = "LICENSE.md" } +license = "LICENSE.md" authors = [ { name = "David Augustin", email = "david.augustin@cervify.com" }, ] From d5c3584699378e09a1fa6dc1fb71e1c93e150352 Mon Sep 17 00:00:00 2001 From: DavAug Date: Sat, 27 Sep 2025 12:08:34 +0200 Subject: [PATCH 3/3] FIx license reference --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index c9155188..7e48caf8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ version = "1.0.2" description = "A python package to model dose response dynamics." readme = "README.md" requires-python = ">=3.8" -license = "LICENSE.md" +license = { file = "LICENSE.md" } authors = [ { name = "David Augustin", email = "david.augustin@cervify.com" }, ]