Skip to content

Commit 448b92b

Browse files
committed
Bump to verson 0.5.1
- allow renaming of key-value arguments in Python API - actually install files for QCSchema support
1 parent ecacc44 commit 448b92b

File tree

10 files changed

+29
-9
lines changed

10 files changed

+29
-9
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ cmake_minimum_required(VERSION 3.14)
1919
project(
2020
"s-dftd3"
2121
LANGUAGES "Fortran"
22-
VERSION "0.5.0"
22+
VERSION "0.5.1"
2323
DESCRIPTION "Simple reimplementation of the DFT-D3 dispersion model"
2424
)
2525

fpm.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name = "s-dftd3"
2-
version = "0.5.0"
2+
version = "0.5.1"
33
license = "LGPL-3.0-or-later"
44
maintainer = ["@awvwgk"]
55
author = ["Sebastian Ehlert"]

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
project(
1818
's-dftd3',
1919
'fortran',
20-
version: '0.5.0',
20+
version: '0.5.1',
2121
license: 'LGPL-3.0-or-later',
2222
meson_version: '>=0.55',
2323
default_options: [

python/README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ Now you are ready to use ``dftd3``, check if you can import it with
9898
>>> import dftd3
9999
>>> from dftd3.libdftd3 import get_api_version
100100
>>> get_api_version()
101-
'0.5.0'
101+
'0.5.1'
102102
103103
104104
Building the extension module

python/dftd3/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@
1818
# make sure we have a CFFI available
1919
import cffi
2020

21-
__version__ = "0.5.0"
21+
__version__ = "0.5.1"

python/dftd3/interface.py

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ class RationalDampingParam(DampingParam):
214214
"""
215215

216216
def __init__(self, **kwargs):
217+
_rename_kwargs(kwargs, "alpha6", "alp")
217218
DampingParam.__init__(self, **kwargs)
218219

219220
@staticmethod
@@ -247,6 +248,9 @@ class ZeroDampingParam(DampingParam):
247248
"""
248249

249250
def __init__(self, **kwargs):
251+
_rename_kwargs(kwargs, "sr6", "rs6")
252+
_rename_kwargs(kwargs, "sr8", "rs8")
253+
_rename_kwargs(kwargs, "alpha6", "alp")
250254
DampingParam.__init__(self, **kwargs)
251255

252256
@staticmethod
@@ -281,6 +285,7 @@ class ModifiedRationalDampingParam(DampingParam):
281285
"""
282286

283287
def __init__(self, **kwargs):
288+
_rename_kwargs(kwargs, "alpha6", "alp")
284289
DampingParam.__init__(self, **kwargs)
285290

286291
@staticmethod
@@ -315,6 +320,10 @@ class ModifiedZeroDampingParam(DampingParam):
315320
"""
316321

317322
def __init__(self, **kwargs):
323+
_rename_kwargs(kwargs, "sr6", "rs6")
324+
_rename_kwargs(kwargs, "sr8", "rs8")
325+
_rename_kwargs(kwargs, "alpha6", "alp")
326+
_rename_kwargs(kwargs, "beta", "bet")
318327
DampingParam.__init__(self, **kwargs)
319328

320329
@staticmethod
@@ -350,6 +359,8 @@ class OptimizedPowerDampingParam(DampingParam):
350359
"""
351360

352361
def __init__(self, **kwargs):
362+
_rename_kwargs(kwargs, "alpha6", "alp")
363+
_rename_kwargs(kwargs, "beta", "bet")
353364
DampingParam.__init__(self, **kwargs)
354365

355366
@staticmethod
@@ -464,3 +475,9 @@ def _ref(ctype, value):
464475
ref = library.ffi.new(ctype + "*")
465476
ref[0] = value
466477
return ref
478+
479+
480+
def _rename_kwargs(kwargs, old_name, new_name):
481+
if old_name in kwargs and new_name not in kwargs:
482+
kwargs[new_name] = kwargs[old_name]
483+
del kwargs[old_name]

python/dftd3/meson.build

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,11 @@ if install
6161
'library.py',
6262
'interface.py',
6363
'parameters.py',
64+
'qcschema.py',
6465
'test_library.py',
6566
'test_interface.py',
6667
'test_parameters.py',
68+
'test_qcschema.py',
6769
subdir: 'dftd3',
6870
)
6971
endif

python/dftd3/test_qcschema.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,9 @@ def test_gradient_tpss_d3zero():
190190
},
191191
keywords={
192192
"params_tweaks": {
193-
"rs6": 1.166,
193+
"sr6": 1.166,
194194
"s8": 1.105,
195+
"alpha6": 14.0,
195196
},
196197
"level_hint": "d3zero",
197198
},

python/setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[metadata]
22
name = dftd3-python
3-
version = 0.5.0
3+
version = 0.5.1
44
desciption = Python API of the DFT-D3 project
55
long_desciption = file: README.rst
66
long_description_content_type = text/x-rst

src/dftd3/version.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ module dftd3_version
2424

2525

2626
!> String representation of the s-dftd3 version
27-
character(len=*), parameter :: dftd3_version_string = "0.5.0"
27+
character(len=*), parameter :: dftd3_version_string = "0.5.1"
2828

2929
!> Numeric representation of the s-dftd3 version
30-
integer, parameter :: dftd3_version_compact(3) = [0, 5, 0]
30+
integer, parameter :: dftd3_version_compact(3) = [0, 5, 1]
3131

3232

3333
contains

0 commit comments

Comments
 (0)