From 6ac5511e0f870160d65dd9833ebc8be261bc7f00 Mon Sep 17 00:00:00 2001
From: Eivind Jahren <eivind.jahren@webstep.no>
Date: Mon, 1 Feb 2021 08:48:11 +0100
Subject: [PATCH 1/2] Use requirements_test.txt in ci

requirements_dev.txt adds several packages not strictly necessary for
testing. A minimal set of dependencies required for testing, in addition
to those defined in requirements.txt, can now be found in
requirements_test.txt.
---
 .github/workflows/ci-test-xtgeo.yml | 2 +-
 ci/jenkins/testkomodo.sh            | 2 +-
 requirements_test.txt               | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 requirements_test.txt

diff --git a/.github/workflows/ci-test-xtgeo.yml b/.github/workflows/ci-test-xtgeo.yml
index 79166d98e..b5cff4ce5 100644
--- a/.github/workflows/ci-test-xtgeo.yml
+++ b/.github/workflows/ci-test-xtgeo.yml
@@ -11,7 +11,7 @@ env:
   CIBW_BEFORE_TEST: |
     cd {project}
     pip install -r requirements.txt
-    pip install pytest
+    pip install -r requirements_test.txt
 
   CIBW_TEST_COMMAND: |
     cd {project}
diff --git a/ci/jenkins/testkomodo.sh b/ci/jenkins/testkomodo.sh
index 263f29de0..9ca2536c4 100644
--- a/ci/jenkins/testkomodo.sh
+++ b/ci/jenkins/testkomodo.sh
@@ -14,7 +14,7 @@ install_package () {
 }
 
 install_test_dependencies () {
-    pip install -r requirements_dev.txt
+    pip install -r requirements_test.txt
 }
 
 start_tests () {
diff --git a/requirements_test.txt b/requirements_test.txt
new file mode 100644
index 000000000..e079f8a60
--- /dev/null
+++ b/requirements_test.txt
@@ -0,0 +1 @@
+pytest

From 283bca536eaf008cc228d012fcf7d75f8303d6c4 Mon Sep 17 00:00:00 2001
From: Eivind Jahren <eivind.jahren@webstep.no>
Date: Mon, 1 Feb 2021 09:13:16 +0100
Subject: [PATCH 2/2] Pin version of numpy to <1.20

Currently, xtgeo does not work with numpy>=1.20.
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 37b4a3038..495d79f49 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-numpy>=1.10.4
+numpy>=1.10.4,<1.20
 shapely>=1.6.2
 matplotlib>=1.5
 scipy>=0.17