From 76d915b560c0b42907be588c32931a48532ef8dd Mon Sep 17 00:00:00 2001 From: James Clark Date: Thu, 20 Jun 2024 12:08:35 +0100 Subject: [PATCH 1/7] Fix absence of advection in example --- doc/source/examples/lateral_adv_diff_analytic.ipynb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/source/examples/lateral_adv_diff_analytic.ipynb b/doc/source/examples/lateral_adv_diff_analytic.ipynb index 376ecf8..fdcdde4 100644 --- a/doc/source/examples/lateral_adv_diff_analytic.ipynb +++ b/doc/source/examples/lateral_adv_diff_analytic.ipynb @@ -1465,6 +1465,10 @@ "config.set(\"SIMULATION\", \"depth_restoring\", \"False\")\n", "config.set(\"SIMULATION\", \"fixed_depth\", \"0.0\")\n", "\n", + "# Specify the source of ocean current data which ensures data will be read\n", + "config.add_section(\"OCEAN_DATA\")\n", + "config.set(\"OCEAN_DATA\", \"name\", \"mock\")\n", + "\n", "# The data reader\n", "data_reader = MockVelocityEddyDiffusivityDataReader()\n", "\n", From 9432a20c04937af4c716c5576a17611c8c9fdec0 Mon Sep 17 00:00:00 2001 From: Jim Clark Date: Fri, 21 Jun 2024 11:41:18 +0100 Subject: [PATCH 2/7] Invoke pytest using python -m pytest --- .github/workflows/pylag-package-conda-linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pylag-package-conda-linux.yml b/.github/workflows/pylag-package-conda-linux.yml index 7f6a9e1..22e9f8e 100644 --- a/.github/workflows/pylag-package-conda-linux.yml +++ b/.github/workflows/pylag-package-conda-linux.yml @@ -41,4 +41,4 @@ jobs: shell: bash -l {0} run: | conda install pytest - pytest + python -m pytest From c0a3f60d1d20fe994ec98b107e36ec68e23ee2c3 Mon Sep 17 00:00:00 2001 From: Jim Clark Date: Fri, 21 Jun 2024 12:48:06 +0100 Subject: [PATCH 3/7] Increase verbosity of pytest --- .github/workflows/pylag-package-conda-linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pylag-package-conda-linux.yml b/.github/workflows/pylag-package-conda-linux.yml index 22e9f8e..1016342 100644 --- a/.github/workflows/pylag-package-conda-linux.yml +++ b/.github/workflows/pylag-package-conda-linux.yml @@ -41,4 +41,4 @@ jobs: shell: bash -l {0} run: | conda install pytest - python -m pytest + python -m pytest -v From ed5df39ccc123d02176e216ab0744f259030dd1b Mon Sep 17 00:00:00 2001 From: Jim Clark Date: Fri, 21 Jun 2024 13:13:36 +0100 Subject: [PATCH 4/7] Add pytest to environment.yml --- environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/environment.yml b/environment.yml index 4562907..5eea2da 100644 --- a/environment.yml +++ b/environment.yml @@ -16,3 +16,4 @@ dependencies: - shapely - pyproj - nose2 + - pytest From 643acee3e759773dc3885967ba98de6fbac35677 Mon Sep 17 00:00:00 2001 From: Jim Clark Date: Fri, 21 Jun 2024 13:20:42 +0100 Subject: [PATCH 5/7] Update environment.yml --- environment.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/environment.yml b/environment.yml index 5eea2da..4562907 100644 --- a/environment.yml +++ b/environment.yml @@ -16,4 +16,3 @@ dependencies: - shapely - pyproj - nose2 - - pytest From 08fdc6176ad18c05d7a163910a89a7a68201a4ec Mon Sep 17 00:00:00 2001 From: Jim Clark Date: Fri, 21 Jun 2024 13:21:56 +0100 Subject: [PATCH 6/7] Run tests for 3.10, 3.11 and 3.12 --- .github/workflows/pylag-package-conda-linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pylag-package-conda-linux.yml b/.github/workflows/pylag-package-conda-linux.yml index 1016342..d8f274a 100644 --- a/.github/workflows/pylag-package-conda-linux.yml +++ b/.github/workflows/pylag-package-conda-linux.yml @@ -11,7 +11,7 @@ jobs: strategy: matrix: os: ["ubuntu-latest"] - python-version: ["3.9", "3.10", "3.11"] + python-version: ["3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v2 - uses: conda-incubator/setup-miniconda@v2 From 73e4e6f461ffef2886e14e8b94ad28f9eb57ae63 Mon Sep 17 00:00:00 2001 From: Jim Clark Date: Fri, 21 Jun 2024 13:39:37 +0100 Subject: [PATCH 7/7] Limit github actions to Python 3.10 and 3.11 --- .github/workflows/pylag-package-conda-linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pylag-package-conda-linux.yml b/.github/workflows/pylag-package-conda-linux.yml index d8f274a..e852098 100644 --- a/.github/workflows/pylag-package-conda-linux.yml +++ b/.github/workflows/pylag-package-conda-linux.yml @@ -11,7 +11,7 @@ jobs: strategy: matrix: os: ["ubuntu-latest"] - python-version: ["3.10", "3.11", "3.12"] + python-version: ["3.10", "3.11"] steps: - uses: actions/checkout@v2 - uses: conda-incubator/setup-miniconda@v2