Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion cookiecutter.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
23 changes: 23 additions & 0 deletions news/pre-release-update.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
**Added:**

* Added license = "BSD-3-Clause" and license-files = ["LICENSE*.rst", "AUTHORS.rst"] in pyproject.toml.

**Changed:**

* Changed namespaces = false to namespaces = true to suppress a setuptools warning.

**Deprecated:**

* Removed the License :: OSI Approved :: BSD License classifier from pyproject.toml.

**Removed:**

* Removed include src/diffpy/labpdfproc/data * from Manifest.in.

**Fixed:**

* <news item>

**Security:**

* <news item>
7 changes: 4 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -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]
Expand All @@ -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',
Expand All @@ -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/*"]
Expand Down
Loading