Skip to content

Commit 95cc4b3

Browse files
committed
Merge branch 'release/v1.0.1'
2 parents f84d8f6 + 7757f40 commit 95cc4b3

File tree

6 files changed

+34
-10
lines changed

6 files changed

+34
-10
lines changed
File renamed without changes.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ volume ($V(T, P)$), bulk modulus ($B(T, P)$), enthalpy ($H(T, P)$), Helmholtz fr
1919

2020
## Where to get it
2121

22-
The source code is currently hosted on [Bitbucket](https://bitbucket.org/singularitti/qha).
22+
The source code is currently hosted on [GitHub](https://github.com/MineralsCloud/qha).
2323

2424
Binary installers for the latest released version are available at the Python package index and on conda.
2525

qha/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import sys
44

5-
if sys.version_info < (3, 5):
5+
if sys.version_info < (3, 5): # In case of user who does not have ``pip`` above version 9.0.0
66
raise EnvironmentError('Please use Python version higher than 3.5!')
77

88
__author__ = {'Tian Qin': '[email protected]', 'Qi Zhang': '[email protected]'}

scripts/qha

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ from qha.out import save_x_tp, save_x_vt, save_to_output, make_starting_string,
88
from qha.plot import QHAPlot
99
from qha.settings import from_yaml
1010

11-
if __name__ == '__main__':
11+
12+
def main():
1213
start_time_total = time.time()
1314
user_settings = {} # save necessary info for plotting later
1415

@@ -127,3 +128,7 @@ if __name__ == '__main__':
127128
end_time_total = time.time()
128129
time_elapsed = end_time_total - start_time_total
129130
save_to_output(user_settings['qha_output'], make_ending_string(time_elapsed))
131+
132+
133+
if __name__ == '__main__':
134+
main()

scripts/qha-convert

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,10 @@ fn_flist = namespace.filename
1515
fn_pve = namespace.pve # 'PVE'
1616
fn_kwt = namespace.kpt # 'q_weights.dat'
1717

18-
A = Converter(fn_flist, fn_pve, fn_kwt)
19-
A.write_to_input()
18+
19+
def main():
20+
Converter(fn_flist, fn_pve, fn_kwt).write_to_input()
21+
22+
23+
if __name__ == '__main__':
24+
main()

setup.py

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,24 @@
33
from distutils.core import setup
44

55
setup(name='qha',
6-
version='1.0.0',
6+
version='1.0.1',
77
description='A powerful tool for quasi-harmonic approximation',
88
author='Tian Qin, Qi Zhang',
99
10+
maintainer='Tian Qin, Qi Zhang',
11+
1012
license='GNU General Public License 3',
1113
url='https://bitbucket.org/singularitti/qha',
14+
classifiers=[
15+
'Development Status :: 5 - Production/Stable',
16+
'Intended Audience :: Science/Research',
17+
'Topic :: Scientific/Engineering :: Physics',
18+
'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
19+
'Programming Language :: Python :: 3.5',
20+
'Programming Language :: Python :: 3.6',
21+
],
22+
python_requires='>=3.5',
23+
keywords='thermodynamic-properties quasi-harmonic-approximation scientific-computation',
1224
install_requires=[
1325
'lazy_property',
1426
'numba',
@@ -27,7 +39,9 @@
2739
'qha.multi_configurations',
2840
'qha.readers',
2941
],
30-
scripts=[
31-
'scripts/qha',
32-
'scripts/qha-convert'
33-
])
42+
entry_points={
43+
'console_scripts': [
44+
'qha=scripts/qha:main',
45+
'qha-convert=scripts/qha-convert:main'
46+
],
47+
})

0 commit comments

Comments
 (0)