Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
60f205f
WIP on doctests
janbridley Jan 15, 2025
474d8eb
Add sphinx-copybutton and notfound
janbridley Jan 15, 2025
1b8d934
messy wip on sybil
janbridley Jan 15, 2025
6ec1619
Further wip
janbridley Jan 15, 2025
f22e876
Remove .doctrees
janbridley Jan 15, 2025
90cd64a
Remove CIFTEST
janbridley Jan 15, 2025
8ed9575
Swap to pytest-doctestplus
janbridley Jan 15, 2025
6511b22
Remove unused files
janbridley Jan 15, 2025
186148b
Clean up settings
janbridley Jan 15, 2025
9cbd851
Fix read_cell_params interaction with cast_values
janbridley Jan 15, 2025
445f199
Clean up conf.py
janbridley Jan 15, 2025
a3c17f2
Update filepath for docstrings
janbridley Jan 15, 2025
3e18f34
Clean up pyproject.toml
janbridley Jan 15, 2025
1c89cfa
Fix formatting for doctests
janbridley Jan 15, 2025
2640240
Finalize indentation for quickstart.rst
janbridley Jan 15, 2025
9b8a429
Update requirements.in files
janbridley Jan 15, 2025
ae30d9c
Update doc/requirements.txt
janbridley Jan 15, 2025
a4ed0ae
Update requirements files
janbridley Jan 15, 2025
49efea4
Fix return None example
janbridley Jan 15, 2025
38fcb7b
Lint
janbridley Jan 15, 2025
eb9ec19
Fix pytest-doctestplus version
janbridley Jan 15, 2025
22ceb58
Update `cell` to return box-like
janbridley Jan 16, 2025
6837f40
Clarify docs for CifFile.cell
janbridley Jan 16, 2025
0dfb7d4
Final cleanup of freud tests
janbridley Jan 16, 2025
170c986
Install freud on ubuntu-latest tests
janbridley Jan 16, 2025
d2b5fc4
Add missing doctest: +SKIP
janbridley Jan 16, 2025
bfa08da
Use pytest importorskip
janbridley Jan 16, 2025
959f3df
Remove freud from ci
janbridley Jan 16, 2025
a049245
Fix doctest-requires block
janbridley Jan 16, 2025
7ae4ff4
Standardize spelling of angstrom
janbridley Jan 16, 2025
7331d04
Rename cell to box
janbridley Jan 16, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions .github/requirements-3.10.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ kiwisolver==1.4.8
# via matplotlib
matplotlib==3.10.0
# via ase
more-itertools==10.5.0
more-itertools==10.6.0
# via parsnip (pyproject.toml)
numpy==2.2.1
# via
Expand All @@ -32,7 +32,8 @@ packaging==24.2
# via
# matplotlib
# pytest
pillow==11.0.0
# pytest-doctestplus
pillow==11.1.0
# via matplotlib
pluggy==1.5.0
# via pytest
Expand All @@ -43,10 +44,14 @@ pycifrw==4.4.6
pyparsing==3.2.1
# via matplotlib
pytest==8.3.4
# via
# -r tests/requirements.in
# pytest-doctestplus
pytest-doctestplus==1.3.0
# via -r tests/requirements.in
python-dateutil==2.9.0.post0
# via matplotlib
scipy==1.14.1
scipy==1.15.1
# via ase
six==1.17.0
# via python-dateutil
Expand Down
11 changes: 8 additions & 3 deletions .github/requirements-3.11.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ kiwisolver==1.4.8
# via matplotlib
matplotlib==3.10.0
# via ase
more-itertools==10.5.0
more-itertools==10.6.0
# via parsnip (pyproject.toml)
numpy==2.2.1
# via
Expand All @@ -30,7 +30,8 @@ packaging==24.2
# via
# matplotlib
# pytest
pillow==11.0.0
# pytest-doctestplus
pillow==11.1.0
# via matplotlib
pluggy==1.5.0
# via pytest
Expand All @@ -41,10 +42,14 @@ pycifrw==4.4.6
pyparsing==3.2.1
# via matplotlib
pytest==8.3.4
# via
# -r tests/requirements.in
# pytest-doctestplus
pytest-doctestplus==1.3.0
# via -r tests/requirements.in
python-dateutil==2.9.0.post0
# via matplotlib
scipy==1.14.1
scipy==1.15.1
# via ase
six==1.17.0
# via python-dateutil
11 changes: 8 additions & 3 deletions .github/requirements-3.12.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ kiwisolver==1.4.8
# via matplotlib
matplotlib==3.10.0
# via ase
more-itertools==10.5.0
more-itertools==10.6.0
# via parsnip (pyproject.toml)
numpy==2.2.1
# via
Expand All @@ -30,7 +30,8 @@ packaging==24.2
# via
# matplotlib
# pytest
pillow==11.0.0
# pytest-doctestplus
pillow==11.1.0
# via matplotlib
pluggy==1.5.0
# via pytest
Expand All @@ -41,10 +42,14 @@ pycifrw==4.4.6
pyparsing==3.2.1
# via matplotlib
pytest==8.3.4
# via
# -r tests/requirements.in
# pytest-doctestplus
pytest-doctestplus==1.3.0
# via -r tests/requirements.in
python-dateutil==2.9.0.post0
# via matplotlib
scipy==1.14.1
scipy==1.15.1
# via ase
six==1.17.0
# via python-dateutil
11 changes: 8 additions & 3 deletions .github/requirements-3.13.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ kiwisolver==1.4.8
# via matplotlib
matplotlib==3.10.0
# via ase
more-itertools==10.5.0
more-itertools==10.6.0
# via parsnip (pyproject.toml)
numpy==2.2.1
# via
Expand All @@ -30,7 +30,8 @@ packaging==24.2
# via
# matplotlib
# pytest
pillow==11.0.0
# pytest-doctestplus
pillow==11.1.0
# via matplotlib
pluggy==1.5.0
# via pytest
Expand All @@ -41,10 +42,14 @@ pycifrw==4.4.6
pyparsing==3.2.1
# via matplotlib
pytest==8.3.4
# via
# -r tests/requirements.in
# pytest-doctestplus
pytest-doctestplus==1.3.0
# via -r tests/requirements.in
python-dateutil==2.9.0.post0
# via matplotlib
scipy==1.14.1
scipy==1.15.1
# via ase
six==1.17.0
# via python-dateutil
4 changes: 3 additions & 1 deletion .github/requirements-3.7.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,11 @@ pycifrw==4.4.6
pyparsing==3.1.4
# via matplotlib
pytest==7.4.4
# via matplotlib
pytest-doctestplus==1.0.0
# via -r tests/requirements.in
python-dateutil==2.9.0.post0
# via matplotlib
# via -r tests/requirements.in
scipy==1.7.3
# via ase
six==1.17.0
Expand Down
5 changes: 5 additions & 0 deletions .github/requirements-3.8.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ packaging==24.2
# via
# matplotlib
# pytest
# pytest-doctestplus
pillow==10.4.0
# via matplotlib
pluggy==1.5.0
Expand All @@ -45,6 +46,10 @@ pycifrw==4.4.6
pyparsing==3.1.4
# via matplotlib
pytest==8.3.4
# via
# -r tests/requirements.in
# pytest-doctestplus
pytest-doctestplus==1.3.0
# via -r tests/requirements.in
python-dateutil==2.9.0.post0
# via matplotlib
Expand Down
11 changes: 8 additions & 3 deletions .github/requirements-3.9.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ fonttools==4.55.3
# via matplotlib
gemmi==0.7.0
# via -r tests/requirements.in
importlib-resources==6.4.5
importlib-resources==6.5.2
# via matplotlib
iniconfig==2.0.0
# via pytest
kiwisolver==1.4.7
# via matplotlib
matplotlib==3.9.4
# via ase
more-itertools==10.5.0
more-itertools==10.6.0
# via parsnip (pyproject.toml)
numpy==2.0.2
# via
Expand All @@ -34,7 +34,8 @@ packaging==24.2
# via
# matplotlib
# pytest
pillow==11.0.0
# pytest-doctestplus
pillow==11.1.0
# via matplotlib
pluggy==1.5.0
# via pytest
Expand All @@ -45,6 +46,10 @@ pycifrw==4.4.6
pyparsing==3.2.1
# via matplotlib
pytest==8.3.4
# via
# -r tests/requirements.in
# pytest-doctestplus
pytest-doctestplus==1.3.0
# via -r tests/requirements.in
python-dateutil==2.9.0.post0
# via matplotlib
Expand Down
26 changes: 25 additions & 1 deletion ChangeLog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,31 @@ Changelog
The format is based on `Keep a Changelog <http://keepachangelog.com/en/1.1.0/>`__.
This project adheres to `Semantic Versioning <http://semver.org/spec/v2.0.0.html>`__.

v0.x.x - 20xx-xx-xx
v1.0.0 - 20xx-xx-xx
-------------------

Added
~~~~~
- Support for nonsimple (';'-delimited) data entries.
- Improved support for entries containing special characters.
- Ability to query multiple keys or columns simultaneously.
- Additional tests for AMCSD and zeolite databases.
- Additional documentation and examples for the new interface

Changed
~~~~~~~
- Primary interface is now the ``CifFile`` object, which supports all previously implemented features in addition to several new methods.
- Files are now parsed lazily, and are traversed a single time.

Dependencies
~~~~~~~~~~~~
- Added ``more-itertools`` as a dependency for ``peekable`` iterators


v0.1.0 - 2024-12-20
-------------------

Added
~~~~~
- Unitcells module
- Function-based parsing interface for key and table reading
3 changes: 3 additions & 0 deletions doc/requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@ autodocsumm
furo
numpy>=1.26.4
sphinx>=7.3.7
sphinx-copybutton
sphinx-notfound-page
pytest-doctestplus
31 changes: 25 additions & 6 deletions doc/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ beautifulsoup4==4.12.3
# via furo
certifi==2024.12.14
# via requests
charset-normalizer==3.4.0
charset-normalizer==3.4.1
# via requests
docutils==0.21.2
# via sphinx
Expand All @@ -20,20 +20,33 @@ idna==3.10
# via requests
imagesize==1.4.1
# via sphinx
jinja2==3.1.4
iniconfig==2.0.0
# via pytest
jinja2==3.1.5
# via sphinx
markupsafe==3.0.2
# via jinja2
numpy==2.2.0
more-itertools==10.6.0
# via parsnip (pyproject.toml)
numpy==2.2.1
# via
# -r doc/requirements.in
# parsnip (pyproject.toml)
packaging==24.2
# via sphinx
pygments==2.18.0
# via
# pytest
# pytest-doctestplus
# sphinx
pluggy==1.5.0
# via pytest
pygments==2.19.1
# via
# furo
# sphinx
pytest==8.3.4
# via pytest-doctestplus
pytest-doctestplus==1.3.0
# via -r doc/requirements.in
requests==2.32.3
# via sphinx
snowballstemmer==2.2.0
Expand All @@ -46,8 +59,14 @@ sphinx==8.1.3
# autodocsumm
# furo
# sphinx-basic-ng
# sphinx-copybutton
# sphinx-notfound-page
sphinx-basic-ng==1.0.0b2
# via furo
sphinx-copybutton==0.5.2
# via -r doc/requirements.in
sphinx-notfound-page==1.0.4
# via -r doc/requirements.in
sphinxcontrib-applehelp==2.0.0
# via sphinx
sphinxcontrib-devhelp==2.0.0
Expand All @@ -60,5 +79,5 @@ sphinxcontrib-qthelp==2.0.0
# via sphinx
sphinxcontrib-serializinghtml==2.0.0
# via sphinx
urllib3==2.2.3
urllib3==2.3.0
# via requests
9 changes: 8 additions & 1 deletion doc/source/conf.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
"""Configuration file for the Sphinx documentation builder."""

import datetime

CURRENT_YEAR = datetime.date.today().year
Expand All @@ -22,11 +21,19 @@
extensions = [
"sphinx.ext.autodoc",
"sphinx.ext.autosummary",
"sphinx.ext.doctest",
"sphinx.ext.intersphinx",
"sphinx.ext.napoleon",
"sphinx_copybutton",
"pytest_doctestplus.sphinx.doctestplus",
"autodocsumm",
"notfound.extension",
]

copybutton_prompt_text = ">>> "
copybutton_remove_prompts = True
copybutton_line_continuation_character = "\\"

templates_path = ["_templates"]
exclude_patterns = ["build", "Thumbs.db", ".DS_Store"]
intersphinx_mapping = {
Expand Down
Loading
Loading