Skip to content

Commit 54d0342

Browse files
authored
Merge pull request #171 from CliMT/develop
Updating to py311
2 parents 556487e + 4ded97c commit 54d0342

File tree

8 files changed

+26
-14
lines changed

8 files changed

+26
-14
lines changed

.github/workflows/release_climt.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131

3232
- name: Build on Linux
3333
env:
34-
CIBW_BUILD: cp310-manylinux_x86_64 cp38-manylinux_x86_64 cp39-manylinux_x86_64
34+
CIBW_BUILD: cp311-manylinux_x86_64 cp310-manylinux_x86_64 cp38-manylinux_x86_64 cp39-manylinux_x86_64
3535
CIBW_ENVIRONMENT: "CC=gcc FC=gfortran CLIMT_ARCH=Linux"
3636
if: ${{ runner.os == 'Linux' }}
3737
run: python -m cibuildwheel --output-dir wheelhouse

.github/workflows/windows-package.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
push:
77
branches: [ master, without-dycore ]
88
pull_request:
9-
branches: [ develop ]
9+
branches: [ master ]
1010

1111
jobs:
1212
windows_package:

README.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,13 @@ https://sympl.readthedocs.io.
6363
Installation
6464
-------------
6565

66+
Note - The GFS dynamical core has been made into a seperate package called
67+
gfs_dynamical_core_ for ease of maintenance. If you need the dynamical core,
68+
please install this package from source or directly using pip. Doing this will
69+
automatically install climt as well.
70+
71+
pip install gfs_dynamical_core
72+
6673
climt can be installed directly from the python package index using pip.
6774

6875
pip install climt
@@ -102,3 +109,5 @@ This package was created with Cookiecutter_ and the `audreyr/cookiecutter-pypack
102109
.. _Pint: https://pint.readthedocs.io
103110
.. _xarray: http://xarray.pydata.org
104111
.. _documentation: http://climt.readthedocs.io/en/latest/installation.html
112+
.. _gfs_dynamical_core: https://github.com/Ai33L/gfs_dynamical_core
113+

climt/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@
2828
EmanuelConvection, SlabSurface, DcmipInitialConditions,
2929
IceSheet, Instellation, DryConvectiveAdjustment, BucketHydrology)
3030

31-
__version__ = '0.17.12'
31+
__version__ = '0.17.13'

docs/components.rst

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,6 @@ Components
88
This page documents the different components available through climt.
99

1010

11-
Dynamics
12-
---------
13-
14-
.. autosummary::
15-
:toctree: generated/
16-
17-
GFSDynamicalCore
18-
GFSDynamicalCore.__call__
19-
2011
Radiation
2112
---------
2213

docs/installation.rst

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,17 @@ Installation
77
Stable release
88
--------------
99

10+
.. NOTE::
11+
The GFS dynamical core has been made into a seperate package called
12+
gfs_dynamical_core_ for ease of maintenance.
13+
14+
If you need the dynamical core, please install this package from source or
15+
directly using pip. Doing this will automatically install climt as well.
16+
17+
.. code-block:: console
18+
19+
$ pip install gfs_dynamical_core
20+
1021
You can install climt by simply typing
1122

1223
.. code-block:: console
@@ -97,3 +108,4 @@ compile OpenMP programs, like the dynamical core in climt.
97108
.. _Github repo: https://github.com/climt/climt
98109
.. _tarball: https://github.com/CliMT/climt/tarball/master
99110
.. _anaconda: https://www.continuum.io/downloads
111+
.. _gfs_dynamical_core: https://github.com/Ai33L/gfs_dynamical_core

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 0.17.12
2+
current_version = 0.17.13
33
commit = True
44
tag = False
55

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ def run(self):
236236

237237
setup(
238238
name='climt',
239-
version='0.17.12',
239+
version='0.17.13',
240240
description='CliMT is a Toolkit for building Earth system models in Python.',
241241
long_description=readme + '\n\n' + history,
242242
author="Rodrigo Caballero",

0 commit comments

Comments
 (0)