Skip to content

Commit 9dcadf9

Browse files
authored
Improve Freud integration (#30)
* WIP on doctests * Add sphinx-copybutton and notfound * messy wip on sybil * Further wip * Remove .doctrees * Remove CIFTEST * Swap to pytest-doctestplus * Remove unused files * Clean up settings * Fix read_cell_params interaction with cast_values * Clean up conf.py * Update filepath for docstrings * Clean up pyproject.toml * Fix formatting for doctests * Finalize indentation for quickstart.rst * Update requirements.in files * Update doc/requirements.txt * Update requirements files * Fix return None example * Lint * Fix pytest-doctestplus version * Update `cell` to return box-like * Clarify docs for CifFile.cell * Final cleanup of freud tests * Install freud on ubuntu-latest tests * Add missing doctest: +SKIP * Use pytest importorskip * Remove freud from ci * Fix doctest-requires block * Standardize spelling of angstrom * Rename cell to box
1 parent a01ea2e commit 9dcadf9

20 files changed

+312
-123
lines changed

.github/requirements-3.10.txt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ kiwisolver==1.4.8
1818
# via matplotlib
1919
matplotlib==3.10.0
2020
# via ase
21-
more-itertools==10.5.0
21+
more-itertools==10.6.0
2222
# via parsnip (pyproject.toml)
2323
numpy==2.2.1
2424
# via
@@ -32,7 +32,8 @@ packaging==24.2
3232
# via
3333
# matplotlib
3434
# pytest
35-
pillow==11.0.0
35+
# pytest-doctestplus
36+
pillow==11.1.0
3637
# via matplotlib
3738
pluggy==1.5.0
3839
# via pytest
@@ -43,10 +44,14 @@ pycifrw==4.4.6
4344
pyparsing==3.2.1
4445
# via matplotlib
4546
pytest==8.3.4
47+
# via
48+
# -r tests/requirements.in
49+
# pytest-doctestplus
50+
pytest-doctestplus==1.3.0
4651
# via -r tests/requirements.in
4752
python-dateutil==2.9.0.post0
4853
# via matplotlib
49-
scipy==1.14.1
54+
scipy==1.15.1
5055
# via ase
5156
six==1.17.0
5257
# via python-dateutil

.github/requirements-3.11.txt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ kiwisolver==1.4.8
1616
# via matplotlib
1717
matplotlib==3.10.0
1818
# via ase
19-
more-itertools==10.5.0
19+
more-itertools==10.6.0
2020
# via parsnip (pyproject.toml)
2121
numpy==2.2.1
2222
# via
@@ -30,7 +30,8 @@ packaging==24.2
3030
# via
3131
# matplotlib
3232
# pytest
33-
pillow==11.0.0
33+
# pytest-doctestplus
34+
pillow==11.1.0
3435
# via matplotlib
3536
pluggy==1.5.0
3637
# via pytest
@@ -41,10 +42,14 @@ pycifrw==4.4.6
4142
pyparsing==3.2.1
4243
# via matplotlib
4344
pytest==8.3.4
45+
# via
46+
# -r tests/requirements.in
47+
# pytest-doctestplus
48+
pytest-doctestplus==1.3.0
4449
# via -r tests/requirements.in
4550
python-dateutil==2.9.0.post0
4651
# via matplotlib
47-
scipy==1.14.1
52+
scipy==1.15.1
4853
# via ase
4954
six==1.17.0
5055
# via python-dateutil

.github/requirements-3.12.txt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ kiwisolver==1.4.8
1616
# via matplotlib
1717
matplotlib==3.10.0
1818
# via ase
19-
more-itertools==10.5.0
19+
more-itertools==10.6.0
2020
# via parsnip (pyproject.toml)
2121
numpy==2.2.1
2222
# via
@@ -30,7 +30,8 @@ packaging==24.2
3030
# via
3131
# matplotlib
3232
# pytest
33-
pillow==11.0.0
33+
# pytest-doctestplus
34+
pillow==11.1.0
3435
# via matplotlib
3536
pluggy==1.5.0
3637
# via pytest
@@ -41,10 +42,14 @@ pycifrw==4.4.6
4142
pyparsing==3.2.1
4243
# via matplotlib
4344
pytest==8.3.4
45+
# via
46+
# -r tests/requirements.in
47+
# pytest-doctestplus
48+
pytest-doctestplus==1.3.0
4449
# via -r tests/requirements.in
4550
python-dateutil==2.9.0.post0
4651
# via matplotlib
47-
scipy==1.14.1
52+
scipy==1.15.1
4853
# via ase
4954
six==1.17.0
5055
# via python-dateutil

.github/requirements-3.13.txt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ kiwisolver==1.4.8
1616
# via matplotlib
1717
matplotlib==3.10.0
1818
# via ase
19-
more-itertools==10.5.0
19+
more-itertools==10.6.0
2020
# via parsnip (pyproject.toml)
2121
numpy==2.2.1
2222
# via
@@ -30,7 +30,8 @@ packaging==24.2
3030
# via
3131
# matplotlib
3232
# pytest
33-
pillow==11.0.0
33+
# pytest-doctestplus
34+
pillow==11.1.0
3435
# via matplotlib
3536
pluggy==1.5.0
3637
# via pytest
@@ -41,10 +42,14 @@ pycifrw==4.4.6
4142
pyparsing==3.2.1
4243
# via matplotlib
4344
pytest==8.3.4
45+
# via
46+
# -r tests/requirements.in
47+
# pytest-doctestplus
48+
pytest-doctestplus==1.3.0
4449
# via -r tests/requirements.in
4550
python-dateutil==2.9.0.post0
4651
# via matplotlib
47-
scipy==1.14.1
52+
scipy==1.15.1
4853
# via ase
4954
six==1.17.0
5055
# via python-dateutil

.github/requirements-3.7.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,11 @@ pycifrw==4.4.6
4444
pyparsing==3.1.4
4545
# via matplotlib
4646
pytest==7.4.4
47+
# via matplotlib
48+
pytest-doctestplus==1.0.0
4749
# via -r tests/requirements.in
4850
python-dateutil==2.9.0.post0
49-
# via matplotlib
51+
# via -r tests/requirements.in
5052
scipy==1.7.3
5153
# via ase
5254
six==1.17.0

.github/requirements-3.8.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ packaging==24.2
3434
# via
3535
# matplotlib
3636
# pytest
37+
# pytest-doctestplus
3738
pillow==10.4.0
3839
# via matplotlib
3940
pluggy==1.5.0
@@ -45,6 +46,10 @@ pycifrw==4.4.6
4546
pyparsing==3.1.4
4647
# via matplotlib
4748
pytest==8.3.4
49+
# via
50+
# -r tests/requirements.in
51+
# pytest-doctestplus
52+
pytest-doctestplus==1.3.0
4853
# via -r tests/requirements.in
4954
python-dateutil==2.9.0.post0
5055
# via matplotlib

.github/requirements-3.9.txt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ fonttools==4.55.3
1212
# via matplotlib
1313
gemmi==0.7.0
1414
# via -r tests/requirements.in
15-
importlib-resources==6.4.5
15+
importlib-resources==6.5.2
1616
# via matplotlib
1717
iniconfig==2.0.0
1818
# via pytest
1919
kiwisolver==1.4.7
2020
# via matplotlib
2121
matplotlib==3.9.4
2222
# via ase
23-
more-itertools==10.5.0
23+
more-itertools==10.6.0
2424
# via parsnip (pyproject.toml)
2525
numpy==2.0.2
2626
# via
@@ -34,7 +34,8 @@ packaging==24.2
3434
# via
3535
# matplotlib
3636
# pytest
37-
pillow==11.0.0
37+
# pytest-doctestplus
38+
pillow==11.1.0
3839
# via matplotlib
3940
pluggy==1.5.0
4041
# via pytest
@@ -45,6 +46,10 @@ pycifrw==4.4.6
4546
pyparsing==3.2.1
4647
# via matplotlib
4748
pytest==8.3.4
49+
# via
50+
# -r tests/requirements.in
51+
# pytest-doctestplus
52+
pytest-doctestplus==1.3.0
4853
# via -r tests/requirements.in
4954
python-dateutil==2.9.0.post0
5055
# via matplotlib

ChangeLog.rst

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,31 @@ Changelog
44
The format is based on `Keep a Changelog <http://keepachangelog.com/en/1.1.0/>`__.
55
This project adheres to `Semantic Versioning <http://semver.org/spec/v2.0.0.html>`__.
66

7-
v0.x.x - 20xx-xx-xx
7+
v1.0.0 - 20xx-xx-xx
8+
-------------------
89

910
Added
1011
~~~~~
12+
- Support for nonsimple (';'-delimited) data entries.
13+
- Improved support for entries containing special characters.
14+
- Ability to query multiple keys or columns simultaneously.
15+
- Additional tests for AMCSD and zeolite databases.
16+
- Additional documentation and examples for the new interface
17+
18+
Changed
19+
~~~~~~~
20+
- Primary interface is now the ``CifFile`` object, which supports all previously implemented features in addition to several new methods.
21+
- Files are now parsed lazily, and are traversed a single time.
22+
23+
Dependencies
24+
~~~~~~~~~~~~
25+
- Added ``more-itertools`` as a dependency for ``peekable`` iterators
26+
27+
28+
v0.1.0 - 2024-12-20
29+
-------------------
30+
31+
Added
32+
~~~~~
33+
- Unitcells module
34+
- Function-based parsing interface for key and table reading

doc/requirements.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@ autodocsumm
22
furo
33
numpy>=1.26.4
44
sphinx>=7.3.7
5+
sphinx-copybutton
6+
sphinx-notfound-page
7+
pytest-doctestplus

doc/requirements.txt

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ beautifulsoup4==4.12.3
1010
# via furo
1111
certifi==2024.12.14
1212
# via requests
13-
charset-normalizer==3.4.0
13+
charset-normalizer==3.4.1
1414
# via requests
1515
docutils==0.21.2
1616
# via sphinx
@@ -20,20 +20,33 @@ idna==3.10
2020
# via requests
2121
imagesize==1.4.1
2222
# via sphinx
23-
jinja2==3.1.4
23+
iniconfig==2.0.0
24+
# via pytest
25+
jinja2==3.1.5
2426
# via sphinx
2527
markupsafe==3.0.2
2628
# via jinja2
27-
numpy==2.2.0
29+
more-itertools==10.6.0
30+
# via parsnip (pyproject.toml)
31+
numpy==2.2.1
2832
# via
2933
# -r doc/requirements.in
3034
# parsnip (pyproject.toml)
3135
packaging==24.2
32-
# via sphinx
33-
pygments==2.18.0
36+
# via
37+
# pytest
38+
# pytest-doctestplus
39+
# sphinx
40+
pluggy==1.5.0
41+
# via pytest
42+
pygments==2.19.1
3443
# via
3544
# furo
3645
# sphinx
46+
pytest==8.3.4
47+
# via pytest-doctestplus
48+
pytest-doctestplus==1.3.0
49+
# via -r doc/requirements.in
3750
requests==2.32.3
3851
# via sphinx
3952
snowballstemmer==2.2.0
@@ -46,8 +59,14 @@ sphinx==8.1.3
4659
# autodocsumm
4760
# furo
4861
# sphinx-basic-ng
62+
# sphinx-copybutton
63+
# sphinx-notfound-page
4964
sphinx-basic-ng==1.0.0b2
5065
# via furo
66+
sphinx-copybutton==0.5.2
67+
# via -r doc/requirements.in
68+
sphinx-notfound-page==1.0.4
69+
# via -r doc/requirements.in
5170
sphinxcontrib-applehelp==2.0.0
5271
# via sphinx
5372
sphinxcontrib-devhelp==2.0.0
@@ -60,5 +79,5 @@ sphinxcontrib-qthelp==2.0.0
6079
# via sphinx
6180
sphinxcontrib-serializinghtml==2.0.0
6281
# via sphinx
63-
urllib3==2.2.3
82+
urllib3==2.3.0
6483
# via requests

0 commit comments

Comments
 (0)