Merge pull request #1202 from wright-group/ddk-meta

meta maintenance

Author: rpm4

CHANGELOG.md

@@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
 ### Changed
 - default colorbar is sampled at 4096 points (was 256)
+- packaging now done through pyproject.toml
 
 ## [3.5.5]
 

CONTRIBUTORS

@@ -3,12 +3,14 @@ http://wright.tools/en/stable/contributing.html
 
 Maintainers (alphabetical by last name)
   Daniel Kohler (@ddkohler)
-  Darien Morrow <darienmorrow@gmail.com> (@darienmorrow)
-  Kyle Sunden <sunden@wisc.edu> (@ksunden)
-  Blaise Thompson <blaise@untzag.com> (@untzag)
 
 Contributors (alphabetical by last name)
   Kyle Czech (@kjczech)
+  Ryan McDonnell (@rpm4)
+  Kent Meyer (@kameyer226)
+  Darien Morrow <darienmorrow@gmail.com> (@darienmorrow)
   Nathan Neff-Mallon (@neffmallon)
   Thomas Parker (@parkertomf)
+  Kyle Sunden (@ksunden)
   Rachel Swedin (@RachelSwedin)
+  Blaise Thompson <blaise@untzag.com> (@untzag)

WrightTools/data/_channel.py

@@ -33,7 +33,7 @@ def __init__(
         signed=None,
         label=None,
         label_seed=None,
-        **kwargs
+        **kwargs,
     ):
         """Construct a channel object.
 

WrightTools/diagrams/delay.py

@@ -18,7 +18,7 @@ def label_sectors(
     cs=None,
     c_zlevel=2,
     c_alpha=0.5,
-    fontsize=40
+    fontsize=40,
 ):
     """Label the six time-orderings in a three-pulse experiment.
 

pyproject.toml

@@ -0,0 +1,68 @@
+[build-system]
+requires = ["setuptools >= 77.0.3"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "WrightTools"
+authors =[{name="WrightTools Developers"}]
+description="Tools for loading, processing, and plotting multidimensional spectroscopy data."
+readme = "README.rst"
+requires-python = ">=3.7"
+dynamic = ["version"]
+dependencies = [
+    "h5py",
+    "imageio>=2.28.0",
+    "matplotlib>=3.4.0",
+    "numexpr",
+    "numpy>=1.15.0",
+    "pint",
+    "python-dateutil",
+    "scipy",
+    "click",
+    "tidy_headers>=1.0.4",
+    "rich",
+]
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Intended Audience :: Science/Research",
+    "Framework :: Matplotlib",
+    "Natural Language :: English",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Topic :: Scientific/Engineering",
+]
+keywords = ["spectroscopy", "science", "multidimensional", "visualization"]
+license="MIT"
+license-files = ["LICEN[CS]E*"]
+
+[project.optional-dependencies]
+docs = [
+    "sphinx<8.0",
+    "sphinx-gallery==0.8.2",
+    "sphinx-rtd-theme"
+]
+dev = [
+    "black",
+    "pre-commit",
+    "pydocstyle",
+    "pytest",
+    "pytest-cov",
+    "databroker>=1.2",
+    "msgpack",
+    "sphinx<8.0",
+    "sphinx-gallery==0.8.2",
+    "sphinx-rtd-theme"
+]
+
+[project.urls]
+Homepage = "https://github.com/wright-group/WrightTools"
+Documentation = "https://wright.tools"
+Repository = "https://github.com/wright-group/WrightTools.git"
+Issues = "https://github.com/wright-group/WrightTools/issues"
+Changelog = "https://github.com/wright-group/WrightTools/blob/master/CHANGELOG.md"
+
+[project.scripts]
+wt5 = "WrightTools.cli._wt5:cli"
+wt-convert = "WrightTools.cli._units:cli"

setup.cfg

@@ -20,10 +20,6 @@ ignore = D105, E203, W503
 convention = numpy
 add-ignore = D105
 
-[metadata]
-description_file = README.rst
-license_file = LICENSE.txt
-
 [tool:pytest]
 addopts = --durations=10 --cov=WrightTools --verbose --cov-report term:skip-covered
 python_files = tests/*.py

setup.py

@@ -1,15 +1,7 @@
 #! /usr/bin/env python3
 
-import os
-from setuptools import setup, find_packages
-
-
-here = os.path.abspath(os.path.dirname(__file__))
-
 
-def read(fname):
-    with open(os.path.join(here, fname)) as f:
-        return f.read()
+from setuptools import setup, find_packages
 
 
 extra_files = {
@@ -25,67 +17,7 @@ def read(fname):
     ]
 }
 
-with open(os.path.join(here, "WrightTools", "VERSION")) as version_file:
-    version = version_file.read().strip()
-
-docs_require = ["sphinx<8.0", "sphinx-gallery==0.8.2", "sphinx-rtd-theme"]
-
 setup(
-    name="WrightTools",
     packages=find_packages(exclude=("tests", "tests.*")),
     package_data=extra_files,
-    python_requires=">=3.7",
-    install_requires=[
-        "h5py",
-        "imageio>=2.28.0",
-        "matplotlib>=3.4.0",
-        "numexpr",
-        "numpy>=1.15.0",
-        "pint",
-        "python-dateutil",
-        "scipy",
-        "click",
-        "tidy_headers>=1.0.4",
-        "rich",
-    ],
-    extras_require={
-        "docs": docs_require,
-        "dev": [
-            "black",
-            "pre-commit",
-            "pydocstyle",
-            "pytest",
-            "pytest-cov",
-            "databroker>=1.2",
-            "msgpack",
-        ]
-        + docs_require,
-    },
-    version=version,
-    description="Tools for loading, processing, and plotting multidimensional spectroscopy data.",
-    description_content_type="text/plain",
-    long_description=read("README.rst"),
-    long_description_content_type="text/x-rst",
-    author="WrightTools Developers",
-    license="MIT",
-    url="http://wright.tools",
-    keywords="spectroscopy science multidimensional visualization",
-    entry_points={
-        "console_scripts": [
-            "wt5=WrightTools.cli._wt5:cli",
-            "wt-convert=WrightTools.cli._units:cli",
-        ]
-    },
-    classifiers=[
-        "Development Status :: 5 - Production/Stable",
-        "Intended Audience :: Science/Research",
-        "License :: OSI Approved :: MIT License",
-        "Framework :: Matplotlib",
-        "Natural Language :: English",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.11",
-        "Programming Language :: Python :: 3.12",
-        "Programming Language :: Python :: 3.13",
-        "Topic :: Scientific/Engineering",
-    ],
 )