Skip to content

Use latest GH actions #678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:
max-parallel: 6

steps:
- uses: actions/checkout@v2.3.4
- uses: actions/checkout@v3

- uses: actions/setup-python@v2.2.2
- uses: actions/setup-python@v4
with:
python-version: 3.8

Expand All @@ -31,4 +31,4 @@ jobs:
with:
user: __token__
password: ${{ secrets.PYPY_API_TOKEN }}
packages_dir: ./dist/
packages_dir: ./dist/
12 changes: 6 additions & 6 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v3

- name: Set up Python 3.8
uses: actions/setup-python@v1
uses: actions/setup-python@v4
with:
python-version: 3.8

Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
- uses: actions/checkout@v1

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v1
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -70,7 +70,7 @@ jobs:
- name: Set SSL_CERT_FILE (Linux)
if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'
run: export SSL_CERT_FILE=$(python -m certifi)

- name: Set SSL_CERT_FILE (Windows)
if: matrix.os == 'windows-latest'
run: echo ("SSL_CERT_FILE=" + $(python -m certifi)) >> $env:GITHUB_ENV
Expand All @@ -86,7 +86,7 @@ jobs:
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: ./coverage.xml

auto-gen-release:
needs:
- lint
Expand All @@ -97,4 +97,4 @@ jobs:
steps:
- uses: rymndhng/[email protected]
with:
bump_version_scheme: norelease
bump_version_scheme: norelease
9 changes: 5 additions & 4 deletions tests/test_thermo.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import os
from pymatgen.analysis.phase_diagram import PhaseDiagram
import typing

import pytest
from mp_api.client.routes.thermo import ThermoRester
from pymatgen.analysis.phase_diagram import PhaseDiagram

import typing
from mp_api.client.routes.thermo import ThermoRester


@pytest.fixture
Expand All @@ -30,7 +31,7 @@ def rester():
"total_energy": "energy_per_atom",
"formation_energy": "formation_energy_per_atom",
"uncorrected_energy": "uncorrected_energy_per_atom",
"equilibirum_reaction_energy": "equilibirum_reaction_energy_per_atom",
"equilibrium_reaction_energy": "equilibrium_reaction_energy_per_atom",
"num_elements": "nelements",
"num_sites": "nsites",
} # type: dict
Expand Down