Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
f571541
pyproject.toml
sbillinge Aug 13, 2025
adef05a
Merge pull request #7 from sbillinge/toml
sbillinge Aug 13, 2025
fa4388d
toml
sbillinge Aug 14, 2025
cea3b2b
Merge pull request #8 from diffpy/toml
sbillinge Aug 14, 2025
77788fc
chore: change diffpy to src/diffpy, modify project script in pyprojec…
zmx27 Aug 16, 2025
d7310b4
Merge pull request #9 from zmx27/change-package-structure
sbillinge Aug 16, 2025
032acbc
skpkg: apply pre-commit hooks with no manual edits
zmx27 Oct 17, 2025
0a80a12
Merge pull request #13 from zmx27/pre-commit-auto
sbillinge Oct 17, 2025
8e9c1d1
fix: fix codespell, remove unused module, and fix string too long issue.
stevenhua0320 Oct 19, 2025
9d9fe71
style: remove unused module, change style of string, fix codespell.
stevenhua0320 Oct 19, 2025
23a074c
style: pre-commit autofix to calculate.py
stevenhua0320 Oct 19, 2025
919482a
style: fix E501, F401, E711 on mask, saveresults, selfcalibrate, and …
stevenhua0320 Oct 19, 2025
cbabbda
style: Fix E731, E712, E501, F821, F401 flake8 issue in srxplanarconf…
stevenhua0320 Oct 19, 2025
1dcad1f
style: change Error type and fix spelling error
stevenhua0320 Oct 20, 2025
b70c3e6
style: fix spelling error.
stevenhua0320 Oct 20, 2025
576d998
style: delete unused module and add OSError in exception warning.
stevenhua0320 Oct 20, 2025
06813fd
style: remove try except to import module
stevenhua0320 Oct 20, 2025
d87b19a
Merge pull request #17 from stevenhua0320/flake8-fix-5
sbillinge Oct 20, 2025
d3e39e6
Merge pull request #14 from stevenhua0320/flake8-fix-1
sbillinge Oct 20, 2025
90f0b36
style: delete unsued module to test if break functionality.
stevenhua0320 Oct 20, 2025
105d4cd
style: delete file in confutils
stevenhua0320 Oct 20, 2025
59fcc9f
Merge pull request #16 from stevenhua0320/flake8-fix-4
sbillinge Oct 20, 2025
5064273
Revert "style: delete file in confutils"
stevenhua0320 Oct 20, 2025
24ddd7c
Merge pull request #15 from stevenhua0320/flake8-fix-2
sbillinge Oct 20, 2025
03f0fcb
style: pass flake8 test and fix spelling error.
stevenhua0320 Oct 20, 2025
da2bf29
Merge pull request #19 from stevenhua0320/flake8-fix-6
sbillinge Oct 21, 2025
2db8d07
skpkg: migrate src folder and change project.toml comp to py 3.14
stevenhua0320 Oct 21, 2025
2c7c3a2
style: change author to be the right person.
stevenhua0320 Oct 21, 2025
a9277f9
style: change license year coverage
stevenhua0320 Oct 21, 2025
76d9c29
skpkg: list dependencies in requirements folder.
stevenhua0320 Oct 21, 2025
b6ad0ed
fix: fix py2 deprecation, incorrect module import to pass the pytest …
stevenhua0320 Oct 21, 2025
2d760fa
Merge pull request #20 from stevenhua0320/setup-CI
sbillinge Oct 21, 2025
1ec6b64
Merge branch 'migration' into requirements
stevenhua0320 Oct 21, 2025
bf66441
Merge pull request #21 from stevenhua0320/requirements
sbillinge Oct 21, 2025
f28786a
skpkg: add config files readthedocs, codecov, GitHub
stevenhua0320 Oct 22, 2025
95b49b6
skpkg: migrate docs/source files
stevenhua0320 Oct 22, 2025
224ed83
Merge pull request #23 from stevenhua0320/config
sbillinge Oct 22, 2025
d052af8
skpkg: add config files for authors, changelog, code of conduct, license
stevenhua0320 Oct 22, 2025
def081c
skpkg: add MANIFEST.in
stevenhua0320 Oct 22, 2025
3ebf91e
skpkg: add README.rst
stevenhua0320 Oct 22, 2025
f5fc834
skpkg: add news files
stevenhua0320 Oct 22, 2025
9fdb356
skpkg: change citation and correct author name.
stevenhua0320 Oct 22, 2025
dd2e543
skpkg: change documentation author, change license coverage
stevenhua0320 Oct 22, 2025
de59d92
style: build html doc
stevenhua0320 Oct 22, 2025
98c00c7
style: add instruction of install by wheel, change badge and fix desc…
stevenhua0320 Oct 22, 2025
a7e7875
chore: add description to the srxplanar in index.rst
stevenhua0320 Oct 22, 2025
273ae68
style: change badge, and description of the package.
stevenhua0320 Oct 22, 2025
3a9ec20
style: move data into data folder and few more style change in build doc
stevenhua0320 Oct 23, 2025
ef4a19a
Merge pull request #24 from stevenhua0320/doc
sbillinge Oct 23, 2025
2b7d92b
style: add Codecov and PyPI icon back to README.tsy
stevenhua0320 Oct 24, 2025
2e95fd1
style: change workflow to open source.
stevenhua0320 Oct 24, 2025
564ed6e
style: add CI, pypi, and conda-forge icon
stevenhua0320 Oct 24, 2025
2082643
chore: change license year coverage for Christoph Gohlke.
stevenhua0320 Oct 24, 2025
e42a13c
chore: change workflow name
stevenhua0320 Oct 24, 2025
6286a4d
Merge pull request #25 from stevenhua0320/doc-2
sbillinge Oct 24, 2025
fa9e088
Merge pull request #26 from stevenhua0320/config
sbillinge Oct 24, 2025
7f4ac1e
style: change workflow to public workflow.
stevenhua0320 Oct 24, 2025
03258e7
chore: delete unncessary code, add cookiecutter.json, and modify file…
stevenhua0320 Oct 24, 2025
7911afe
Merge pull request #27 from stevenhua0320/migration
sbillinge Oct 24, 2025
0c6f1de
Merge pull request #28 from stevenhua0320/check-file
sbillinge Oct 24, 2025
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
14 changes: 14 additions & 0 deletions .codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
coverage:
status:
project: # more options at https://docs.codecov.com/docs/commit-status
default:
target: auto # use the coverage from the base commit, fail if coverage is lower
threshold: 0% # allow the coverage to drop by

comment:
layout: " diff, flags, files"
behavior: default
require_changes: false
require_base: false # [true :: must have a base report to post]
require_head: false # [true :: must have a head report to post]
hide_project_coverage: false # [true :: only show coverage on the git diff aka patch coverage]
2 changes: 2 additions & 0 deletions .codespell/ignore_lines.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
;; Please include filenames and explanations for each ignored line.
;; See https://docs.openverse.org/meta/codespell.html for docs.
8 changes: 8 additions & 0 deletions .codespell/ignore_words.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
;; Please include explanations for each ignored word (lowercase).
;; See https://docs.openverse.org/meta/codespell.html for docs.

;; abbreviation for "materials" often used in a journal title
mater

;; Frobenius norm used in np.linalg.norm
fro
13 changes: 13 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# As of now, flake8 does not natively support configuration via pyproject.toml
# https://github.com/microsoft/vscode-flake8/issues/135
[flake8]
exclude =
.git,
__pycache__,
build,
dist,
docs/source/conf.py
max-line-length = 79
# Ignore some style 'errors' produced while formatting by 'black'
# https://black.readthedocs.io/en/stable/guides/using_black_with_other_tools.html#labels-why-pycodestyle-warnings
extend-ignore = E203
16 changes: 16 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_feature.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
name: Bug Report or Feature Request
about: Report a bug or suggest a new feature!
title: ""
labels: ""
assignees: ""
---

### Problem

<!--
For a bug report, please copy and paste any error messages from the application or command-line here.
For a feature request, please state how the new functionality could benefit the community.
-->

### Proposed solution
46 changes: 46 additions & 0 deletions .github/ISSUE_TEMPLATE/release_checklist.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
---
name: Release
about: Checklist and communication channel for PyPI and GitHub release
title: "Ready for <version-number> PyPI/GitHub release"
labels: "release"
assignees: ""
---

### PyPI/GitHub rc-release preparation checklist:

- [ ] All PRs/issues attached to the release are merged.
- [ ] All the badges on the README are passing.
- [ ] License information is verified as correct. If you are unsure, please comment below.
- [ ] Locally rendered documentation contains all appropriate pages, including API references (check no modules are
missing), tutorials, and other human-written text is up-to-date with any changes in the code.
- [ ] Installation instructions in the README, documentation, and the website are updated.
- [ ] Successfully run any tutorial examples or do functional testing with the latest Python version.
- [ ] Grammar and writing quality are checked (no typos).
- [ ] Install `pip install build twine`, run `python -m build` and `twine check dist/*` to ensure that the package can be built and is correctly formatted for PyPI release.

Please tag the maintainer (e.g., @username) in the comment here when you are ready for the PyPI/GitHub release. Include any additional comments necessary, such as version information and details about the pre-release here:

### PyPI/GitHub full-release preparation checklist:

- [ ] Create a new conda environment and install the rc from PyPI (`pip install <package-name>==??`)
- [ ] License information on PyPI is correct.
- [ ] Docs are deployed successfully to `https://<github-username-or-orgname>/<package-name>`.
- [ ] Successfully run all tests, tutorial examples or do functional testing.

Please let the maintainer know that all checks are done and the package is ready for full release.

### conda-forge release preparation checklist:

<!-- After the maintainer releases the PyPI package, please check the following when creating a PR for conda-forge release.-->

- [ ] Ensure that the full release has appeared on PyPI successfully.
- [ ] New package dependencies listed in `conda.txt` and `tests.txt` are added to `meta.yaml` in the feedstock.
- [ ] Close any open issues on the feedstock. Reach out to the maintainer if you have questions.
- [ ] Tag the maintainer for conda-forge release.

### Post-release checklist

<!-- Before closing this issue, please complete the following: -->

- [ ] Run tutorial examples and conduct functional testing using the installation guide in the README. Attach screenshots/results as comments.
- [ ] Documentation (README, tutorials, API references, and websites) is deployed without broken links or missing figures.
15 changes: 15 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
### What problem does this PR address?

<!-- Provide a brief overview and link to the issue. Attach outputs, including screenshots (before/after), if helpful for the reviewer. -->

### What should the reviewer(s) do?

<!-- Merge the code, provide feedback, initiate a discussion, etc. -->

<!--
Use the following checklist items when applicable (select only what applies):
- [ ] This PR introduces a public-facing change (e.g., figures, CLI input/output, API).
- [ ] Documentation (e.g., tutorials, examples, README) has been updated.
- [ ] A tracking issue or plan to update documentation exists.
- [ ] This PR affects internal functionality only (no user-facing change).
-->
18 changes: 18 additions & 0 deletions .github/workflows/build-wheel-release-upload.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Release (GitHub/PyPI) and Deploy Docs

on:
workflow_dispatch:
push:
tags:
- "*" # Trigger on all tags initially, but tag and release privilege are verified in _build-wheel-release-upload.yml

jobs:
build-release:
uses: scikit-package/release-scripts/.github/workflows/_build-wheel-release-upload.yml@v0
with:
project: diffpy.srxplanar
c_extension: false
maintainer_GITHUB_username: sbillinge
secrets:
PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
PAT_TOKEN: ${{ secrets.PAT_TOKEN }}
12 changes: 12 additions & 0 deletions .github/workflows/check-news-item.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: Check for News

on:
pull_request_target:
branches:
- main

jobs:
check-news-item:
uses: scikit-package/release-scripts/.github/workflows/_check-news-item.yml@v0
with:
project: diffpy.srxplanar
21 changes: 21 additions & 0 deletions .github/workflows/matrix-and-codecov-on-merge-to-main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: CI

on:
push:
branches:
- main
release:
types:
- prereleased
- published
workflow_dispatch:

jobs:
matrix-coverage:
uses: scikit-package/release-scripts/.github/workflows/_matrix-and-codecov-on-merge-to-main.yml@v0
with:
project: diffpy.srxplanar
c_extension: false
headless: false
secrets:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
12 changes: 12 additions & 0 deletions .github/workflows/publish-docs-on-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: Deploy Documentation on Release

on:
workflow_dispatch:

jobs:
docs:
uses: scikit-package/release-scripts/.github/workflows/_publish-docs-on-release.yml@v0
with:
project: diffpy.srxplanar
c_extension: false
headless: false
16 changes: 16 additions & 0 deletions .github/workflows/tests-on-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Tests on PR

on:
pull_request:
workflow_dispatch:

jobs:
tests-on-pr:
uses: scikit-package/release-scripts/.github/workflows/_tests-on-pr.yml@v0
with:
project: diffpy.srxplanar
c_extension: false
headless: false
python_version: "3.13"
secrets:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
5 changes: 5 additions & 0 deletions .isort.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[settings]
# Keep import statement below line_length character limit
line_length = 79
multi_line_output = 3
include_trailing_comma = True
66 changes: 66 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
default_language_version:
python: python3
ci:
autofix_commit_msg: |
[pre-commit.ci] auto fixes from pre-commit hooks
autofix_prs: true
autoupdate_branch: "pre-commit-autoupdate"
autoupdate_commit_msg: "[pre-commit.ci] pre-commit autoupdate"
autoupdate_schedule: monthly
skip: [no-commit-to-branch]
submodules: false
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
hooks:
- id: check-yaml
- id: end-of-file-fixer
- id: trailing-whitespace
- id: check-case-conflict
- id: check-merge-conflict
- id: check-toml
- id: check-added-large-files
- repo: https://github.com/psf/black
rev: 24.4.2
hooks:
- id: black
- repo: https://github.com/pycqa/flake8
rev: 7.0.0
hooks:
- id: flake8
- repo: https://github.com/pycqa/isort
rev: 5.13.2
hooks:
- id: isort
args: ["--profile", "black"]
- repo: https://github.com/kynan/nbstripout
rev: 0.7.1
hooks:
- id: nbstripout
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
hooks:
- id: no-commit-to-branch
name: Prevent Commit to Main Branch
args: ["--branch", "main"]
stages: [pre-commit]
- repo: https://github.com/codespell-project/codespell
rev: v2.3.0
hooks:
- id: codespell
additional_dependencies:
- tomli
# prettier - multi formatter for .json, .yml, and .md files
- repo: https://github.com/pre-commit/mirrors-prettier
rev: f12edd9c7be1c20cfa42420fd0e6df71e42b51ea # frozen: v4.0.0-alpha.8
hooks:
- id: prettier
additional_dependencies:
- "prettier@^3.2.4"
# docformatter - PEP 257 compliant docstring formatter
- repo: https://github.com/s-weigand/docformatter
rev: 5757c5190d95e5449f102ace83df92e7d3b06c6c
hooks:
- id: docformatter
additional_dependencies: [tomli]
args: [--in-place, --config, ./pyproject.toml]
13 changes: 13 additions & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
version: 2

build:
os: "ubuntu-22.04"
tools:
python: "latest"

python:
install:
- requirements: requirements/docs.txt

sphinx:
configuration: docs/source/conf.py
10 changes: 10 additions & 0 deletions AUTHORS.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Authors
=======

Xiaohao Yang and Billinge Group members

Contributors
------------

For a list of contributors, visit
https://github.com/diffpy/diffpy.srxplanar/graphs/contributors
1 change: 0 additions & 1 deletion AUTHORS.txt

This file was deleted.

5 changes: 5 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
=============
Release notes
=============

.. current developments
Loading