Skip to content

Commit 689a6c1

Browse files
Build: Update dependencies (#227)
* Update full dependencies * Update core dependencies * Fix repr test for newer python version * Update Python version in actions * Allow recent poetry version in actions * Install current version of mdtraj * Update Readme
1 parent 80030fd commit 689a6c1

9 files changed

Lines changed: 2679 additions & 1281 deletions

File tree

.github/workflows/install.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
uses: conda-incubator/setup-miniconda@v3
2323
with:
2424
auto-update-conda: true
25-
python-version: 3.9
25+
python-version: "3.10"
2626
- name: Install py4vasp and testing tools
2727
shell: bash -el {0}
2828
run: |

.github/workflows/test_core.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
matrix:
1414
os: [ubuntu-latest, macos-latest, windows-latest]
15-
python-version: ["3.9", "3.10", "3.11", "3.12"]
15+
python-version: ["3.10", "3.11", "3.12", "3.13"]
1616

1717
steps:
1818
- uses: actions/checkout@v4
@@ -24,7 +24,7 @@ jobs:
2424
run: |
2525
python --version
2626
python -m pip install --progress-bar=off --upgrade pip
27-
pip install --progress-bar=off "poetry!=1.4.1"
27+
pip install --progress-bar=off poetry
2828
- name: Install py4vasp-core
2929
run: |
3030
cp core/* .

.github/workflows/test_full.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
matrix:
1414
os: [ubuntu-latest, macos-latest, windows-latest]
15-
python-version: ["3.9", "3.10", "3.11", "3.12"]
15+
python-version: ["3.10", "3.11", "3.12", "3.13"]
1616

1717
steps:
1818
- uses: actions/checkout@v4
@@ -26,7 +26,7 @@ jobs:
2626
run: |
2727
python --version
2828
python -m pip install --progress-bar=off --upgrade pip
29-
pip install --progress-bar=off "poetry<2"
29+
pip install --progress-bar=off poetry
3030
- name: Install py4vasp
3131
shell: bash -el {0}
3232
run: |
@@ -36,7 +36,7 @@ jobs:
3636
shell: bash -el {0}
3737
run: |
3838
conda info
39-
conda install -q -c conda-forge "mdtraj<1.10.2"
39+
conda install -q -c conda-forge mdtraj
4040
- name: Test with pytest
4141
shell: bash -el {0}
4242
run: |

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ We recommend installing py4vasp in a conda environment to resolve issues related
1818
installing `mdtraj` with pip. To do this please use the following steps. The last step
1919
will test whether everything worked
2020
~~~shell
21-
conda create --name py4vasp-env python=3.9
21+
conda create --name py4vasp-env python=3.10
2222
git clone git@github.com:vasp-dev/py4vasp.git
2323
conda activate py4vasp-env
24-
pip install "poetry<2"
24+
pip install poetry
2525
cd py4vasp
2626
poetry install
2727
conda install -c conda-forge mdtraj

core/poetry.lock

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

core/pyproject.toml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,19 @@ repository = "https://github.com/vasp-dev/py4vasp"
2828

2929

3030
[tool.poetry.dependencies]
31-
python = ">=3.9"
32-
numpy = ">=1.23"
33-
h5py = ">=3.7.0"
31+
python = ">=3.10"
32+
numpy = ">=2.0"
33+
h5py = ">=3.9.0"
3434

3535
[tool.poetry.group.dev.dependencies]
36-
pytest = ">=7.1.2"
37-
pytest-cov = ">=3.0.0"
38-
pylint = ">=2.15"
39-
hypothesis = ">=6.48.1"
40-
black = ">=22.6.0"
41-
isort = ">=5.10.1"
36+
pytest = ">=8.0"
37+
pytest-cov = ">=5.0"
38+
pylint = ">=3.0"
39+
hypothesis = ">=6.79"
40+
black = ">=23.7"
41+
isort = ">=5.13"
42+
ipykernel = ">=6.25.0"
43+
pre-commit = ">=3.3.3"
4244

4345
[tool.isort]
4446
profile = "black"

poetry.lock

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

pyproject.toml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ authors = [
1515
"Andreas Singraber <andreas.singraber@vasp.at>",
1616
"Alexey Tal <alexey.tal@vasp.at>",
1717
"Tomáš Bučko <tomas.bucko@uniba.sk>",
18-
"Max Liebetreu <max.liebetreu@vasp.at>"
18+
"Max Liebetreu <max.liebetreu@vasp.at>",
1919
]
2020
license = "Apache-2.0"
2121
readme = "README.md"
@@ -27,31 +27,31 @@ repository = "https://github.com/vasp-dev/py4vasp"
2727

2828

2929
[tool.poetry.dependencies]
30-
python = ">=3.9"
31-
numpy = ">=1.23"
32-
h5py = ">=3.7.0"
33-
pandas = ">=1.4.3"
30+
python = ">=3.10"
31+
numpy = ">=2.0"
32+
h5py = ">=3.9.0"
33+
pandas = ">=2.0"
3434
nglview = ">=3.0.5"
35-
ase = ">=3.22.1"
36-
plotly = ">=5.9.0"
37-
kaleido = ">=0.2.1,<0.2.1.post1 || >0.2.1.post1"
38-
ipython = ">=8.12"
35+
ase = ">=3.23"
36+
plotly = ">=5.23"
37+
kaleido = ">=1.0"
38+
ipython = ">=8.26"
3939
scipy = ">=1.12.0"
4040
click = ">=8.1.8"
4141

4242
[tool.poetry.group.dev.dependencies]
43-
pytest = ">=7.1.2"
44-
pytest-cov = ">=3.0.0"
45-
pylint = ">=2.15"
46-
hypothesis = ">=6.48.1"
47-
black = ">=22.6.0"
48-
isort = ">=5.10.1"
43+
pytest = ">=8.0"
44+
pytest-cov = ">=5.0"
45+
pylint = ">=3.0"
46+
hypothesis = ">=6.79"
47+
black = ">=23.7"
48+
isort = ">=5.13"
4949
ipykernel = ">=6.25.0"
5050
pre-commit = ">=3.3.3"
5151

5252
[tool.poetry.group.doc.dependencies]
53-
sphinx = ">=5.0.2"
54-
sphinx-automodapi = ">=0.14.1"
53+
sphinx = ">=8.0"
54+
sphinx-automodapi = ">=0.16"
5555

5656
[tool.poetry.scripts]
5757
py4vasp = "py4vasp.cli:cli"

tests/calculation/test_repr.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ def test_repr():
2121
def check_repr_is_consistent(instance, quantity):
2222
class_name = convert.to_camelcase(quantity)
2323
module = importlib.import_module(f"py4vasp._calculation.{quantity}")
24-
locals()[class_name] = getattr(module, class_name)
25-
copy = eval(repr(instance))
24+
eval_globals = {
25+
class_name: getattr(module, class_name),
26+
"PosixPath": PosixPath,
27+
"WindowsPath": WindowsPath,
28+
}
29+
copy = eval(repr(instance), eval_globals)
2630
assert copy.__class__ == instance.__class__

0 commit comments

Comments
 (0)