Skip to content

Commit

Permalink
Merge pull request #1001 from xylar/update-to-1.11.0
Browse files Browse the repository at this point in the history
Update to v1.11.0
  • Loading branch information
xylar committed Apr 30, 2024
2 parents 3ff2e5c + b884dc7 commit e57f81c
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion ci/recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set name = "MPAS-Analysis" %}
{% set version = "1.10.0" %}
{% set version = "1.11.0rc1" %}

package:
name: {{ name|lower }}
Expand Down
3 changes: 3 additions & 0 deletions docs/versions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Documentation On GitHub
`v1.8.0`_ `1.8.0`_
`v1.9.0`_ `1.9.0`_
`v1.10.0`_ `1.10.0`_
`v1.11.0`_ `1.11.0`_
================ ===============

.. _`stable`: ../stable/index.html
Expand All @@ -40,6 +41,7 @@ Documentation On GitHub
.. _`v1.8.0`: ../1.8.0/index.html
.. _`v1.9.0`: ../1.9.0/index.html
.. _`v1.10.0`: ../1.10.0/index.html
.. _`v1.11.0`: ../1.11.0/index.html
.. _`main`: https://github.com/MPAS-Dev/MPAS-Analysis/tree/main
.. _`develop`: https://github.com/MPAS-Dev/MPAS-Analysis/tree/develop
.. _`1.2.6`: https://github.com/MPAS-Dev/MPAS-Analysis/tree/1.2.6
Expand All @@ -57,3 +59,4 @@ Documentation On GitHub
.. _`1.8.0`: https://github.com/MPAS-Dev/MPAS-Analysis/tree/1.8.0
.. _`1.9.0`: https://github.com/MPAS-Dev/MPAS-Analysis/tree/1.9.0
.. _`1.10.0`: https://github.com/MPAS-Dev/MPAS-Analysis/tree/1.10.0
.. _`1.11.0`: https://github.com/MPAS-Dev/MPAS-Analysis/tree/1.11.0
2 changes: 1 addition & 1 deletion mpas_analysis/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
import matplotlib as mpl
mpl.use('Agg')

__version_info__ = (1, 10, 0)
__version_info__ = (1, 11, 0)
__version__ = '.'.join(str(vi) for vi in __version_info__)
5 changes: 2 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,8 @@
with open(os.path.join(here, 'mpas_analysis', '__init__.py')) as f:
init_file = f.read()

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

setup(name='mpas_analysis',
version=version,
Expand Down

0 comments on commit e57f81c

Please sign in to comment.