From 95a4e406046b52d4c25fdd4901177e8fb4d1a54c Mon Sep 17 00:00:00 2001
From: Ariana-B <40238244+Ariana-B@users.noreply.github.com>
Date: Mon, 23 Dec 2024 11:52:05 +1100
Subject: [PATCH] Get ready for 1.9 release (#366)

* get ready for 1.9 release

* fix deepdiff usage

---------

Co-authored-by: Ariana Barzinpour <ariana.barzinpour@ga.gov.au>
---
 .github/workflows/docker.yml | 2 ++
 setup.py                     | 4 ++--
 tests/common.py              | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 1a2cfddb..47269dff 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -7,12 +7,14 @@ on:
   push:
     branches:
       - develop
+      - integrate-1.9
     paths:
       - "**"
 
   pull_request:
     branches:
       - develop
+      - integrate-1.9
 
   release:
     types: [published]
diff --git a/setup.py b/setup.py
index ea99cd97..5c66c44e 100755
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,7 @@
 
 
 tests_require = [
-    "deepdiff",
+    "deepdiff>=8.0",
     "gdal",
     "mock",
     "pep8-naming",
@@ -78,7 +78,7 @@
         "fiona",
         "h5py",
         "jsonschema>=4.18",  # We want a Draft6Validator
-        "numpy>=1.15.4",
+        "numpy>=1.15.4,<2.0",
         "pyproj",
         "rasterio",
         "ruamel.yaml",
diff --git a/tests/common.py b/tests/common.py
index 75f51076..db945233 100644
--- a/tests/common.py
+++ b/tests/common.py
@@ -200,12 +200,12 @@ def clean_offset(offset: str):
             )
     if "dictionary_item_added" in doc_diffs:
         out.append("Added fields:")
-        for offset in doc_diffs.tree["dictionary_item_added"].items:
+        for offset in doc_diffs.tree["dictionary_item_added"]:
             offset: DiffLevel
             out.append(f"    {clean_offset(offset.path())} = {offset.t2!r}")
     if "dictionary_item_removed" in doc_diffs:
         out.append("Removed fields:")
-        for offset in doc_diffs.tree["dictionary_item_removed"].items:
+        for offset in doc_diffs.tree["dictionary_item_removed"]:
             offset: DiffLevel
             out.append(f"    {clean_offset(offset.path())} = {offset.t1!r}")
     # Anything we missed from the (sometimes changing) diff api?