Skip to content

skpkg: final step, merge branch cookie into main #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 68 commits into from
Jun 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
f353243
replace SCon with modern build tools, rewrite ...
Tieqiong Dec 28, 2024
6198d35
black autofix
Tieqiong Dec 28, 2024
8fac115
Merge pull request #36 from Tieqiong/setup
sbillinge Dec 28, 2024
d52d0a4
Merge pull request #37 from Tieqiong/black
sbillinge Dec 30, 2024
5df5dfb
add precommit and fix related checks
Tieqiong Jan 1, 2025
9219061
Merge pull request #38 from Tieqiong/precommit
sbillinge Jan 1, 2025
d14bb52
add PR test workflow and issue templates
Tieqiong Jan 1, 2025
c0fd7d6
pcmt
Tieqiong Jan 1, 2025
1bd4447
add cookie
Tieqiong Jan 2, 2025
4bf46d2
Merge pull request #39 from Tieqiong/workflow
sbillinge Jan 2, 2025
ea77121
move tests
Tieqiong Jan 11, 2025
abc8a9c
remove unnecessary files, add conftest
Tieqiong Jan 11, 2025
f01987a
easy tests
Tieqiong Jan 11, 2025
70e88e4
fix pytest
Tieqiong Jan 11, 2025
d0a96e8
help py3.11 find boost
Tieqiong Jan 11, 2025
8815174
add dependencies
Tieqiong Jan 11, 2025
95f2ef1
update CI
Tieqiong Jan 11, 2025
59f9471
[pre-commit.ci] auto fixes from pre-commit hooks
pre-commit-ci[bot] Jan 11, 2025
0ce4864
pcmt
Tieqiong Jan 11, 2025
81b3c03
git, codecov, cfgs, news dir, MANIFEST
Tieqiong Jan 11, 2025
4a8000a
AUTHORS, CHANGELOG, COC, LICENSEs, README
Tieqiong Jan 11, 2025
74ccfe1
gh workflows, conda-recipe, devutils
Tieqiong Jan 11, 2025
39eeb08
doc
Tieqiong Jan 11, 2025
b05530c
src
Tieqiong Jan 11, 2025
d2354a4
pyproject.toml
Tieqiong Jan 11, 2025
178507a
pcmt
Tieqiong Jan 11, 2025
5f34e62
Merge pull request #46 from Tieqiong/test
sbillinge Jan 11, 2025
cb402f9
Merge pull request #44 from Tieqiong/setup
sbillinge Jan 11, 2025
3ce7204
Merge pull request #45 from Tieqiong/deps
sbillinge Jan 11, 2025
fdceb92
Merge pull request #47 from Tieqiong/cookie
sbillinge Jan 11, 2025
50e6e81
srreal windows support
Tieqiong Feb 2, 2025
b83ee8f
[pre-commit.ci] auto fixes from pre-commit hooks
pre-commit-ci[bot] Feb 2, 2025
b075de8
Merge pull request #53 from Tieqiong/win
sbillinge Feb 2, 2025
d863058
skpkg: pc autofixes with updated config files
cadenmyers13 Jun 18, 2025
7a64d9d
chore: news
cadenmyers13 Jun 18, 2025
2ef09a4
chore: change to run on macos instead of ubuntu
cadenmyers13 Jun 18, 2025
a1420e4
Merge pull request #55 from cadenmyers13/pre-commit-auto
sbillinge Jun 20, 2025
2c7bf1f
find objcryst
Tieqiong Jun 20, 2025
99cd3d3
[pre-commit.ci] auto fixes from pre-commit hooks
pre-commit-ci[bot] Jun 20, 2025
12481e9
update conda requirements, correct objcryst flag
Tieqiong Jun 22, 2025
cabdcc7
force libdiffpy rc version
Tieqiong Jun 22, 2025
fa597f8
update tests
Tieqiong Jun 22, 2025
170f9c9
try removing extra insurance
Tieqiong Jun 22, 2025
a86ab58
make MSVC linker happy
Tieqiong Jun 22, 2025
2202fb8
Merge pull request #56 from Tieqiong/setup
sbillinge Jun 22, 2025
d3ecb25
skpkg: change black line length requirements to 79
cadenmyers13 Jun 23, 2025
703588b
skpkg: autofixes with linelength 79
cadenmyers13 Jun 23, 2025
d0f61e8
chore: news
cadenmyers13 Jun 23, 2025
412bbf5
skpkg: flake8 fixes in setup.py
cadenmyers13 Jun 23, 2025
e392485
skpkg: doc formatting autofixes
cadenmyers13 Jun 23, 2025
9b9f2a3
skpkg: add docformatting config to pyproject.toml
cadenmyers13 Jun 23, 2025
4f3d0df
Merge pull request #57 from cadenmyers13/pc-blackv2
sbillinge Jun 24, 2025
c1003ac
skpkg: gitignore, code of conduct updates, rm env.yml and prettierignore
cadenmyers13 Jun 24, 2025
6300597
skpkg: ignore_words.txt and pyproject.toml
cadenmyers13 Jun 24, 2025
462a18c
skpkg: github workflows dir
cadenmyers13 Jun 24, 2025
b24e60a
skpkg: change log header
cadenmyers13 Jun 24, 2025
b84b8d8
skpkg: readme
cadenmyers13 Jun 24, 2025
7410460
skpkg: user facing files and requirements
cadenmyers13 Jun 24, 2025
e2e5e0d
chore: news
cadenmyers13 Jun 24, 2025
830af7d
chore: add diffpy user group to readme
cadenmyers13 Jun 24, 2025
f2e0ddc
chore: more diffpy user group in readme
cadenmyers13 Jun 24, 2025
ad73cb4
chore: fix typo
cadenmyers13 Jun 24, 2025
ea1c888
chore: revert tests-on-pr.yml back to original
cadenmyers13 Jun 24, 2025
ac8a64d
chore: add blank lines
cadenmyers13 Jun 24, 2025
62b83e5
[pre-commit.ci] auto fixes from pre-commit hooks
pre-commit-ci[bot] Jun 24, 2025
1488319
ci: configure tests-on-pr.yml to run without environment.yml
cadenmyers13 Jun 25, 2025
e4a2700
skpkg: remove getting-started.rst
cadenmyers13 Jun 25, 2025
724018c
Merge pull request #58 from cadenmyers13/skpkg-migration
sbillinge Jun 26, 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
16 changes: 14 additions & 2 deletions .codecov.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,14 @@
fixes:
- ".*/site-packages/::src/"
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.
17 changes: 17 additions & 0 deletions .codespell/ignore_words.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
;; 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

;; structure file format
discus

;; variable name within pdfbaseline module
aline

;; variable name within TestSFAverageObjCryst class
fo
22 changes: 0 additions & 22 deletions .coveragerc

This file was deleted.

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,
doc/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
5 changes: 0 additions & 5 deletions .gitarchive.cfg

This file was deleted.

7 changes: 0 additions & 7 deletions .gitattributes

This file was deleted.

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 `test.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:
release:
uses: scikit-package/release-scripts/.github/workflows/_build-wheel-release-upload.yml@v0
with:
project: diffpy.srreal
c_extension: true
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.srreal
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.srreal
c_extension: true
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.srreal
c_extension: true
headless: false
52 changes: 52 additions & 0 deletions .github/workflows/tests-on-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: Tests on PR

on:
push:
branches:
- main
- cookie
pull_request:
workflow_dispatch:

jobs:
validate:
defaults:
run:
shell: bash -l {0}

runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-13, macos-14]
python-version: [3.11, 3.12, 3.13]

steps:
- name: Check out diffpy.srreal
uses: actions/checkout@v4

- name: Initialize miniconda
uses: conda-incubator/setup-miniconda@v3
with:
auto-update-conda: true
auto-activate-base: false
python-version: ${{ matrix.python-version }}
- name: Conda config
run: |
conda config --add channels conda-forge
- name: Install diffpy.srreal and requirements
run: |
conda create -n test python=${{ matrix.python-version }} -y
source $(conda info --base)/etc/profile.d/conda.sh
conda activate test
conda install pip -y
conda config --set always_yes yes --set changeps1 no
conda install --file requirements/conda.txt -y
conda install --file requirements/test.txt -y
python -m pip install . --no-deps

- name: Validate diffpy.pdfgui
run: |
source $(conda info --base)/etc/profile.d/conda.sh
conda activate test
pytest tests
Loading
Loading