From 105573c7af5b4e74679e28d255f5c955c9430857 Mon Sep 17 00:00:00 2001 From: Adib Kabir Date: Wed, 11 Nov 2026 18:41:39 -0800 Subject: [PATCH 1/3] release: Completed PyPI rc-release preparation checklist for version 0.4.0 --- MANIFEST.in | 1 - cookiecutter.json | 2 +- docs/source/conf.py | 1 - news/pre-release-update.rst | 23 +++++++++++++++++++++++ pyproject.toml | 7 ++++--- 5 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 news/pre-release-update.rst diff --git a/MANIFEST.in b/MANIFEST.in index ae36d2f..f1a78ee 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -3,7 +3,6 @@ graft tests graft requirements include AUTHORS.rst LICENSE*.rst README.rst -include src/diffpy/labpdfproc/data * # Exclude all bytecode files and __pycache__ directories global-exclude *.py[cod] # Exclude all .pyc, .pyo, and .pyd files. diff --git a/cookiecutter.json b/cookiecutter.json index 7c013d4..4e72ae9 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -5,8 +5,8 @@ "maintainer_emails": "sbillinge@ucsb.edu", "maintainer_github_usernames": "sbillinge", "contributors": "Yucong Chen, Till Schertenleib, Caden Myers, Billinge Group members", - "license_holders": "The Trustees of Columbia University in the City of New York", "project_name": "diffpy.labpdfproc", + "license_holders": "The Trustees of Columbia University in the City of New York", "github_username_or_orgname": "diffpy", "github_repo_name": "diffpy.labpdfproc", "conda_pypi_package_dist_name": "diffpy.labpdfproc", diff --git a/docs/source/conf.py b/docs/source/conf.py index 6871539..a98b64f 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -107,7 +107,6 @@ # Mock imports so API docs render without installing dependencies. autodoc_mock_imports = ["diffpy.utils"] - # The reST default role (used for this markup: `text`) to use for all # documents. # default_role = None diff --git a/news/pre-release-update.rst b/news/pre-release-update.rst new file mode 100644 index 0000000..d4f1eac --- /dev/null +++ b/news/pre-release-update.rst @@ -0,0 +1,23 @@ +**Added:** + +* Added license = "BSD-3-Clause" and license-files = ["LICENSE*.rst", "AUTHORS.rst"] in pyproject.toml to replace the deprecated classifier. + +**Changed:** + +* Changed namespaces = false to namespaces = true to suppress a setuptools warning. + +**Deprecated:** + +* Removed the License :: OSI Approved :: BSD License classifier from pyproject.toml. because it’s deprecated + +**Removed:** + +* Removed include src/diffpy/labpdfproc/data * from Manifest.in because graft src already includes it. + +**Fixed:** + +* + +**Security:** + +* diff --git a/pyproject.toml b/pyproject.toml index 7b346c7..6a430d0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools>=62.0", "setuptools-git-versioning>=2.0"] +requires = ["setuptools>=77", "setuptools-git-versioning>=2.0"] build-backend = "setuptools.build_meta" [project] @@ -17,13 +17,14 @@ maintainers = [ description = "Tools for processing x-ray powder diffraction data from laboratory sources." keywords = ['powder XRD', 'absorption correction', 'PDF', 'diffpy'] readme = "README.rst" +license = "BSD-3-Clause" +license-files = ["LICENSE*.rst", "AUTHORS.rst"] requires-python = ">=3.12, <3.15" classifiers = [ 'Development Status :: 5 - Production/Stable', 'Environment :: Console', 'Intended Audience :: Developers', 'Intended Audience :: Science/Research', - 'License :: OSI Approved :: BSD License', 'Operating System :: MacOS :: MacOS X', 'Operating System :: Microsoft :: Windows', 'Operating System :: POSIX', @@ -49,7 +50,7 @@ dirty_template = "{tag}" where = ["src"] # list of folders that contain the packages (["."] by default) include = ["*"] # package names should match these glob patterns (["*"] by default) exclude = ["diffpy.labpdfproc.tests*"] # exclude packages matching these glob patterns (empty by default) -namespaces = false # to disable scanning PEP 420 namespaces (true by default) +namespaces = true # to disable scanning PEP 420 namespaces (true by default) [tool.setuptools.package-data] "diffpy.labpdfproc" = ["data/*"] From 7c34e0cd4384c586c41437fb9206de9b0bfe926d Mon Sep 17 00:00:00 2001 From: Adib Kabir Date: Wed, 11 Nov 2026 18:56:48 -0800 Subject: [PATCH 2/3] release: Completed PyPI rc-release preparation checklist for version 0.4.0 --- news/pre-release-update.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/news/pre-release-update.rst b/news/pre-release-update.rst index d4f1eac..b281d94 100644 --- a/news/pre-release-update.rst +++ b/news/pre-release-update.rst @@ -1,6 +1,6 @@ **Added:** -* Added license = "BSD-3-Clause" and license-files = ["LICENSE*.rst", "AUTHORS.rst"] in pyproject.toml to replace the deprecated classifier. +* Added license = "BSD-3-Clause" and license-files = ["LICENSE*.rst", "AUTHORS.rst"] in pyproject.toml. **Changed:** @@ -8,11 +8,11 @@ **Deprecated:** -* Removed the License :: OSI Approved :: BSD License classifier from pyproject.toml. because it’s deprecated +* Removed the License :: OSI Approved :: BSD License classifier from pyproject.toml. **Removed:** -* Removed include src/diffpy/labpdfproc/data * from Manifest.in because graft src already includes it. +* Removed include src/diffpy/labpdfproc/data * from Manifest.in. **Fixed:** From 281ad5683139d52828a5d14120cc7a2b29e045be Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 12 Nov 2026 03:15:19 +0000 Subject: [PATCH 3/3] [pre-commit.ci] auto fixes from pre-commit hooks --- news/pre-release-update.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/news/pre-release-update.rst b/news/pre-release-update.rst index b281d94..07b27c6 100644 --- a/news/pre-release-update.rst +++ b/news/pre-release-update.rst @@ -4,7 +4,7 @@ **Changed:** -* Changed namespaces = false to namespaces = true to suppress a setuptools warning. +* Changed namespaces = false to namespaces = true to suppress a setuptools warning. **Deprecated:**