conflicts to be reverted

Author: Tieqiong

Diff for: .github/ISSUE_TEMPLATE/release_checklist.md

@@ -12,11 +12,11 @@ assignees: ""
 - [ ] 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.
+      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 (e.g., diffpy.org) 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.
+- [ ] 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 mention @sbillinge here when you are ready for PyPI/GitHub release. Include any additional comments necessary, such as version information and details about the pre-release here:
 
@@ -42,5 +42,5 @@ Please let @sbillinge know that all checks are done and the package is ready for
 
 <!-- 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.
+- [ ] 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.

Diff for: .github/workflows/build-wheel-release-upload.yml

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

Diff for: .github/workflows/check-news-item.yml

@@ -3,7 +3,7 @@ name: Check for News
 on:
   pull_request_target:
     branches:
-    - main
+      - main
 
 jobs:
   check-news-item:

Diff for: .github/workflows/matrix-and-codecov-on-merge-to-main.yml

@@ -23,7 +23,7 @@ jobs:
         os: [ubuntu-latest, windows-latest, macos-13, macos-14]
         python-version: ["3.11", "3.12"]
     env:
-          LATEST_PYTHON_VERSION: "3.12"
+      LATEST_PYTHON_VERSION: "3.12"
     steps:
       - name: Check out diffpy.pdfgui
         uses: actions/checkout@v4