From b326171285f21729c39eacdc1cff3d5d640d1736 Mon Sep 17 00:00:00 2001 From: Chris Meyer <34664+cmeyer@users.noreply.github.com> Date: Sat, 25 Oct 2025 11:56:46 -0700 Subject: [PATCH] Eliminate setup.cfg/py in favor of pyproject.toml. Require python 3.12. --- pyproject.toml | 30 ++++++++++++++++++++++++++++++ setup.cfg | 29 ----------------------------- setup.py | 4 ---- 3 files changed, 30 insertions(+), 33 deletions(-) delete mode 100644 setup.cfg delete mode 100755 setup.py diff --git a/pyproject.toml b/pyproject.toml index cbd7a5d..f72957d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,6 +2,36 @@ requires = ["setuptools", "wheel"] build-backend = "setuptools.build_meta" +[project] +name = "niondata" +version = "15.9.1" +authors = [ + { name = "Nion Software", email = "swift@nion.com" } +] +description = "A data processing library for Nion Swift." +readme = "README.rst" +requires-python = ">=3.12" +license = "Apache-2.0" +classifiers = [ + "Development Status :: 5 - Production/Stable", + "Intended Audience :: Developers", + "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", + "Programming Language :: Python :: 3.14" +] +urls = { "Homepage" = "https://github.com/nion-software/niondata" } +dependencies = [ + "nionutils >=4.14.0,<5.0.0", + "numpy >=2.0,<3.0", + "scipy" +] + +[tool.setuptools.packages.find] +include = ["nion", "nion.data", "nion.data.test"] + +[tool.setuptools.package-data] +"nion.data" = ["py.typed"] + [tool.pytest.ini_options] testpaths = [ "nion/data" diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 7f7015e..0000000 --- a/setup.cfg +++ /dev/null @@ -1,29 +0,0 @@ -[metadata] -name = niondata -version = 15.9.1 -author = Nion Software -author_email = swift@nion.com -description = A data processing library for Nion Swift. -long_description = file: README.rst, CHANGES.rst, LICENSE.rst -url = https://github.com/nion-software/niondata -license = Apache-2.0 -classifiers = - Development Status :: 5 - Production/Stable - License :: OSI Approved :: Apache Software License - Programming Language :: Python :: 3.11 - Programming Language :: Python :: 3.12 - Programming Language :: Python :: 3.13 - -[options] -packages = find_namespace: -python_requires = >=3.11 -install_requires = - numpy >=2.0,<3.0 - scipy - nionutils >=4.14.0,<5.0.0 - -[options.packages.find] -include = nion, nion.data, nion.data.test - -[options.package_data] -nion.data = py.typed diff --git a/setup.py b/setup.py deleted file mode 100755 index 7f1a176..0000000 --- a/setup.py +++ /dev/null @@ -1,4 +0,0 @@ -from setuptools import setup - -if __name__ == "__main__": - setup()