Skip to content

Commit 1af5f40

Browse files
authored
Merge pull request #129 from amcadmus/devel
automatic version and date
2 parents ca48ba7 + 5aceeec commit 1af5f40

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

dpgen/__init__.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,15 @@
1616

1717
__author__ = "Han Wang"
1818
__copyright__ = "Copyright 2019"
19-
__version__ = "0.4.0"
2019
__status__ = "Development"
21-
__date__ = "Nov 5, 2019"
22-
23-
20+
try:
21+
from ._version import version as __version__
22+
except ImportError:
23+
__version__ = 'unkown'
24+
try:
25+
from ._date import date as __date__
26+
except ImportError:
27+
__date__ = 'unkown'
2428

2529
def info():
2630
"""

setup.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
from os import path
55
from dpgen import NAME,SHORT_CMD
6-
import setuptools
6+
import setuptools, datetime
77

88
readme_file = path.join(path.dirname(path.abspath(__file__)), 'README.md')
99
try:
@@ -13,12 +13,16 @@
1313
with open(readme_file) as f:
1414
readme = f.read()
1515

16+
today = datetime.date.today().strftime("%b-%d-%Y")
17+
with open(path.join('dpgen', '_date.py'), 'w') as fp :
18+
fp.write('date = \'%s\'' % today)
19+
1620
install_requires=['numpy>=1.14.3', 'dpdata>=0.1.10', 'pymatgen>=2017.9.1', 'ase', 'monty>2.0.0', 'paramiko', 'custodian']
1721

1822
setuptools.setup(
1923
name=NAME,
20-
version_format='{tag}.dev{commitcount}+{gitsha}',
21-
setup_requires=['setuptools-git-version'],
24+
use_scm_version={'write_to': 'dpgen/_version.py'},
25+
setup_requires=['setuptools_scm'],
2226
author="Han Wang",
2327
author_email="wang_han@iapcm.ac.cn",
2428
description="DPGen: The deep potential generator",
@@ -42,7 +46,7 @@
4246
"Programming Language :: Python :: 3.6",
4347
"License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)",
4448
],
45-
keywords='lammps vasp deepmd-kit',
49+
keywords='deep potential generator active learning deepmd-kit',
4650
install_requires=install_requires,
4751
entry_points={
4852
'console_scripts': [

0 commit comments

Comments
 (0)