Skip to content

Commit 9936c03

Browse files
committed
Remove nbstripout from pre-commit config
Remove codespell check for ipynb, use nbqa supported codespell instead. Generate examples outputs Add examples data files Add attributes to iucr files in README.rst Modify powderpattern plot functions, now back to original behavior
1 parent 254e469 commit 9936c03

14 files changed

+11311
-164
lines changed

.pre-commit-config.yaml

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,11 @@ repos:
3333
hooks:
3434
- id: isort
3535
args: ["--profile", "black"]
36-
- repo: https://github.com/kynan/nbstripout
37-
rev: 0.7.1
38-
hooks:
39-
- id: nbstripout
36+
# disable nbstripout to preserve examples ipynb outputs
37+
# - repo: https://github.com/kynan/nbstripout
38+
# rev: 0.7.1
39+
# hooks:
40+
# - id: nbstripout
4041
- repo: https://github.com/pre-commit/pre-commit-hooks
4142
rev: v4.4.0
4243
hooks:
@@ -48,8 +49,32 @@ repos:
4849
rev: v2.3.0
4950
hooks:
5051
- id: codespell
52+
exclude: '.*\.ipynb$'
5153
additional_dependencies:
5254
- tomli
55+
# nbQA for ipynb dedicated codespell
56+
- repo: https://github.com/nbQA-dev/nbQA
57+
rev: 1.9.1
58+
hooks:
59+
- id: nbqa
60+
entry: nbqa codespell
61+
name: nbqa-codespell-code
62+
alias: nbqa-codespell-code
63+
types: [jupyter]
64+
additional_dependencies:
65+
- codespell==2.3.0
66+
args:
67+
- "--nbqa-shell"
68+
- id: nbqa
69+
entry: nbqa codespell
70+
name: nbqa-codespell-md
71+
alias: nbqa-codespell-md
72+
types: [jupyter]
73+
additional_dependencies:
74+
- codespell==2.3.0
75+
args:
76+
- "--nbqa-shell"
77+
- "--nbqa-md"
5378
# prettier - multi formatter for .json, .yml, and .md files
5479
- repo: https://github.com/pre-commit/mirrors-prettier
5580
rev: f12edd9c7be1c20cfa42420fd0e6df71e42b51ea # frozen: v4.0.0-alpha.8

README.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,4 +153,13 @@ For more information on pyobjcryst please visit the project `web-page <https://d
153153
Acknowledgements
154154
----------------
155155

156+
This package bundles the following IUCr data files for bona fide research use:
157+
158+
- **cpd-1a.prn:** Powder diffraction dataset from the `IUCr CPD Round Robin on Quantitative Phase Analysis <https://www.iucr.org/__data/iucr/powder/QARR/index.html>`_.
159+
160+
Source: https://www.iucr.org/__data/iucr/powder/QARR/col/cpd-1a.prn
161+
162+
Round Robin on Quantitative Phase Analysis: Madsen, I. (1997) ‘Round Robin on Quantitative Phase Analysis’, Powder Diffraction, 12(1), pp. 1–2. Available at: https://doi.org/10.1017/S0885715600020212.
163+
164+
156165
``pyobjcryst`` is built and maintained with `scikit-package <https://scikit-package.github.io/scikit-package/>`_.

examples/QPA-Quantitative phase analysis.ipynb

Lines changed: 140 additions & 29 deletions
Large diffs are not rendered by default.

examples/crystal_3d_widget.ipynb

Lines changed: 275 additions & 15 deletions
Large diffs are not rendered by default.

examples/data/cime.dat

Lines changed: 771 additions & 0 deletions
Large diffs are not rendered by default.

examples/data/cime.fhz

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
KEYWORDS GO HERE
2+
17
3+
C 1
4+
N 1 1.465
5+
C 2 1.366 1 119.987
6+
N 3 1.321 2 120.030 1 6.0
7+
C 4 1.355 3 119.982 2 6.8
8+
N 5 1.136 4 180.000 3 46.3
9+
N 3 1.366 2 120.022 1 186.0
10+
C 7 1.466 3 119.988 2 354.9
11+
C 8 1.529 7 109.482 3 185.0
12+
S 9 1.814 8 109.456 7 180.0
13+
C 10 1.815 9 99.984 8 180.0
14+
C 11 1.507 10 109.466 9 180.0
15+
N 12 1.341 11 126.014 10 90.0
16+
C 13 1.305 12 109.239 11 180.0
17+
N 14 1.349 13 108.723 12 360.0
18+
C 15 1.344 14 107.593 13 359.1
19+
C 16 1.515 15 127.952 14 179.1

0 commit comments

Comments
 (0)