From 2d3272de820af8815407d738049754aa03c51c5b Mon Sep 17 00:00:00 2001 From: knc6 Date: Sun, 14 Nov 2021 13:39:19 -0500 Subject: [PATCH 1/4] Pandas version and python version fix. --- alignn/__init__.py | 2 +- setup.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/alignn/__init__.py b/alignn/__init__.py index 988435b9..e3deeb25 100644 --- a/alignn/__init__.py +++ b/alignn/__init__.py @@ -1,2 +1,2 @@ """Version number.""" -__version__ = "2021.11.12" +__version__ = "2021.11.13" diff --git a/setup.py b/setup.py index 0fa550aa..aefa52fc 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ setuptools.setup( name="alignn", - version="2021.11.12", + version="2021.11.13", author="Kamal Choudhary, Brian DeCost", author_email="kamal.choudhary@nist.gov", description="alignn", @@ -24,7 +24,7 @@ "scikit-learn>=0.22.2", "matplotlib>=3.4.1", "tqdm>=4.60.0", - "pandas>=1.2.3", + "pandas>=1.0.5", "pytorch-ignite>=0.4.7", "pydantic>=1.8.1", "flake8>=3.9.1", @@ -47,5 +47,5 @@ "License :: OSI Approved :: MIT License", "Operating System :: OS Independent", ], - python_requires=">=3.8", + python_requires=">=3.7", ) From d5ae7411df2b3c9bfb3264bf0c7c41bb0f8545d8 Mon Sep 17 00:00:00 2001 From: knc6 Date: Sun, 14 Nov 2021 13:44:38 -0500 Subject: [PATCH 2/4] Pandas version and python version fix. --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index aefa52fc..3dfe7cec 100644 --- a/setup.py +++ b/setup.py @@ -19,8 +19,8 @@ "scipy>=1.6.1", "jarvis-tools>=2021.07.19", "torch>=1.7.1", - "dgl-cu101>=0.6.0", "dgl>=0.6.0", + "dgl-cu111>=0.6.0", "scikit-learn>=0.22.2", "matplotlib>=3.4.1", "tqdm>=4.60.0", @@ -35,7 +35,7 @@ # scripts=["alignn/alignn_train_folder.py"], entry_points={ "console_scripts": [ - "train_folder=alignn.train_folder:cli" + "train_folder=alignn.train_folder" ], }, long_description=long_description, From b15d56d213d68d64d0a1f0a80604ca548522a6c9 Mon Sep 17 00:00:00 2001 From: knc6 Date: Sun, 14 Nov 2021 13:47:38 -0500 Subject: [PATCH 3/4] Pandas version and python version fix. --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 3dfe7cec..e87e0edc 100644 --- a/setup.py +++ b/setup.py @@ -35,7 +35,8 @@ # scripts=["alignn/alignn_train_folder.py"], entry_points={ "console_scripts": [ - "train_folder=alignn.train_folder" + "train_folder=alignn.script.train_folder" + "pretrained=alignn.pretrained" ], }, long_description=long_description, From a43aaab30b42e2b52ebb40cd5d671829c920bf89 Mon Sep 17 00:00:00 2001 From: knc6 Date: Sun, 14 Nov 2021 13:51:15 -0500 Subject: [PATCH 4/4] Pandas version and python version fix. --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index e87e0edc..52d948cf 100644 --- a/setup.py +++ b/setup.py @@ -19,12 +19,12 @@ "scipy>=1.6.1", "jarvis-tools>=2021.07.19", "torch>=1.7.1", + "dgl-cu101>=0.6.0", "dgl>=0.6.0", - "dgl-cu111>=0.6.0", "scikit-learn>=0.22.2", "matplotlib>=3.4.1", "tqdm>=4.60.0", - "pandas>=1.0.5", + "pandas>=1.2.3", "pytorch-ignite>=0.4.7", "pydantic>=1.8.1", "flake8>=3.9.1",