fix: merge issues

ImperialCollegeLondon · Aug 16, 2024 · 9c86b45 · 9c86b45
1 parent 921768a
commit 9c86b45
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -33,7 +33,6 @@ imap-data-access = {git = "https://github.com/ImperialCollegeLondon/imap-data-ac
 cdflib = "^1.3.1"
 single-version = "^1.6.0"
 psycopg = {extras = ["binary"], version = "^3.2.1"}
-single-version = "^1.6.0"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^8.3.1"

diff --git a/tests/test_main.py b/tests/test_main.py
@@ -7,6 +7,7 @@
 import re
 from pathlib import Path
 
+import pytest
 from imap_mag.main import app
 from typer.testing import CliRunner