Merge branch 'master' into develop

GeoscienceAustralia · Feb 14, 2024 · 234d801 · 234d801
2 parents fb357e8 + a05f812
commit 234d801
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/tcrm-pylint.yml b/.github/workflows/tcrm-pylint.yml
@@ -23,6 +23,7 @@ jobs:
         auto-activate-base: false
         use-only-tar-bz2: true
 
+
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

diff --git a/.github/workflows/tcrm-tests.yml b/.github/workflows/tcrm-tests.yml
@@ -28,7 +28,7 @@ jobs:
         activate-environment: tcrm
         environment-file: tcrmenv.yml
         auto-activate-base: false
-        use-only-tar-bz2: true
+        use-only-tar-bz2: tru
 
 
     - name: Test with pytest

diff --git a/tcrmenv.yml b/tcrmenv.yml
@@ -21,7 +21,7 @@ dependencies:
   - sqlite
   - statsmodels
   - configparser
-  - cartopy
+  - cartopy>=0.18.0
   - affine
   - tqdm
   - xarray