Skip to content

Commit f24f15c

Browse files
authored
Merge pull request #994 from xylar/update-to-1.10.0
Update to v1.10.0
2 parents 22ccff9 + 86605b7 commit f24f15c

4 files changed

Lines changed: 8 additions & 4 deletions

File tree

ci/recipe/meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% set name = "MPAS-Analysis" %}
2-
{% set version = "1.9.1" %}
2+
{% set version = "1.10.0" %}
33

44
package:
55
name: {{ name|lower }}

docs/versions.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Documentation On GitHub
2020
`v1.7.2`_ `1.7.2`_
2121
`v1.8.0`_ `1.8.0`_
2222
`v1.9.0`_ `1.9.0`_
23+
`v1.10.0`_ `1.10.0`_
2324
================ ===============
2425

2526
.. _`stable`: ../stable/index.html
@@ -38,6 +39,7 @@ Documentation On GitHub
3839
.. _`v1.7.2`: ../1.7.2/index.html
3940
.. _`v1.8.0`: ../1.8.0/index.html
4041
.. _`v1.9.0`: ../1.9.0/index.html
42+
.. _`v1.10.0`: ../1.10.0/index.html
4143
.. _`main`: https://github.com/MPAS-Dev/MPAS-Analysis/tree/main
4244
.. _`develop`: https://github.com/MPAS-Dev/MPAS-Analysis/tree/develop
4345
.. _`1.2.6`: https://github.com/MPAS-Dev/MPAS-Analysis/tree/1.2.6
@@ -54,3 +56,4 @@ Documentation On GitHub
5456
.. _`1.7.2`: https://github.com/MPAS-Dev/MPAS-Analysis/tree/1.7.2
5557
.. _`1.8.0`: https://github.com/MPAS-Dev/MPAS-Analysis/tree/1.8.0
5658
.. _`1.9.0`: https://github.com/MPAS-Dev/MPAS-Analysis/tree/1.9.0
59+
.. _`1.10.0`: https://github.com/MPAS-Dev/MPAS-Analysis/tree/1.10.0

mpas_analysis/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
import matplotlib as mpl
44
mpl.use('Agg')
55

6-
__version_info__ = (1, 9, 1)
6+
__version_info__ = (1, 10, 0)
77
__version__ = '.'.join(str(vi) for vi in __version_info__)

setup.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,9 @@
4141
with open(os.path.join(here, 'mpas_analysis', '__init__.py')) as f:
4242
init_file = f.read()
4343

44-
version = re.search(r'{}\s*=\s*[(]([^)]*)[)]'.format('__version_info__'),
45-
init_file).group(1).replace(', ', '.')
44+
# version = re.search(r'{}\s*=\s*[(]([^)]*)[)]'.format('__version_info__'),
45+
# init_file).group(1).replace(', ', '.')
46+
version = '1.10.0rc2'
4647

4748
setup(name='mpas_analysis',
4849
version=version,

0 commit comments

Comments
 (0)