Skip to content

Commit 002f62e

Browse files
authored
Merge pull request #22 from ycexiao/fix-workflow
fix: set correct inputs in the workflow and update pre-commit
2 parents 135e5ce + 7294cb6 commit 002f62e

7 files changed

Lines changed: 42 additions & 29 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
with:
1313
project: diffpy.apps
1414
c_extension: false
15-
maintainer_GITHUB_username: ycexiao, sbillinge
15+
maintainer_GITHUB_username: sbillinge
1616
secrets:
1717
PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
1818
PAT_TOKEN: ${{ secrets.PAT_TOKEN }}

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

Lines changed: 0 additions & 12 deletions
This file was deleted.

.pre-commit-config.yaml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ci:
1111
submodules: false
1212
repos:
1313
- repo: https://github.com/pre-commit/pre-commit-hooks
14-
rev: v4.6.0
14+
rev: v6.0.0
1515
hooks:
1616
- id: check-yaml
1717
- id: end-of-file-fixer
@@ -21,46 +21,46 @@ repos:
2121
- id: check-toml
2222
- id: check-added-large-files
2323
- repo: https://github.com/psf/black
24-
rev: 24.4.2
24+
rev: 26.3.1
2525
hooks:
2626
- id: black
2727
- repo: https://github.com/pycqa/flake8
28-
rev: 7.0.0
28+
rev: 7.3.0
2929
hooks:
3030
- id: flake8
3131
- repo: https://github.com/pycqa/isort
32-
rev: 5.13.2
32+
rev: 8.0.1
3333
hooks:
3434
- id: isort
3535
args: ["--profile", "black"]
3636
- repo: https://github.com/kynan/nbstripout
37-
rev: 0.7.1
37+
rev: 0.9.1
3838
hooks:
3939
- id: nbstripout
4040
- repo: https://github.com/pre-commit/pre-commit-hooks
41-
rev: v4.4.0
41+
rev: v6.0.0
4242
hooks:
4343
- id: no-commit-to-branch
4444
name: Prevent Commit to Main Branch
4545
args: ["--branch", "main"]
4646
stages: [pre-commit]
4747
- repo: https://github.com/codespell-project/codespell
48-
rev: v2.3.0
48+
rev: v2.4.2
4949
hooks:
5050
- id: codespell
5151
additional_dependencies:
5252
- tomli
5353
# prettier - multi formatter for .json, .yml, and .md files
5454
- repo: https://github.com/pre-commit/mirrors-prettier
55-
rev: f12edd9c7be1c20cfa42420fd0e6df71e42b51ea # frozen: v4.0.0-alpha.8
55+
rev: v4.0.0-alpha.8
5656
hooks:
5757
- id: prettier
5858
additional_dependencies:
5959
- "prettier@^3.2.4"
60-
# docformatter - PEP 257 compliant docstring formatter
61-
- repo: https://github.com/s-weigand/docformatter
62-
rev: 5757c5190d95e5449f102ace83df92e7d3b06c6c
60+
types: [yaml, markdown, json]
61+
# ruff - An extremely fast Python linter and code formatter, written in Rust.
62+
- repo: https://github.com/astral-sh/ruff-pre-commit
63+
rev: v0.15.12
6364
hooks:
64-
- id: docformatter
65-
additional_dependencies: [tomli]
66-
args: [--in-place, --config, ./pyproject.toml]
65+
- id: ruff-check
66+
args: [--fix, --config=pyproject.toml]

news/fix-workflow.rst

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
**Added:**
2+
3+
* No news added: Fix workflow inputs.
4+
5+
**Changed:**
6+
7+
* <news item>
8+
9+
**Deprecated:**
10+
11+
* <news item>
12+
13+
**Removed:**
14+
15+
* <news item>
16+
17+
**Fixed:**
18+
19+
* <news item>
20+
21+
**Security:**
22+
23+
* <news item>

news/tmp.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
**Added:**
22

3-
* No news added:
3+
* No news added:
44

55
**Changed:**
66

src/diffpy/apps/pdfadapter.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
from pathlib import Path
44

55
import numpy
6+
from scipy.optimize import least_squares
7+
68
from diffpy.srfit.fitbase import (
79
FitContribution,
810
FitRecipe,
@@ -12,7 +14,6 @@
1214
from diffpy.srfit.pdf import PDFGenerator, PDFParser
1315
from diffpy.srfit.structure import constrainAsSpaceGroup
1416
from diffpy.structure.parsers import getParser
15-
from scipy.optimize import least_squares
1617

1718

1819
class PDFAdapter:

tests/helper.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import numpy as np
2+
23
from diffpy.srfit.fitbase import FitContribution, FitRecipe, Profile
34
from diffpy.srfit.pdf import PDFGenerator, PDFParser
45
from diffpy.srfit.structure import constrainAsSpaceGroup

0 commit comments

Comments
 (0)