Skip to content

Commit f7df72a

Browse files
authored
Merge branch 'main' into 2339-fix-footgun
2 parents ef6bc9d + 9616e53 commit f7df72a

94 files changed

Lines changed: 4556 additions & 159661 deletions

File tree

Some content is hidden

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

.github/workflows/jekyll-gh-pages.yml

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,30 @@ jobs:
2424
runs-on: ubuntu-latest
2525
steps:
2626
- name: Checkout
27-
uses: actions/checkout@v5
27+
uses: actions/checkout@v6
28+
with:
29+
submodules: true
30+
31+
- name: Set up Python
32+
uses: actions/setup-python@v5
33+
with:
34+
python-version: "3.12"
35+
36+
- name: Install pymatgen with docs dependencies
37+
run: |
38+
pip install -e ".[docs]"
39+
pip install sphinx sphinx-rtd-theme sphinx_markdown_builder
40+
41+
- name: Generate Sphinx API docs
42+
working-directory: docs
43+
run: |
44+
echo ".. This file is required as the Sphinx master_doc entry point. Content is generated by sphinx-apidoc." > apidoc/index.rst
45+
sphinx-apidoc --implicit-namespaces -M -d 7 -o apidoc -f ../src/pymatgen
46+
sphinx-build -b html apidoc html
47+
rm -rf .apidoc_merge
48+
rm apidoc/*.rst
49+
mv html/pymatgen*.html .
50+
mv html/modules.html .
2851
2952
- name: Setup Pages
3053
uses: actions/configure-pages@v5

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
exclude: ^(docs|tests/files|tasks.py)
1+
exclude: ^(docs|tests/files|test-files|tasks.py)
22

33
ci:
44
autoupdate_schedule: monthly

docs/CHANGES.md

Lines changed: 2360 additions & 2452 deletions
Large diffs are not rendered by default.

docs/Gemfile.lock

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,34 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (7.0.7.2)
5-
concurrent-ruby (~> 1.0, >= 1.0.2)
4+
activesupport (7.2.3.1)
5+
base64
6+
benchmark (>= 0.3)
7+
bigdecimal
8+
concurrent-ruby (~> 1.0, >= 1.3.1)
9+
connection_pool (>= 2.2.5)
10+
drb
611
i18n (>= 1.6, < 2)
7-
minitest (>= 5.1)
8-
tzinfo (~> 2.0)
9-
addressable (2.8.4)
10-
public_suffix (>= 2.0.2, < 6.0)
12+
logger (>= 1.4.2)
13+
minitest (>= 5.1, < 6)
14+
securerandom (>= 0.3)
15+
tzinfo (~> 2.0, >= 2.0.5)
16+
addressable (2.9.0)
17+
public_suffix (>= 2.0.2, < 8.0)
18+
base64 (0.3.0)
19+
benchmark (0.5.0)
20+
bigdecimal (4.1.1)
1121
coffee-script (2.4.1)
1222
coffee-script-source
1323
execjs
1424
coffee-script-source (1.11.1)
1525
colorator (1.1.0)
1626
commonmarker (0.23.10)
17-
concurrent-ruby (1.2.2)
27+
concurrent-ruby (1.3.6)
28+
connection_pool (3.0.2)
1829
dnsruby (1.70.0)
1930
simpleidn (~> 0.2.1)
31+
drb (2.2.3)
2032
em-websocket (0.5.3)
2133
eventmachine (>= 0.12.9)
2234
http_parser.rb (~> 0)
@@ -88,7 +100,7 @@ GEM
88100
activesupport (>= 2)
89101
nokogiri (>= 1.4)
90102
http_parser.rb (0.8.0)
91-
i18n (1.14.1)
103+
i18n (1.14.8)
92104
concurrent-ruby (~> 1.0)
93105
jekyll (3.9.3)
94106
addressable (~> 2.4)
@@ -198,7 +210,7 @@ GEM
198210
gemoji (~> 3.0)
199211
html-pipeline (~> 2.2)
200212
jekyll (>= 3.0, < 5.0)
201-
json (2.18.1)
213+
json (2.19.2)
202214
kramdown (2.3.2)
203215
rexml
204216
kramdown-parser-gfm (1.1.0)
@@ -213,7 +225,7 @@ GEM
213225
jekyll (>= 3.5, < 5.0)
214226
jekyll-feed (~> 0.9)
215227
jekyll-seo-tag (~> 2.1)
216-
minitest (5.19.0)
228+
minitest (5.27.0)
217229
net-http (0.9.1)
218230
uri (>= 0.11.1)
219231
nokogiri (1.19.1-arm64-darwin)
@@ -242,6 +254,7 @@ GEM
242254
sawyer (0.9.2)
243255
addressable (>= 2.3.5)
244256
faraday (>= 0.17.3, < 3)
257+
securerandom (0.4.1)
245258
simpleidn (0.2.1)
246259
unf (~> 0.1.4)
247260
terminal-table (1.8.0)

docs/modules.html

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

docs/pymatgen.alchemy.html

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

docs/pymatgen.analysis.chemenv.connectivity.html

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

docs/pymatgen.analysis.chemenv.coordination_environments.coordination_geometries_files.html

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

0 commit comments

Comments
 (0)