Skip to content

Commit 1edf972

Browse files
authored
Merge pull request #74 from issp-center-dev/drop_python_37_38
Drop a support of python 3.7/3.8
2 parents 3277cdd + fc0f83e commit 1edf972

9 files changed

Lines changed: 17 additions & 23 deletions

File tree

.github/workflows/Test_abICS.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,11 @@ on: [push]
88
jobs:
99
build:
1010

11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-22.04
1212
strategy:
1313
matrix:
14-
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
14+
python-version: ['3.9', '3.12']
1515
testname: [Unit, Sampling, ActiveLearnAenet, ActiveLearnNequip, ActiveLearnMLIP-3]
16-
exclude:
17-
- python-version: 3.7
18-
testname: ActiveLearnNequip
1916
fail-fast: false
2017

2118
steps:

.github/workflows/build_docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [push]
44

55
jobs:
66
check-build-doc:
7-
runs-on: ubuntu-20.04
7+
runs-on: ubuntu-22.04
88
timeout-minutes: 10
99
steps:
1010
- name: Checkout

.github/workflows/deploy_docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
jobs:
1313
deploy:
1414
timeout-minutes: 10.0
15-
runs-on: ubuntu-20.04
15+
runs-on: ubuntu-22.04
1616
steps:
1717
- name: Inject slug/short variables
1818
uses: rlespinasse/[email protected]

.github/workflows/deploy_pypi.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66

77
jobs:
88
deploy:
9-
runs-on: ubuntu-20.04
9+
runs-on: ubuntu-22.04
1010
steps:
1111
- name: Checkout
1212
uses: actions/checkout@v4

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ and OpenMX input files for obtaining the reference training data for the machine
99

1010
## Requirement
1111

12-
- python3 (>=3.7)
12+
- python3 (>=3.9)
1313
- numpy
1414
- scipy
1515
- toml (for parsing input files)
@@ -25,7 +25,7 @@ Pymatgen requires Cython but Cython will not be installed automatically,
2525
please make sure that this is installed,
2626

2727
``` bash
28-
$ pip3 install Cython
28+
$ python3 -m pip install Cython
2929
```
3030

3131
mpi4py requires one of the MPI implementations such as OpenMPI,
@@ -39,7 +39,7 @@ $ brew install open-mpi
3939
After installing Cython and MPI,
4040

4141
``` bash
42-
$ pip3 install abics
42+
$ python3 -m pip install abics
4343
```
4444

4545
will install abICS and dependencies.
@@ -48,10 +48,10 @@ If you want to change the directory where abICS is installed,
4848
add `--user` option or `--prefix=DIRECTORY` option to the above command as
4949

5050
``` bash
51-
$ pip3 install --user abics
51+
$ python3 -m pip install --user abics
5252
```
5353

54-
For details of `pip` , see the manual of `pip` by `pip3 help install`
54+
For details of `pip` , see the manual of `pip` by `python3 -m pip help install`
5555

5656
If you want to install abICS from source, see [wiki page](https://github.com/issp-center-dev/abICS/wiki/Install)
5757

@@ -93,6 +93,6 @@ Shusuke Kasamatsu, Yuichi Motoyama, Tatsumi Aoyama, Kazuyoshi Yoshimi
9393

9494
[English online manual](https://issp-center-dev.github.io/abICS/docs/master/en/html/index.html)
9595

96-
[Japnese online manual](https://issp-center-dev.github.io/abICS/docs/master/ja/html/index.html)
96+
[Japanese online manual](https://issp-center-dev.github.io/abICS/docs/master/ja/html/index.html)
9797

9898
[API reference](https://issp-center-dev.github.io/abICS/docs/api/master/html/index.html)

docs/sphinx/en/source/install/install.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Prerequisites
44
~~~~~~~~~~~~~~~~~~~~~~
55

6-
abICS requires Python3 (>=3.7).
6+
abICS requires Python3 (>=3.9).
77

88
The following Python packages are required.
99

docs/sphinx/ja/source/install/install.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
必要なライブラリ・環境
44
~~~~~~~~~~~~~~~~~~~~~~
55

6-
abICS をインストール・実行するには、 バージョン3.7 以上の Python が必要です。
6+
abICS をインストール・実行するには、 バージョン3.9 以上の Python が必要です。
77
また、以下の Python パッケージが必要です。
88

99
- numpy

pyproject.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,14 @@ packages = [
1313
]
1414

1515
[tool.poetry.dependencies]
16-
python = "^3.7"
16+
python = "^3.9"
1717
numpy = "^1.20"
1818
toml = ">=0.10"
1919
scipy = "^1"
2020
mpi4py = "^3"
21-
pymatgen = ">=2019.12.3 <2023.5.8"
21+
pymatgen = ">=2022.1.20"
2222
qe_tools = "^1.1"
2323
nequip = {version=">=0.5.6", optional=true}
24-
"ruamel.yaml" = { version = "<0.18.0", python = "<3.8" }
2524

2625
[tool.poetry.extras]
2726
nequip = ["nequip"]

tests/test_vasp.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,8 @@ def test_input(self):
6969

7070
self.assertEqual(res["INCAR"], ref["INCAR"])
7171
self.assertTrue(res["POSCAR"].structure.matches(ref["POSCAR"].structure))
72-
self.assertEqual(
73-
res["POSCAR"].structure.site_properties,
74-
ref["POSCAR"].structure.site_properties,
75-
)
72+
for k,v in ref["POSCAR"].structure.site_properties.items():
73+
self.assertTrue(np.allclose(res["POSCAR"].structure.site_properties[k], v))
7674

7775
def test_cl_algs(self):
7876
nprocs = 2

0 commit comments

Comments
 (0)