Skip to content

Commit 76c2905

Browse files
committed
drop py37 for compatibility with latest pymatgen
1 parent a5ff517 commit 76c2905

File tree

5 files changed

+19
-16
lines changed

5 files changed

+19
-16
lines changed

.circleci/config.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,17 @@ jobs:
33
py3test:
44
working_directory: ~/atomate
55
docker:
6-
- image: materialsvirtuallab/circle-ci-pmg-py3:3.7.3
7-
- image: circleci/mongo:latest
6+
- image: continuumio/miniconda3
7+
- image: circleci/mongo
8+
- image: gcc
89
steps:
910
- checkout
1011
- restore_cache:
1112
key: deps1-{{ .Branch }}-{{ checksum "requirements.txt" }}
1213
- run:
1314
command: |
1415
export PATH=$HOME/miniconda3/bin:$PATH
15-
conda create --quiet --yes --name test_env python=3.7
16+
conda create --quiet --yes --name test_env python=3.8
1617
source activate test_env
1718
conda install --quiet --yes numpy scipy matplotlib sympy pandas
1819
conda install --quiet --yes -c conda-forge openbabel
@@ -36,16 +37,17 @@ jobs:
3637
py3devtest:
3738
working_directory: ~/atomate
3839
docker:
39-
- image: materialsvirtuallab/circle-ci-pmg-py3:3.7.3
40-
- image: circleci/mongo:latest
40+
- image: continuumio/miniconda3
41+
- image: circleci/mongo
42+
- image: gcc
4143
steps:
4244
- checkout
4345
- restore_cache:
4446
key: deps1-{{ .Branch }}-{{ checksum "requirements.txt" }}
4547
- run:
4648
command: |
4749
export PATH=$HOME/miniconda3/bin:$PATH
48-
conda create --quiet --yes --name test_env python=3.7
50+
conda create --quiet --yes --name test_env python=3.8
4951
source activate test_env
5052
conda install --quiet --yes numpy scipy matplotlib sympy pandas
5153
conda install --quiet --yes -c conda-forge openbabel

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Setup Python
2424
uses: actions/setup-python@v2
2525
with:
26-
python-version: 3.7
26+
python-version: 3.8
2727

2828
- name: Install OpenBabel
2929
run: |

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ repos:
2929
rev: v2.31.0
3030
hooks:
3131
- id: pyupgrade
32-
args: [--py37-plus]
32+
args: [--py38-plus]
3333

3434
- repo: https://github.com/PyCQA/isort
3535
rev: 5.10.1

requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ FireWorks==1.9.7
33
maggma==0.29.2
44
monty==2021.6.10
55
networkx==2.5.1
6-
numpy>=1.20.3,<1.22.0
6+
numpy
77
pandas==1.2.5
88
paramiko==2.7.2
99
pydash==5.0.0
10-
pymatgen-analysis-diffusion==2021.4.29
11-
pymatgen==2022.0.10
10+
pymatgen-analysis-diffusion
11+
pymatgen
1212
pymongo<4.0.0
1313
pyyaml==5.4.1
1414
ruamel.yaml==0.17.9

setup.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
"maggma>=0.26.0",
2828
"monty>=2.0.6",
2929
"networkx",
30-
"numpy>=1.20.3,<1.22.0",
30+
"numpy",
3131
"pandas",
3232
"paramiko",
3333
"pydash>=4.1.0",
34-
"pymatgen-analysis-diffusion>=2021.4.29",
35-
"pymatgen>=2020.9.14,<=2022.0.10",
34+
"pymatgen-analysis-diffusion",
35+
"pymatgen",
3636
"pymongo<4.0.0",
3737
"pyyaml>=5.1.2",
3838
"ruamel.yaml",
@@ -51,8 +51,9 @@
5151
},
5252
classifiers=[
5353
"Programming Language :: Python :: 3",
54-
"Programming Language :: Python :: 3.6",
55-
"Programming Language :: Python :: 3.7",
54+
"Programming Language :: Python :: 3.8",
55+
"Programming Language :: Python :: 3.9",
56+
"Programming Language :: Python :: 3.10",
5657
"Development Status :: 5 - Production/Stable",
5758
"Intended Audience :: Science/Research",
5859
"Intended Audience :: System Administrators",

0 commit comments

Comments
 (0)