Skip to content

Commit 70547ba

Browse files
authored
Merge branch 'materialsproject:master' into master
2 parents 6934867 + 5b997f7 commit 70547ba

File tree

201 files changed

+66312
-8568
lines changed

Some content is hidden

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

201 files changed

+66312
-8568
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
uses: actions/checkout@v4
2828

2929
- name: Setup Pages
30-
uses: actions/configure-pages@v3
30+
uses: actions/configure-pages@v5
3131

3232
- name: Build with Jekyll
3333
uses: actions/jekyll-build-pages@v1
@@ -36,7 +36,7 @@ jobs:
3636
destination: ./_site
3737

3838
- name: Upload artifact
39-
uses: actions/upload-pages-artifact@v2
39+
uses: actions/upload-pages-artifact@v3
4040

4141
deploy:
4242
environment:
@@ -47,4 +47,4 @@ jobs:
4747
steps:
4848
- name: Deploy to GitHub Pages
4949
id: deployment
50-
uses: actions/deploy-pages@v2
50+
uses: actions/deploy-pages@v4

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
needs: test
4646
strategy:
4747
matrix:
48-
os: [ubuntu-latest, ubuntu-24.04-arm, macos-14, windows-latest]
48+
os: [ubuntu-latest, macos-latest, macos-13, windows-latest]
4949
python-version: ["310", "311", "312"]
5050
runs-on: ${{ matrix.os }}
5151
steps:

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ci:
88

99
repos:
1010
- repo: https://github.com/astral-sh/ruff-pre-commit
11-
rev: v0.9.0
11+
rev: v0.9.2
1212
hooks:
1313
- id: ruff
1414
args: [--fix, --unsafe-fixes]

docs/CHANGES.md

Lines changed: 48 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/apidoc/pymatgen.io.jdftx.rst

Lines changed: 90 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/apidoc/pymatgen.io.rst

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)