Skip to content

Commit e22800a

Browse files
committed
test.yml remove unused pip caching
uv doesn't seem to benefit from caching: actions/setup-python#822 bump ruff clean up .github/workflows/jekyll-gh-pages.yml
1 parent b1e5023 commit e22800a

File tree

3 files changed

+8
-18
lines changed

3 files changed

+8
-18
lines changed

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

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
1-
# Sample workflow for building and deploying a Jekyll site to GitHub Pages
21
name: Deploy Jekyll with GitHub Pages dependencies preinstalled
32

43
on:
5-
# Runs on pushes targeting the default branch
64
push:
75
branches: ["master"]
6+
workflow_dispatch: # enable manual workflow execution
87

9-
# Allows you to run this workflow manually from the Actions tab
10-
workflow_dispatch:
11-
12-
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
8+
# Set permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
139
permissions:
1410
contents: read
1511
pages: write
@@ -22,25 +18,26 @@ concurrency:
2218
cancel-in-progress: false
2319

2420
jobs:
25-
# Build job
2621
build:
2722
# prevent this action from running on forks
2823
if: github.repository == 'materialsproject/pymatgen'
2924
runs-on: ubuntu-latest
3025
steps:
3126
- name: Checkout
3227
uses: actions/checkout@v4
28+
3329
- name: Setup Pages
3430
uses: actions/configure-pages@v3
31+
3532
- name: Build with Jekyll
3633
uses: actions/jekyll-build-pages@v1
3734
with:
3835
source: ./docs
3936
destination: ./_site
37+
4038
- name: Upload artifact
4139
uses: actions/upload-pages-artifact@v2
4240

43-
# Deployment job
4441
deploy:
4542
environment:
4643
name: github-pages

.github/workflows/test.yml

+2-9
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,6 @@ jobs:
5050

5151
- name: Set up Python ${{ matrix.python-version }}
5252
uses: actions/setup-python@v5
53-
with:
54-
python-version: ${{ matrix.python-version }}
55-
cache: pip
56-
cache-dependency-path: setup.py
57-
58-
- name: Install uv
59-
run: pip install uv
6053

6154
- name: Copy GULP to bin
6255
if: matrix.os == 'ubuntu-latest'
@@ -103,13 +96,13 @@ jobs:
10396
# TODO remove temporary fix. added since uv install torch is flaky.
10497
# track https://github.com/astral-sh/uv/issues/1921 for resolution
10598
pip install torch
106-
99+
pip install uv
107100
uv pip install numpy cython --system
108101
109102
uv pip install -e '.[dev,optional]' --system
110103
111104
# TODO remove next line installing ase from main branch when FrechetCellFilter is released
112-
uv pip install --upgrade 'ase@git+https://gitlab.com/ase/ase' --system
105+
uv pip install --upgrade 'git+https://gitlab.com/ase/ase' --system
113106
114107
- name: pytest split ${{ matrix.split }}
115108
run: |

.pre-commit-config.yaml

+1-1
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.3.3
11+
rev: v0.3.4
1212
hooks:
1313
- id: ruff
1414
args: [--fix, --unsafe-fixes]

0 commit comments

Comments
 (0)