Skip to content

Commit b88839d

Browse files
committed
Merge branch 'hotfix/1.0.8'
2 parents c33e36c + 1d815fd commit b88839d

File tree

5 files changed

+25
-7
lines changed

5 files changed

+25
-7
lines changed

qha/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
__credits__ = {'Renata M. M. Wentzcovitch': '[email protected]'}
1111
__date__ = 'Feb 17, 2018'
1212
__maintainer__ = 'Tian Qin, Qi Zhang'
13-
__version__ = '1.0.4'
13+
__version__ = '1.0.8'
File renamed without changes.
Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
11
#!/usr/bin/env python3
2-
# Created at Apr 1, 2018, by Qi Zhang
3-
from .different_phonon_dos import *
4-
from .same_phonon_dos import *
File renamed without changes.

setup.py

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,30 @@
11
#!/usr/bin/env python3
22

3+
import codecs
4+
import os
5+
import re
36
from distutils.core import setup
47

8+
# Referenced from `here <https://packaging.python.org/guides/single-sourcing-package-version/>`_.
9+
here = os.path.abspath(os.path.dirname(__file__))
10+
11+
12+
def read(*parts):
13+
with codecs.open(os.path.join(here, *parts), 'r') as fp:
14+
return fp.read()
15+
16+
17+
def find_version(*file_paths):
18+
version_file = read(*file_paths)
19+
version_match = re.search(r"^__version__ = ['\"]([^'\"]*)['\"]",
20+
version_file, re.M)
21+
if version_match:
22+
return version_match.group(1)
23+
raise RuntimeError("Unable to find version string.")
24+
25+
526
setup(name='qha',
6-
version='1.0.6',
27+
version=find_version('qha', '__init__.py'),
728
description='A powerful tool for quasi-harmonic approximation',
829
author='Tian Qin, Qi Zhang',
930
@@ -41,7 +62,7 @@
4162
],
4263
entry_points={
4364
'console_scripts': [
44-
'qha=qha.qha:main',
45-
'qha-convert=qha.qha_convert:main'
65+
'qha-run=qha.run:main',
66+
'qha-convert=qha.convert:main'
4667
],
4768
})

0 commit comments

Comments
 (0)