Skip to content

Commit 7c173b2

Browse files
committed
Merge branch 'release-0.15.0' into develop
2 parents 7aae62e + 1885f1e commit 7c173b2

3 files changed

Lines changed: 5 additions & 6 deletions

File tree

‎docs/conf.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,17 @@
5353

5454
# General information about the project.
5555
project = u'yMMSL Python bindings'
56-
copyright = u'2018-2023, Netherlands eScience Center and University of Amsterdam,
57-
2022-2023, 2026 The ITER Organisation, 2024-2026 Netherlands eScience Center'
56+
copyright = u'2018-2023, Netherlands eScience Center and University of Amsterdam, 2022-2023, 2026 The ITER Organisation, 2024-2026 Netherlands eScience Center'
5857
author = u'Lourens Veen'
5958

6059
# The version info for the project you're documenting, acts as replacement for
6160
# |version| and |release|, also used in various other places throughout the
6261
# built documents.
6362
#
6463
# The short X.Y version.
65-
version = u'0.14.1'
64+
version = u'0.15.1'
6665
# The full version, including alpha/beta/rc tags.
67-
release = u'0.14.1-dev'
66+
release = u'0.15.1-dev'
6867

6968
# The language for content autogenerated by Sphinx. Refer to documentation
7069
# for a list of supported languages.

‎setup.py‎

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

99
setup(
1010
name='ymmsl',
11-
version='0.14.1-dev',
11+
version='0.15.1-dev',
1212
description="Python bindings for the YAML version of the Multiscale Modeling and Simulation Language",
1313
long_description=readme + '\n\n',
1414
author="Lourens Veen",

‎ymmsl/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from ymmsl.v0_2 import Operator, Settings
1212

1313

14-
__version__ = '0.14.1-dev'
14+
__version__ = '0.15.1-dev'
1515
__author__ = 'Lourens Veen'
1616
__email__ = 'l.veen@esciencecenter.nl'
1717

0 commit comments

Comments
 (0)