Skip to content
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

Drop a support of python 3.7/3.8 #74

Merged
merged 7 commits into from
Nov 6, 2024
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
7 changes: 2 additions & 5 deletions .github/workflows/Test_abICS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,11 @@ on: [push]
jobs:
build:

runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
matrix:
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
python-version: ['3.9', '3.12']
testname: [Unit, Sampling, ActiveLearnAenet, ActiveLearnNequip, ActiveLearnMLIP-3]
exclude:
- python-version: 3.7
testname: ActiveLearnNequip
fail-fast: false

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: [push]

jobs:
check-build-doc:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
timeout-minutes: 10
steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
jobs:
deploy:
timeout-minutes: 10.0
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Inject slug/short variables
uses: rlespinasse/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy_pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
deploy:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ and OpenMX input files for obtaining the reference training data for the machine

## Requirement

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

``` bash
$ pip3 install Cython
$ python3 -m pip install Cython
```

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

``` bash
$ pip3 install abics
$ python3 -m pip install abics
```

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

``` bash
$ pip3 install --user abics
$ python3 -m pip install --user abics
```

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

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

Expand Down Expand Up @@ -93,6 +93,6 @@ Shusuke Kasamatsu, Yuichi Motoyama, Tatsumi Aoyama, Kazuyoshi Yoshimi

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

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

[API reference](https://issp-center-dev.github.io/abICS/docs/api/master/html/index.html)
2 changes: 1 addition & 1 deletion docs/sphinx/en/source/install/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Prerequisites
~~~~~~~~~~~~~~~~~~~~~~

abICS requires Python3 (>=3.7).
abICS requires Python3 (>=3.9).

The following Python packages are required.

Expand Down
2 changes: 1 addition & 1 deletion docs/sphinx/ja/source/install/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
必要なライブラリ・環境
~~~~~~~~~~~~~~~~~~~~~~

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

- numpy
Expand Down
5 changes: 2 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,14 @@ packages = [
]

[tool.poetry.dependencies]
python = "^3.7"
python = "^3.9"
numpy = "^1.20"
toml = ">=0.10"
scipy = "^1"
mpi4py = "^3"
pymatgen = ">=2019.12.3 <2023.5.8"
pymatgen = ">=2022.1.20"
qe_tools = "^1.1"
nequip = {version=">=0.5.6", optional=true}
"ruamel.yaml" = { version = "<0.18.0", python = "<3.8" }

[tool.poetry.extras]
nequip = ["nequip"]
Expand Down
6 changes: 2 additions & 4 deletions tests/test_vasp.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,8 @@ def test_input(self):

self.assertEqual(res["INCAR"], ref["INCAR"])
self.assertTrue(res["POSCAR"].structure.matches(ref["POSCAR"].structure))
self.assertEqual(
res["POSCAR"].structure.site_properties,
ref["POSCAR"].structure.site_properties,
)
for k,v in ref["POSCAR"].structure.site_properties.items():
self.assertTrue(np.allclose(res["POSCAR"].structure.site_properties[k], v))

def test_cl_algs(self):
nprocs = 2
Expand Down