Skip to content

Commit 5dba637

Browse files
authored
Merge branch 'main' into fitsnap
2 parents 9ceca67 + 23b6c16 commit 5dba637

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1508
-1339
lines changed

.ci_support/check.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import tomlkit
2+
3+
4+
if __name__ == "__main__":
5+
with open("pyproject.toml", "r") as f:
6+
data = tomlkit.load(f)
7+
8+
lst = []
9+
for sub_lst in data["project"]["optional-dependencies"].values():
10+
for el in sub_lst:
11+
lst.append(el)
12+
13+
data["project"]["dependencies"] += [el for el in set(lst) if not el.startswith("nglview")]
14+
15+
with open("pyproject.toml", "w") as f:
16+
f.writelines(tomlkit.dumps(data))

.ci_support/environment-lammps.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
channels:
22
- conda-forge
33
dependencies:
4-
- lammps =2024.02.07
5-
- fitsnap3 =3.1.0.2
4+
- lammps =2024.08.29=*openmpi*
5+
- fitsnap3 =3.1.0.2

.ci_support/environment-old.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,5 @@ dependencies:
1515
- scipy =1.9.3
1616
- spglib =1.16.5
1717
- sqsgenerator =0.2
18+
- hatchling =1.27.0
19+
- hatch-vcs =0.4.0

.ci_support/environment.yml

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,21 @@ channels:
33
- conda-forge
44
dependencies:
55
- aimsgb =1.1.1
6-
- ase =3.23.0
6+
- ase =3.26.0
77
- coverage
8-
- dscribe =2.1.1
9-
- matplotlib-base =3.9.1
10-
- nglview =3.1.2
8+
- dscribe =2.1.2
9+
- matplotlib-base =3.10.6
10+
- nglview =3.1.4
1111
- notebook
12-
- numpy =1.26.4
13-
- phonopy =2.26.5
14-
- plotly =5.22.0
15-
- pymatgen =2024.6.10
16-
- pyscal3 =3.2.6
17-
- pyxtal =0.6.7
18-
- scikit-learn =1.5.1
19-
- scipy =1.14.0
20-
- spglib =2.5.0
12+
- numpy =2.3.3
13+
- phonopy =2.43.2
14+
- plotly =6.3.1
15+
- pymatgen =2025.6.14
16+
- pyscal3 =3.3.0
17+
- pyxtal =1.1.1
18+
- scikit-learn =1.7.2
19+
- scipy =1.16.2
20+
- spglib =2.6.0
2121
- sqsgenerator =0.3
22+
- hatchling =1.27.0
23+
- hatch-vcs =0.4.0

.ci_support/environment_mini.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
channels:
22
- conda-forge
33
dependencies:
4-
- ase =3.23.0
4+
- ase =3.26.0
55
- coverage
6-
- numpy =1.26.4
7-
- scipy =1.14.0
6+
- numpy =2.3.3
7+
- scipy =1.16.2
8+
- hatchling =1.27.0
9+
- hatch-vcs =0.4.0

.coveralls.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/workflows/black.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

.github/workflows/deploy.yml

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,20 @@ jobs:
1919
id-token: write
2020
steps:
2121
- uses: actions/checkout@v4
22+
- name: Conda config
23+
run: echo -e "channels:\n - conda-forge\n" > .condarc
2224
- uses: conda-incubator/setup-miniconda@v3
2325
with:
2426
python-version: "3.12"
25-
mamba-version: "*"
26-
channels: conda-forge
27-
miniforge-variant: Mambaforge
28-
channel-priority: strict
29-
auto-update-conda: true
27+
miniforge-version: latest
28+
condarc-file: .condarc
3029
environment-file: .ci_support/environment.yml
31-
- name: Convert dependencies
32-
run: |
33-
cp .ci_support/environment-old.yml environment.yml
34-
python .ci_support/release.py; cat pyproject.toml
3530
- name: Build
3631
shell: bash -l {0}
3732
run: |
38-
pip install versioneer[toml]==0.29
39-
python setup.py sdist bdist_wheel
33+
cp .ci_support/environment-old.yml environment.yml
34+
python .ci_support/release.py; cat pyproject.toml
35+
git update-index --assume-unchanged pyproject.toml structuretoolkit/_version.py
36+
hatchling build -t sdist -t wheel
4037
- name: Publish distribution 📦 to PyPI
4138
uses: pypa/gh-action-pypi-publish@release/v1

.github/workflows/format_black.yml

Lines changed: 0 additions & 33 deletions
This file was deleted.

.github/workflows/mini.yml

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)