Merge pull request #169 from CliMT/master

Merging master into develop

.github/workflows/python-package.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-18.04, macos-10.15]
+        os: [ubuntu-20.04, macos-11]
         python-version: [py37, py38, py39, py310]
     steps:
     - uses: actions/checkout@v2

.github/workflows/release_climt.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-18.04,macOS-10.15]
+        os: [ubuntu-20.04,macOS-11]
         #, windows-2019, macOS-10.15]
 
     steps:
@@ -20,7 +20,7 @@ jobs:
       - uses: actions/setup-python@v2
 
       - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==1.10.0
+        run: python -m pip install cibuildwheel==2.12.0
 
      # - name: Build wheels
      #  run: python -m cibuildwheel --output-dir wheelhouse
@@ -31,26 +31,33 @@ jobs:
 
       - name: Build on Linux
         env:
-          CIBW_BUILD: cp36-manylinux_x86_64 cp37-manylinux_x86_64 cp38-manylinux_x86_64
+          CIBW_BUILD: cp310-manylinux_x86_64 cp38-manylinux_x86_64 cp39-manylinux_x86_64
           CIBW_ENVIRONMENT: "CC=gcc FC=gfortran CLIMT_ARCH=Linux"
         if: ${{ runner.os == 'Linux' }}
         run: python -m cibuildwheel --output-dir wheelhouse
 
 
       - name: Build on macOS
         env:
-          CIBW_BUILD: cp36-macosx_x86_64 cp37-macosx_x86_64 cp38-macosx_x86_64
-          CIBW_ENVIRONMENT: "CC=gcc-8 FC=gfortran-8 CLIMT_ARCH=Darwin"
-          CIBW_BEFORE_ALL_MACOS: brew remove gcc; brew install gcc@8
+          CIBW_BUILD: cp310-macosx_x86_64 cp38-macosx_x86_64 cp39-macosx_x86_64
+          CIBW_ARCHS_MACOS: "x86_64"
+          CIBW_ENVIRONMENT: "CLIMT_ARCH=Darwin"
+          # CIBW_ENVIRONMENT: "CC=gcc-8 FC=gfortran-8 CLIMT_ARCH=Darwin"
+          # CIBW_BEFORE_ALL_MACOS: brew remove gcc; brew install gcc@8
         if: ${{ runner.os == 'macOS' }}
         run: python -m cibuildwheel --output-dir wheelhouse
 
+          #- uses: actions/upload-artifact@v3
+          #with:
+          #  name: my-artifact
+          #  path: dist/
+          #  if-no-files-found: error
 
       - name: Install twine
         run: python -m pip install twine
 
       - name: upload wheels
         env:
-          TWINE_USERNAME: __token__
+          TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }}
           TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
         run: twine upload wheelhouse/* --verbose

.github/workflows/windows-package.yml

@@ -16,7 +16,7 @@ jobs:
         shell: bash -l {0}
     strategy:
       matrix:
-        python-version: ["3.6"]
+        python-version: ["3.7"]
     steps:
     - uses: actions/checkout@v2
     - uses: conda-incubator/setup-miniconda@v2
@@ -29,7 +29,7 @@ jobs:
           export CLIMT_OPT_FLAGS=-fno-asynchronous-unwind-tables
           conda activate test
           which python
-          # conda install -c msys2 m2w64-gcc m2w64-gcc-fortran m2w64-winpthreads-git m2w64-openblas
+          conda install -c msys2 m2w64-gcc m2w64-gcc-fortran m2w64-winpthreads-git m2w64-openblas
           conda install libpython
           which gcc
           which gfortran
@@ -38,8 +38,8 @@ jobs:
           ls $HOME; cat $HOME/pydistutils.cfg
           python -m pip install -r requirements_dev.txt
           touch libmsvcr140.dll
-          # cp /c/Miniconda/envs/test/Library/bin/vcruntime140.dll /c/Miniconda/envs/test/Library/bin/msvcr140.dll
-          # ls -l
+          cp /c/Miniconda/envs/test/Library/bin/vcruntime140.dll /c/Miniconda/envs/test/Library/bin/msvcr140.dll
+          ls -l
           python setup.py develop
           py.test -v
 

HISTORY.rst

@@ -2,8 +2,8 @@
 History
 =======
 
-Latest
--------
+v.0.17.0
+--------
 
 * Removed dycore to move it to independent package
 

climt/__init__.py

@@ -28,4 +28,4 @@
     EmanuelConvection, SlabSurface, DcmipInitialConditions,
     IceSheet, Instellation, DryConvectiveAdjustment, BucketHydrology)
 
-__version__ = '0.16.25'
+__version__ = '0.17.12'

requirements_dev.txt

@@ -17,4 +17,4 @@ numpy>=1.16.0
 cython>=0.25
 ipython>=5.3.0
 coveralls
-sympl==0.4.0
+sympl==0.4.1

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.16.25
+current_version = 0.17.12
 commit = True
 tag = False
 

setup.py

@@ -40,7 +40,7 @@
     'numpy>=1.16.0',
     'pint>=0.7.0',
     'xarray>=0.8.0',
-    'sympl==0.4.0',
+    'sympl==0.4.1',
     'cython>=0.25',
     'scipy>=0.18.1',
 ]
@@ -236,7 +236,7 @@ def run(self):
 
 setup(
     name='climt',
-    version='0.16.25',
+    version='0.17.12',
     description='CliMT is a Toolkit for building Earth system models in Python.',
     long_description=readme + '\n\n' + history,
     author="Rodrigo Caballero",