From 03ca1b8fe2f3d6301ee660b071a73b878682e100 Mon Sep 17 00:00:00 2001
From: Eva Lott <evalott100@gmail.com>
Date: Thu, 29 Feb 2024 10:18:18 +0000
Subject: [PATCH] cleaned cleaned up merge

---
 pyproject.toml                  | 18 ------------------
 src/pandablocks_ioc/__init__.py | 14 +++-----------
 tests/fixtures/panda_data.py    |  2 +-
 tests/test_tables.py            |  6 +++---
 4 files changed, 7 insertions(+), 33 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 18a3e777..fcdf0fc3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -11,7 +11,6 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
 ]
 description = "Create an IOC from a PandA"
-<<<<<<< before updating
 dependencies = [
     "setuptools>=64",
     "numpy",
@@ -33,28 +32,11 @@ dev = [
     "black",
     "mock",
     "mypy",
-=======
-dependencies = [] # Add project dependencies here, e.g. ["click", "numpy"]
-dynamic = ["version"]
-license.file = "LICENSE"
-readme = "README.md"
-requires-python = ">=3.7"
-
-[project.optional-dependencies]
-dev = [
-    "copier",
-    "myst-parser",
->>>>>>> after updating
     "pipdeptree",
     "pre-commit",
     "p4p",
     "pydata-sphinx-theme>=0.12",
-<<<<<<< before updating
     "pytest-asyncio==0.21.1",    # https://github.com/PandABlocks/PandABlocks-ioc/issues/84
-=======
-    "pyright",
-    "pytest",
->>>>>>> after updating
     "pytest-cov",
     "ruff",
     "sphinx-autobuild",
diff --git a/src/pandablocks_ioc/__init__.py b/src/pandablocks_ioc/__init__.py
index 0ca9eabe..553dc0d8 100644
--- a/src/pandablocks_ioc/__init__.py
+++ b/src/pandablocks_ioc/__init__.py
@@ -1,16 +1,8 @@
-<<<<<<< before updating
-import sys
-from .ioc import create_softioc
+from importlib.metadata import version  # noqa
 
-if sys.version_info < (3, 8):
-    from importlib_metadata import version  # noqa
-else:
-    from importlib.metadata import version  # noqa
+from .ioc import create_softioc
 
-__version__ = version("pandablocks-ioc")
+__version__ = version("PandABlocks-ioc")
 del version
-=======
-from ._version import __version__
->>>>>>> after updating
 
 __all__ = ["__version__", "create_softioc"]
diff --git a/tests/fixtures/panda_data.py b/tests/fixtures/panda_data.py
index 2fe424e3..74d9d780 100644
--- a/tests/fixtures/panda_data.py
+++ b/tests/fixtures/panda_data.py
@@ -207,7 +207,7 @@ def table_data_2() -> List[str]:
 
 @pytest.fixture
 def table_unpacked_data(
-    table_fields: Dict[str, TableFieldDetails]
+    table_fields: Dict[str, TableFieldDetails],
 ) -> OrderedDict[EpicsName, ndarray]:
     """The unpacked equivalent of table_data"""
     array_values: List[ndarray] = [
diff --git a/tests/test_tables.py b/tests/test_tables.py
index b1fac61f..adf105c7 100644
--- a/tests/test_tables.py
+++ b/tests/test_tables.py
@@ -363,9 +363,9 @@ async def test_table_updater_update_mode_submit_exception_data_error(
     assert isinstance(table_updater.client.send, AsyncMock)
     table_updater.client.send.side_effect = Exception("Mocked exception")
 
-    table_updater.all_values_dict[EpicsName(EPICS_FORMAT_TABLE_NAME)] = (
-        InErrorException("Mocked in error exception")
-    )
+    table_updater.all_values_dict[
+        EpicsName(EPICS_FORMAT_TABLE_NAME)
+    ] = InErrorException("Mocked in error exception")
 
     await table_updater.update_mode(TableModeEnum.SUBMIT.value)