Skip to content

Commit

Permalink
Merge pull request #172 from WMD-group/combine-prs-branch
Browse files Browse the repository at this point in the history
Combined PR
  • Loading branch information
AntObi authored Oct 2, 2023
2 parents 6a7b89a + 8263b60 commit 24ec974
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
qa:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: pre-commit/[email protected]

test:
Expand All @@ -20,7 +20,7 @@ jobs:

runs-on: ${{matrix.os}}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ pandas==2.0.3
# via
# SMACT (setup.py)
# pymatgen
pathos==0.3.0
pathos==0.3.1
# via SMACT (setup.py)
pillow==10.0.0
# via matplotlib
Expand Down

0 comments on commit 24ec974

Please sign in to comment.