diff --git a/.github/workflows/pylag-package-conda-linux.yml b/.github/workflows/pylag-package-conda-linux.yml index d6f7209..7f6a9e1 100644 --- a/.github/workflows/pylag-package-conda-linux.yml +++ b/.github/workflows/pylag-package-conda-linux.yml @@ -18,7 +18,7 @@ jobs: with: activate-environment: "pylag_test" auto-activate-base: false - channels: conda-forge,JimClark + channels: conda-forge auto-update-conda: true environment-file: environment.yml python-version: ${{ matrix.python-version }} @@ -27,10 +27,10 @@ jobs: run: | conda info conda list - - name: Install local changes + - name: Install package shell: bash -l {0} run: | - python -m pip install . + python -m pip install -e . # - name: Lint # shell: bash -l {0} # run: | diff --git a/environment.yml b/environment.yml index f99cb3f..4562907 100644 --- a/environment.yml +++ b/environment.yml @@ -1,5 +1,18 @@ name: pylag channels: - - JimClark + - conda-forge dependencies: - - pylag + - python + - mpi4py + - numpy>=1.20 + - scipy>=1.4.1 + - cython>=0.29 + - progressbar + - natsort + - netCDF4 + - cftime>=1.1 + - configparser + - stripy + - shapely + - pyproj + - nose2 diff --git a/pylag/grid_metrics.pyx b/pylag/grid_metrics.pyx index 0ca8a51..6f50e57 100644 --- a/pylag/grid_metrics.pyx +++ b/pylag/grid_metrics.pyx @@ -198,7 +198,7 @@ def create_fvcom_grid_metrics_file(fvcom_file_name: str, variable_names: Optional[dict]={}, obc_file_name: Optional[str]=None, obc_file_delimiter: Optional[str]=' ', - central_latitude: Optional[float]=0.0, + central_latitude: Optional[int]=0, grid_metrics_file_name: Optional[str]='./grid_metrics.nc'): """Create FVCOM grid metrics file @@ -659,7 +659,7 @@ def create_arakawa_a_grid_metrics_file(file_name, lon_var_name='longitude', reference_var_name=None, bathymetry_var_name=None, dim_names=None, is_global=False, surface_only=False, save_mask=True, prng_seed=10, masked_vertices_per_element=0, - central_latitude: Optional[int]=0.0, + central_latitude: Optional[int]=0, grid_metrics_file_name='./grid_metrics.nc'): """ Create a Arakawa A-grid metrics file