Skip to content

Commit 646855d

Browse files
authored
changes for python 36 (#23)
* changes for python 36 * Update mol_preprocessor.py
1 parent 4c1a6fc commit 646855d

File tree

4 files changed

+19
-30
lines changed

4 files changed

+19
-30
lines changed

.github/workflows/run_tests_and_deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
runs-on: ubuntu-latest
2424
strategy:
2525
matrix:
26-
python-version: [ 3.7, 3.8, 3.9 ]
26+
python-version: [ 3.6, 3.7, 3.8, 3.9 ]
2727

2828
steps:
2929
-

nfp/preprocessing/mol_preprocessor.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from __future__ import annotations
2-
31
from typing import Callable, Dict, Hashable, Optional
42

53
import networkx as nx

nfp/preprocessing/xtb_preprocessor.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from __future__ import annotations
2-
31
import json
42
from typing import TYPE_CHECKING, Dict, List, Optional
53

@@ -67,7 +65,7 @@ def __init__(
6765
self.xtb_mol_features = xtb_mol_features
6866

6967
def create_nx_graph(
70-
self, mol: rdkit.Chem.Mol, jsonfile: str, **kwargs
68+
self, mol: "rdkit.Chem.Mol", jsonfile: str, **kwargs
7169
) -> nx.DiGraph:
7270

7371
with open(jsonfile, "r") as f:

setup.py

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,44 +8,37 @@
88
here = path.abspath(path.dirname(__file__))
99

1010
# Get the long description from the README file
11-
with open(path.join(here, 'README.md'), encoding='utf-8') as f:
11+
with open(path.join(here, "README.md"), encoding="utf-8") as f:
1212
long_description = f.read()
1313

1414
# Arguments marked as "Required" below must be included for upload to PyPI.
1515
# Fields marked as "Optional" may be commented out.
1616
setup(
17-
name='nfp',
17+
name="nfp",
1818
version=versioneer.get_version(),
1919
cmdclass=versioneer.get_cmdclass(),
20-
description='Keras layers for machine learning on graph structures',
20+
description="Keras layers for machine learning on graph structures",
2121
long_description=long_description,
22-
long_description_content_type='text/markdown',
23-
url='https://github.com/NREL/nfp', # Optional
24-
author='Peter St. John',
25-
author_email='[email protected]', # Optional
22+
long_description_content_type="text/markdown",
23+
url="https://github.com/NREL/nfp", # Optional
24+
author="Peter St. John",
25+
author_email="[email protected]", # Optional
2626
classifiers=[
27-
'Development Status :: 3 - Alpha',
28-
27+
"Development Status :: 3 - Alpha",
2928
# Indicate who your project is intended for
30-
'Intended Audience :: Developers',
31-
29+
"Intended Audience :: Developers",
3230
# Pick your license as you wish
33-
'License :: OSI Approved :: MIT License',
34-
31+
"License :: OSI Approved :: MIT License",
3532
# Specify the Python versions you support here. In particular, ensure
3633
# that you indicate whether you support Python 2, Python 3 or both.
37-
'Programming Language :: Python :: 3',
38-
'Programming Language :: Python :: 3.4',
39-
'Programming Language :: Python :: 3.5',
40-
'Programming Language :: Python :: 3.6',
41-
'Programming Language :: Python :: 3.7',
42-
'Programming Language :: Python :: 3.8',
43-
'Programming Language :: Python :: 3.9',
34+
"Programming Language :: Python :: 3",
35+
"Programming Language :: Python :: 3.6",
36+
"Programming Language :: Python :: 3.7",
37+
"Programming Language :: Python :: 3.8",
38+
"Programming Language :: Python :: 3.9",
4439
],
45-
46-
packages=find_packages(exclude=['docs', 'tests']), # Required
47-
40+
packages=find_packages(exclude=["docs", "tests"]), # Required
4841
project_urls={
49-
'Source': 'https://github.com/NREL/nfp',
42+
"Source": "https://github.com/NREL/nfp",
5043
},
5144
)

0 commit comments

Comments
 (0)