Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Jan 1, 2024
1 parent 5ed1978 commit 7e19202
Show file tree
Hide file tree
Showing 9 changed files with 37 additions and 37 deletions.
6 changes: 3 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 2
updates:
- package-ecosystem: 'github-actions'
directory: '/'
- package-ecosystem: "github-actions"
directory: "/"
schedule:
# Check for updates once a week
interval: 'weekly'
interval: "weekly"
2 changes: 1 addition & 1 deletion .github/workflows/cancel-duplicate-runs.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Cancel
on:
workflow_run:
workflows: ['CI']
workflows: ["CI"]
types:
- requested
jobs:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-upstream-dev.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Upstream-dev CI
on:
schedule:
- cron: '0 0 * * *' # Daily “At 00:00”
- cron: "0 0 * * *" # Daily “At 00:00”
jobs:
upstream-dev:
name: upstream-dev
Expand All @@ -15,7 +15,7 @@ jobs:
with:
channels: conda-forge,nodefaults
channel-priority: strict
mamba-version: '*'
mamba-version: "*"
activate-environment: pop-tools-dev
auto-update-conda: false
python-version: 3.8
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ name: CI
on:
push:
branches:
- '*'
- "*"
pull_request:
branches:
- '*'
- "*"
schedule:
- cron: '0 0 * * *' # Daily “At 00:00”
- cron: "0 0 * * *" # Daily “At 00:00”
workflow_dispatch: # allows you to trigger manually

concurrency:
Expand All @@ -24,14 +24,14 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.8', '3.11']
python-version: ["3.8", "3.11"]
steps:
- uses: actions/checkout@v3
- uses: conda-incubator/setup-miniconda@v2
with:
channels: conda-forge,nodefaults
channel-priority: strict
mamba-version: '*'
mamba-version: "*"
activate-environment: pop-tools-dev
auto-update-conda: false
python-version: ${{ matrix.python-version }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.x'
python-version: "3.x"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ repos:
hooks:
- id: pyupgrade
args:
- '--py37-plus'
- "--py37-plus"

- repo: https://github.com/psf/black
rev: 23.12.1
Expand Down
4 changes: 2 additions & 2 deletions codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ codecov:
comment: false

ignore:
- 'tests/*.py'
- 'setup.py'
- "tests/*.py"
- "setup.py"

coverage:
precision: 2
Expand Down
40 changes: 20 additions & 20 deletions pop_tools/pop_grid_definitions.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
POP_gx3v7:
lateral_dims: [116, 100]
vertical_dims: 60
vert_grid_file: 'gx3v7_vert_grid'
horiz_grid_fname: 'inputdata/ocn/pop/gx3v7/grid/horiz_grid_20030806.ieeer8'
topography_fname: 'inputdata/ocn/pop/gx3v7/grid/topography_20100105.ieeei4'
region_mask_fname: 'inputdata/ocn/pop/gx3v7/grid/region_mask_20090831.ieeei4'
vert_grid_file: "gx3v7_vert_grid"
horiz_grid_fname: "inputdata/ocn/pop/gx3v7/grid/horiz_grid_20030806.ieeer8"
topography_fname: "inputdata/ocn/pop/gx3v7/grid/topography_20100105.ieeei4"
region_mask_fname: "inputdata/ocn/pop/gx3v7/grid/region_mask_20090831.ieeei4"
type: dipole

POP_gx1v7:
lateral_dims: [384, 320]
vertical_dims: 60
vert_grid_file: 'gx1v7_vert_grid'
horiz_grid_fname: 'inputdata/ocn/pop/gx1v7/grid/horiz_grid_20010402.ieeer8'
topography_fname: 'inputdata/ocn/pop/gx1v7/grid/topography_20161215.ieeei4'
region_mask_fname: 'inputdata/ocn/pop/gx1v7/grid/region_mask_20151008.ieeei4'
vert_grid_file: "gx1v7_vert_grid"
horiz_grid_fname: "inputdata/ocn/pop/gx1v7/grid/horiz_grid_20010402.ieeer8"
topography_fname: "inputdata/ocn/pop/gx1v7/grid/topography_20161215.ieeei4"
region_mask_fname: "inputdata/ocn/pop/gx1v7/grid/region_mask_20151008.ieeei4"
type: dipole
region_mask_regions:
Black Sea: -13
Expand All @@ -33,10 +33,10 @@ POP_gx1v7:
POP_gx1v6:
lateral_dims: [384, 320]
vertical_dims: 60
vert_grid_file: 'gx1v7_vert_grid'
horiz_grid_fname: 'inputdata/ocn/pop/gx1v6/grid/horiz_grid_20010402.ieeer8'
topography_fname: 'inputdata/ocn/pop/gx1v6/grid/topography_20090204.ieeei4'
region_mask_fname: 'inputdata/ocn/pop/gx1v6/grid/region_mask_20090205.ieeei4'
vert_grid_file: "gx1v7_vert_grid"
horiz_grid_fname: "inputdata/ocn/pop/gx1v6/grid/horiz_grid_20010402.ieeer8"
topography_fname: "inputdata/ocn/pop/gx1v6/grid/topography_20090204.ieeei4"
region_mask_fname: "inputdata/ocn/pop/gx1v6/grid/region_mask_20090205.ieeei4"
type: dipole
region_mask_regions:
Caspian Sea: -14
Expand All @@ -57,17 +57,17 @@ POP_gx1v6:
POP_tx0.1v3:
lateral_dims: [2400, 3600]
vertical_dims: 62
vert_grid_file: 'tx0.1v3_vert_grid'
horiz_grid_fname: 'inputdata/ocn/pop/tx0.1v3/grid/horiz_grid_200709.ieeer8'
topography_fname: 'inputdata/ocn/pop/tx0.1v3/grid/topography_20170718.ieeei4'
region_mask_fname: 'inputdata/ocn/pop/tx0.1v3/grid/region_mask_20170718.ieeei4'
vert_grid_file: "tx0.1v3_vert_grid"
horiz_grid_fname: "inputdata/ocn/pop/tx0.1v3/grid/horiz_grid_200709.ieeer8"
topography_fname: "inputdata/ocn/pop/tx0.1v3/grid/topography_20170718.ieeei4"
region_mask_fname: "inputdata/ocn/pop/tx0.1v3/grid/region_mask_20170718.ieeei4"
type: tripole

POP_tx0.1v2:
lateral_dims: [2400, 3600]
vertical_dims: 62
vert_grid_file: 'tx0.1v3_vert_grid'
horiz_grid_fname: 'inputdata/ocn/pop/tx0.1v2/grid/horiz_grid_200709.ieeer8'
topography_fname: 'inputdata/ocn/pop/tx0.1v2/grid/topography_km62_20171129.ieeei4'
region_mask_fname: 'inputdata/ocn/pop/tx0.1v2/grid/region_mask_20080702.ieeei4'
vert_grid_file: "tx0.1v3_vert_grid"
horiz_grid_fname: "inputdata/ocn/pop/tx0.1v2/grid/horiz_grid_200709.ieeer8"
topography_fname: "inputdata/ocn/pop/tx0.1v2/grid/topography_km62_20171129.ieeei4"
region_mask_fname: "inputdata/ocn/pop/tx0.1v2/grid/region_mask_20080702.ieeei4"
type: tripole
4 changes: 2 additions & 2 deletions readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ version: 2
conda:
environment: docs/environment.yml
build:
os: 'ubuntu-20.04'
os: "ubuntu-20.04"
tools:
python: 'mambaforge-4.10'
python: "mambaforge-4.10"

0 comments on commit 7e19202

Please sign in to comment.