Merge pull request #175 from brey/dev

Dev

.github/workflows/conda_pip.yml

@@ -41,7 +41,7 @@ jobs:
           python-version: "3.10"
 
       - name: "Install Python dependencies"
-        run: "pip install 'black<24'"
+        run: "pip install 'black'"
 
       - name: "Run linters"
         run: "black --check ./"
@@ -58,7 +58,7 @@ jobs:
         # mpi: [ "mpich", "openmpi" ]
         os: [ "ubuntu-latest"]
         mpi: [ "openmpi" ]
-        python: [ "3.9", "3.10", "3.11" ]
+        python: [ "3.9", "3.10", "3.11", "3.12" ]
 
     env:
       SCHISM_ENV: "SCHISM_ENV"
@@ -149,6 +149,12 @@ jobs:
         if: steps.cache-PYPOSEIDON_ENV.outputs.cache-hit != 'true'
         run: micromamba create --yes --name ${PYPOSEIDON_ENV} -f ${PYPOSEIDON_LOCK}
 
+      - name: "Check schism version"
+        run: |
+          eval "$(micromamba shell hook)"
+          micromamba activate "${SCHISM_ENV}"
+          schism -v
+
       - name: "Install python dependencies"
         run: |
           eval "$(micromamba shell hook)"

README.md

@@ -1,7 +1,7 @@
 Framework for Sea Level Hydrodynamic simulations
 ================================================
 
-[![Documentation Status](https://readthedocs.org/projects/pyposeidon/badge/?version=latest)](https://pyposeidon.readthedocs.io/en/latest/?badge=latest) ![GitHub release (latest by date)](https://img.shields.io/github/v/release/ec-jrc/pyPoseidon) ![CI](https://github.com/ec-jrc/pyPoseidon/actions/workflows/conda_pip.yml/badge.svg) ![CI](https://github.com/ec-jrc/pyPoseidon/actions/workflows/conda_only.yml/badge.svg) ![CI](https://github.com/ec-jrc/pyPoseidon/actions/workflows/code_quality.yml/badge.svg) [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/ec-jrc/pyPoseidon/master?urlpath=%2Flab)
+[![Documentation Status](https://readthedocs.org/projects/pyposeidon/badge/?version=latest)](https://pyposeidon.readthedocs.io/en/latest/?badge=latest) ![GitHub release (latest by date)](https://img.shields.io/github/v/release/ec-jrc/pyPoseidon) ![CI](https://github.com/ec-jrc/pyPoseidon/actions/workflows/conda_pip.yml/badge.svg) [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/ec-jrc/pyPoseidon/master?urlpath=%2Flab)
 
 This is a development project utilising multiple solvers (currently `DELFT3D` & `SCHISM`) for simulating sea level height (currently only storm surge). The purpose is to create a simple, portable and transparent way of setting up, running and analysing hydrodynamic computations through python scripts and Jupyter Notebooks (http://jupyter.org). See Notebooks in Tutorial/ for relevant prototypes.
 

dependencies/python3.12.yml

@@ -0,0 +1,5 @@
+channels:
+  - gbrey
+  - conda-forge
+dependencies:
+  - python=3.12

environments/base-p3.12.yml

@@ -0,0 +1,36 @@
+channels:
+  - conda-forge
+  - gbrey
+dependencies:
+  - cartopy
+  - cfgrib
+  - colorlog
+  - compilers
+  - dask
+  - eccodes
+  - f90nml
+  - ffmpeg
+  - gdal
+  - geopandas
+  - geos
+  - gmsh>=4.9.3
+  - jigsaw>=0.9.12
+  - jinja2
+  - netCDF4
+  - numpy
+  - pandas<2
+  - pip
+  - proj
+  - psutil
+  - pydap>=3.3.0
+  - pyresample
+  - python-gmsh
+  - python=3.12
+  - rasterio
+  - requests
+  - rioxarray
+  - scipy
+  - searvey
+  - shapely>=2
+  - tqdm
+  - xarray

environments/binary-p3.12.yml

@@ -0,0 +1,14 @@
+channels:
+  - conda-forge
+  - gbrey
+dependencies:
+  - compilers
+  - eccodes
+  - ffmpeg
+  - gdal
+  - geos
+  - gmsh>=4.9.3
+  - jigsaw>=0.9.12
+  - pip
+  - proj
+  - python=3.12

environments/full-p3.12.yml

@@ -0,0 +1,54 @@
+channels:
+  - conda-forge
+  - gbrey
+dependencies:
+  - black<24.0
+  - bump2version
+  - cartopy
+  - cfgrib
+  - colorlog
+  - compilers
+  - dask
+  - eccodes
+  - f90nml
+  - ffmpeg
+  - gdal
+  - geopandas
+  - geos
+  - geoviews
+  - gmsh>=4.9.3
+  - holoviews
+  - hvplot
+  - ipykernel
+  - ipympl
+  - jigsaw>=0.9.12
+  - jinja2
+  - matplotlib>=3.3
+  - mayavi
+  - mkdocs
+  - mkdocs-material
+  - mkdocstrings
+  - netCDF4
+  - numpy
+  - pandas<2
+  - pip
+  - proj
+  - psutil
+  - pydap>=3.3.0
+  - pymdown-extensions
+  - pyresample
+  - pytest
+  - pytest-cov
+  - pytest-xdist
+  - python-gmsh
+  - python=3.12
+  - rasterio
+  - requests
+  - rioxarray
+  - ruamel.yaml
+  - scipy
+  - searvey
+  - shapely>=2
+  - spatialpandas
+  - tqdm
+  - xarray

environments/viz-p3.12.yml

@@ -0,0 +1,43 @@
+channels:
+  - conda-forge
+  - gbrey
+dependencies:
+  - cartopy
+  - cfgrib
+  - colorlog
+  - compilers
+  - dask
+  - eccodes
+  - f90nml
+  - ffmpeg
+  - gdal
+  - geopandas
+  - geos
+  - geoviews
+  - gmsh>=4.9.3
+  - holoviews
+  - hvplot
+  - ipympl
+  - jigsaw>=0.9.12
+  - jinja2
+  - matplotlib>=3.3
+  - mayavi
+  - netCDF4
+  - numpy
+  - pandas<2
+  - pip
+  - proj
+  - psutil
+  - pydap>=3.3.0
+  - pyresample
+  - python-gmsh
+  - python=3.12
+  - rasterio
+  - requests
+  - rioxarray
+  - scipy
+  - searvey
+  - shapely>=2
+  - spatialpandas
+  - tqdm
+  - xarray