Skip to content

Commit

Permalink
Merge pull request #345 from WMD-group/combine-prs-branch
Browse files Browse the repository at this point in the history
Combined PR
  • Loading branch information
AntObi authored Dec 1, 2024
2 parents 3062f8e + 627ba41 commit f3779cf
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
MP_API_KEY: ${{ secrets.MP_API_KEY }}
run: python -m pytest --cov=smact --cov-report=xml -v
- name: Upload coverage reports to CodeCov
uses: codecov/codecov-action@v4
uses: codecov/codecov-action@v5
with:
token: ${{ secrets.CODECOV_TOKEN }}
#files: ./coverage.xml
Expand Down
4 changes: 2 additions & 2 deletions docs/requirements.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Defining the exact version will make sure things don't break
sphinx==5.3.0
sphinx_rtd_theme==2.0.0
sphinx_rtd_theme==3.0.2
readthedocs-sphinx-search==0.3.2
sphinx-book-theme==1.1.3
myst-nb==1.1.1
myst-nb==1.1.2
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ keywords = [
]
dependencies = [
"ase",
"numpy<2",
"numpy<3",
"pandas",
"pathos",
"pymatgen>=2024.2.20",
Expand Down Expand Up @@ -68,10 +68,10 @@ dev = [
]
docs = [
"sphinx==5.3.0",
"sphinx_rtd_theme==2.0.0",
"sphinx_rtd_theme==3.0.2",
"readthedocs-sphinx-search==0.3.2",
"sphinx-book-theme==1.1.3",
"myst-nb==1.1.1"
"myst-nb==1.1.2"
]
mp = ["mp-api"]

Expand Down
2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pre-commit ==3.3.3
pytest ==8.3.2
pytest ==8.3.4
pytest-cov ==5.0.0
ruff
pyright
Expand Down

0 comments on commit f3779cf

Please sign in to comment.