From 11ccb9d13cf1a5d78b5cf4062650dca9c4f75f4e Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Wed, 11 Jun 2025 12:20:53 -0400 Subject: [PATCH 1/6] skpkg: remove deprecated env.yml file --- environment.yml | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 environment.yml diff --git a/environment.yml b/environment.yml deleted file mode 100644 index 42088bbc..00000000 --- a/environment.yml +++ /dev/null @@ -1,6 +0,0 @@ -name: diffpy.utils -channels: - - conda-forge -dependencies: - - python=3 - - pip From d8e4f008742054176455d1f59e9f35becf362065 Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Wed, 11 Jun 2025 12:21:56 -0400 Subject: [PATCH 2/6] skpkg: remove socioeconomic from codespell --- .codespell/ignore_words.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/.codespell/ignore_words.txt b/.codespell/ignore_words.txt index 9757d7c0..04b4fcfa 100644 --- a/.codespell/ignore_words.txt +++ b/.codespell/ignore_words.txt @@ -4,8 +4,5 @@ ;; abbreviation for "materials" often used in a journal title mater -;; alternative use of socioeconomic -socio-economic - ;; Frobenius norm used in np.linalg.norm fro From b1717b8073afa172f6c1afbf80cf98dc81ace2ba Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Wed, 11 Jun 2025 12:23:06 -0400 Subject: [PATCH 3/6] skpkg: small changes to some config files --- .flake8 | 2 ++ .isort.cfg | 1 + .readthedocs.yaml | 13 +++++++++++++ pyproject.toml | 8 ++++---- 4 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 .readthedocs.yaml diff --git a/.flake8 b/.flake8 index 5a56eddd..7b2865c1 100644 --- a/.flake8 +++ b/.flake8 @@ -1,3 +1,5 @@ +# As of now, flake8 does not natively support configuration via pyproject.toml +# https://github.com/microsoft/vscode-flake8/issues/135 [flake8] exclude = .git, diff --git a/.isort.cfg b/.isort.cfg index 6d831957..86f162b8 100644 --- a/.isort.cfg +++ b/.isort.cfg @@ -1,4 +1,5 @@ [settings] +# Keep import statement below line_length character limit line_length = 79 multi_line_output = 3 include_trailing_comma = True diff --git a/.readthedocs.yaml b/.readthedocs.yaml new file mode 100644 index 00000000..47f7a017 --- /dev/null +++ b/.readthedocs.yaml @@ -0,0 +1,13 @@ +version: 2 + +build: + os: "ubuntu-22.04" + tools: + python: "latest" + +python: + install: + - requirements: requirements/docs.txt + +sphinx: + configuration: doc/source/conf.py diff --git a/pyproject.toml b/pyproject.toml index 10a6f890..ef9192f4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,13 +6,13 @@ build-backend = "setuptools.build_meta" name = "diffpy.utils" dynamic=['version', 'dependencies'] authors = [ - { name="Simon J.L. Billinge group", email="simon.billinge@gmail.com" }, + { name="Simon Billinge", email="sb2896@columbia.edu" }, ] maintainers = [ - { name="Simon J.L. Billinge group", email="simon.billinge@gmail.com" }, + { name="Simon Billinge", email="sb2896@columbia.edu" }, ] description = "General utilities for analyzing diffraction data" -keywords = ["text data parsers", "wx grid", "diffraction objects"] +keywords = ['text data parsers', 'wx grid', 'diffraction objects'] readme = "README.rst" requires-python = ">=3.11, <3.14" classifiers = [ @@ -27,7 +27,7 @@ classifiers = [ 'Operating System :: Unix', 'Programming Language :: Python :: 3.11', 'Programming Language :: Python :: 3.12', - 'Programming Language :: Python :: 3.13', + 'Programming Language :: Python :: 3.13', 'Topic :: Scientific/Engineering :: Physics', 'Topic :: Scientific/Engineering :: Chemistry', ] From 629a67047e7ce292e2705ccc93896aedf3780337 Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Wed, 11 Jun 2025 12:23:44 -0400 Subject: [PATCH 4/6] doc: add sphinx-copybutton as dependency --- requirements/docs.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements/docs.txt b/requirements/docs.txt index ab17b1c8..463381e3 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -2,3 +2,4 @@ sphinx sphinx_rtd_theme doctr m2r +sphinx-copybutton From 45a52e20ee9f3f88cadf8681d2b3f05d4d29364a Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Wed, 11 Jun 2025 12:29:03 -0400 Subject: [PATCH 5/6] chore: news --- news/news-and-misc.rst | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 news/news-and-misc.rst diff --git a/news/news-and-misc.rst b/news/news-and-misc.rst new file mode 100644 index 00000000..9882947c --- /dev/null +++ b/news/news-and-misc.rst @@ -0,0 +1,23 @@ +**Added:** + +* Add ``spinx-copybutton`` as a dependency for doc building. + +**Changed:** + +* + +**Deprecated:** + +* + +**Removed:** + +* Remove ``environment.yml``. + +**Fixed:** + +* + +**Security:** + +* From 9f3e15307cb9e36ad575780b48e0a7475c5662e1 Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Wed, 11 Jun 2025 13:49:37 -0400 Subject: [PATCH 6/6] chore: update news to no news --- news/news-and-misc.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/news/news-and-misc.rst b/news/news-and-misc.rst index 9882947c..339e8df3 100644 --- a/news/news-and-misc.rst +++ b/news/news-and-misc.rst @@ -1,6 +1,6 @@ **Added:** -* Add ``spinx-copybutton`` as a dependency for doc building. +* No news item needed, bringing package up to ``scikit-package 5v0.1.0`` standards. **Changed:** @@ -12,7 +12,7 @@ **Removed:** -* Remove ``environment.yml``. +* **Fixed:**