Skip to content

Commit fbcbe79

Browse files
skpkg: apply black to all files in the project directory
1 parent d61ee4e commit fbcbe79

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+549
-7368
lines changed

.flake8

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ exclude =
66
__pycache__,
77
build,
88
dist,
9-
doc/source/conf.py
9+
docs/source/conf.py
1010
max-line-length = 79
1111
# Ignore some style 'errors' produced while formatting by 'black'
1212
# https://black.readthedocs.io/en/stable/guides/using_black_with_other_tools.html#labels-why-pycodestyle-warnings

.github/ISSUE_TEMPLATE/release_checklist.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,30 @@ assignees: ""
1313
- [ ] License information is verified as correct. If you are unsure, please comment below.
1414
- [ ] Locally rendered documentation contains all appropriate pages, including API references (check no modules are
1515
missing), tutorials, and other human-written text is up-to-date with any changes in the code.
16-
- [ ] Installation instructions in the README, documentation, and the website (e.g., diffpy.org) are updated.
16+
- [ ] Installation instructions in the README, documentation, and the website are updated.
1717
- [ ] Successfully run any tutorial examples or do functional testing with the latest Python version.
1818
- [ ] Grammar and writing quality are checked (no typos).
1919
- [ ] 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.
2020

21-
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:
21+
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:
2222

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

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

30-
Please let @sbillinge know that all checks are done and the package is ready for full release.
30+
Please let the maintainer know that all checks are done and the package is ready for full release.
3131

3232
### conda-forge release preparation checklist:
3333

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

3636
- [ ] Ensure that the full release has appeared on PyPI successfully.
3737
- [ ] New package dependencies listed in `conda.txt` and `test.txt` are added to `meta.yaml` in the feedstock.
38-
- [ ] Close any open issues on the feedstock. Reach out to @bobleesj if you have questions.
39-
- [ ] Tag @sbillinge and @bobleesj for conda-forge release.
38+
- [ ] Close any open issues on the feedstock. Reach out to the maintainer if you have questions.
39+
- [ ] Tag the maintainer for conda-forge release.
4040

4141
### Post-release checklist
4242

.github/workflows/build-wheel-release-upload.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ on:
88

99
jobs:
1010
release:
11-
uses: Billingegroup/release-scripts/.github/workflows/_build-wheel-release-upload.yml@v0
11+
uses: scikit-package/release-scripts/.github/workflows/_build-wheel-release-upload.yml@v0
1212
with:
13-
project: diffpy.labpdfproc
13+
project: diffpy.my-labpdfproc
1414
c_extension: false
15-
github_admin_username: sbillinge
15+
maintainer_GITHUB_username: sbillinge
1616
secrets:
1717
PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
1818
PAT_TOKEN: ${{ secrets.PAT_TOKEN }}

.github/workflows/check-news-item.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ on:
77

88
jobs:
99
check-news-item:
10-
uses: Billingegroup/release-scripts/.github/workflows/_check-news-item.yml@v0
10+
uses: scikit-package/release-scripts/.github/workflows/_check-news-item.yml@v0
1111
with:
12-
project: diffpy.labpdfproc
12+
project: diffpy.my-labpdfproc

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

Lines changed: 7 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -12,51 +12,10 @@ on:
1212

1313
jobs:
1414
matrix-coverage:
15-
defaults:
16-
run:
17-
shell: bash -l {0}
18-
19-
runs-on: ${{ matrix.os }}
20-
strategy:
21-
fail-fast: false
22-
matrix:
23-
os: [ubuntu-latest, windows-latest, macos-13, macos-14]
24-
python-version: ["3.11", "3.12", "3.13"]
25-
env:
26-
LATEST_PYTHON_VERSION: "3.13"
27-
steps:
28-
- name: Check out diffpy.labpdfproc
29-
uses: actions/checkout@v4
30-
31-
- name: Initialize miniconda
32-
uses: conda-incubator/setup-miniconda@v3
33-
with:
34-
activate-environment: test
35-
auto-update-conda: true
36-
environment-file: environment.yml
37-
auto-activate-base: false
38-
python-version: ${{ matrix.python-version }}
39-
40-
- name: Conda config
41-
run: >-
42-
conda config --set always_yes yes
43-
--set changeps1 no
44-
45-
- name: Install diffpy.labpdfproc and requirements
46-
run: |
47-
conda install --file requirements/tests.txt
48-
conda install --file requirements/conda.txt
49-
pip install gooey
50-
python -m pip install . --no-deps
51-
52-
- name: Validate diffpy.labpdfproc
53-
run: |
54-
pytest --cov
55-
coverage report -m
56-
codecov
57-
58-
- name: Upload coverage to Codecov
59-
if: matrix.os == 'ubuntu-latest' && matrix.python-version == env.LATEST_PYTHON_VERSION
60-
uses: codecov/codecov-action@v4
61-
env:
62-
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
15+
uses: scikit-package/release-scripts/.github/workflows/_matrix-and-codecov-on-merge-to-main.yml@v0
16+
with:
17+
project: diffpy.my-labpdfproc
18+
c_extension: false
19+
headless: false
20+
secrets:
21+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/publish-docs-on-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ on:
55

66
jobs:
77
docs:
8-
uses: Billingegroup/release-scripts/.github/workflows/_publish-docs-on-release.yml@v0
8+
uses: scikit-package/release-scripts/.github/workflows/_publish-docs-on-release.yml@v0
99
with:
10-
project: diffpy.labpdfproc
10+
project: diffpy.my-labpdfproc
1111
c_extension: false
1212
headless: false

.github/workflows/tests-on-pr.yml

Lines changed: 8 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,15 @@
11
name: Tests on PR
22

33
on:
4-
push:
5-
branches:
6-
- main
74
pull_request:
85
workflow_dispatch:
96

107
jobs:
11-
validate:
12-
defaults:
13-
run:
14-
shell: bash -l {0}
15-
16-
runs-on: ubuntu-latest
17-
steps:
18-
- name: Check out diffpy.labpdfproc repository
19-
uses: actions/checkout@v4
20-
21-
- name: Initialize miniconda
22-
uses: conda-incubator/setup-miniconda@v3
23-
with:
24-
activate-environment: test
25-
auto-update-conda: true
26-
environment-file: environment.yml
27-
auto-activate-base: false
28-
python-version: 3.13
29-
30-
- name: Conda config
31-
run: >-
32-
conda config --set always_yes yes
33-
--set changeps1 no
34-
35-
- name: Install diffpy.labpdfproc and requirements
36-
run: |
37-
conda install --file requirements/tests.txt
38-
conda install --file requirements/conda.txt
39-
pip install gooey
40-
python -m pip install . --no-deps
41-
42-
- name: Validate diffpy.labpdfproc
43-
run: |
44-
pytest --cov
45-
coverage report -m
46-
codecov
47-
48-
- name: Upload coverage to Codecov
49-
uses: codecov/codecov-action@v4
50-
with:
51-
verbose: true
52-
fail_ci_if_error: true
53-
token: ${{ secrets.CODECOV_TOKEN }}
8+
tests-on-pr:
9+
uses: scikit-package/release-scripts/.github/workflows/_tests-on-pr.yml@v0
10+
with:
11+
project: diffpy.my-labpdfproc
12+
c_extension: false
13+
headless: false
14+
secrets:
15+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ __pycache__/
1010
.Python
1111
env/
1212
build/
13+
_build/
1314
develop-eggs/
1415
dist/
1516
downloads/

.readthedocs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ python:
1010
- requirements: requirements/docs.txt
1111

1212
sphinx:
13-
configuration: doc/source/conf.py
13+
configuration: docs/source/conf.py

AUTHORS.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
Authors
22
=======
33

4-
Billinge Group and community contributors.
4+
Sangjoon Lee, Simon Billinge, Billinge Group members
55

66
Contributors
77
------------
88

99
For a list of contributors, visit
10-
https://github.com/diffpy/diffpy.labpdfproc/graphs/contributors
10+
https://github.com/diffpy/diffpy.my-labpdfproc/graphs/contributors

0 commit comments

Comments
 (0)