Use dev-containers to develop ir-measures integration and fix tests

tira-io · Jul 17, 2023 · 344b8ae · 344b8ae
1 parent 1ddf65a
commit 344b8ae
Show file tree

Hide file tree

Showing 9 changed files with 313 additions and 225 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+__pycache__
diff --git a/ir-measures/.devcontainer.json b/ir-measures/.devcontainer.json
@@ -0,0 +1,13 @@
+{
+"image": "webis/ir_measures_evaluator:dev-1.0.6",
+//"image": "mcr.microsoft.com/devcontainers/python:1-3.11-bullseye",
+"customizations": {
+	"vscode": {
+		"extensions": [
+			"ms-python.python",
+			"ms-python.vscode-pylance",
+			"ms-toolsai.jupyter"
+		]
+	}
+}
+}
diff --git a/ir-measures/.vscode/settings.json b/ir-measures/.vscode/settings.json
@@ -0,0 +1,7 @@
+{
+    "python.testing.pytestArgs": [
+        "tests"
+    ],
+    "python.testing.unittestEnabled": false,
+    "python.testing.pytestEnabled": true
+}
diff --git a/ir-measures/Dockerfile b/ir-measures/Dockerfile
@@ -1,6 +1,4 @@
-FROM python:3.10
-
-RUN pip3 install ir-measures approvaltests pytest
+FROM webis/ir_measures_evaluator:dev-1.0.6
 
 COPY ir_measures_evaluator.py /
 

diff --git a/ir-measures/Dockerfile.dev b/ir-measures/Dockerfile.dev
@@ -0,0 +1,4 @@
+FROM webis/tira-ir-datasets-starter:0.0.54
+
+RUN apk add jq libffi-dev && pip3 install ir-datasets ir-measures approvaltests exceptiongroup pytest jupyter
+
diff --git a/ir-measures/Makefile b/ir-measures/Makefile
@@ -1,6 +1,7 @@
-IMAGE_VERSION=1.0.5
+IMAGE_VERSION=1.0.6
 
 build-docker-image:
+	docker build -t webis/ir_measures_evaluator:dev-${IMAGE_VERSION} -f Dockerfile.dev .
 	docker build -t webis/ir_measures_evaluator:${IMAGE_VERSION} .
 
 .PHONY: tests

diff --git a/ir-measures/Pipfile b/ir-measures/Pipfile
@@ -7,8 +7,9 @@ name = "pypi"
 ir-measures = "*"
 pytest = "*"
 approvaltests = "*"
+exceptiongroup = "*"
 
 [dev-packages]
 
 [requires]
-python_version = "3.9"
+python_version = "3.8"
diff --git a/ir-measures/Pipfile.lock b/ir-measures/Pipfile.lock
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,4 @@
		FROM webis/tira-ir-datasets-starter:0.0.54

		RUN apk add jq libffi-dev && pip3 install ir-datasets ir-measures approvaltests exceptiongroup pytest jupyter