Skip to content

Commit

Permalink
cleaned cleaned up merge
Browse files Browse the repository at this point in the history
  • Loading branch information
evalott100 committed Feb 29, 2024
1 parent d9f2cb7 commit 03ca1b8
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 33 deletions.
18 changes: 0 additions & 18 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ classifiers = [
"Programming Language :: Python :: 3.11",
]
description = "Create an IOC from a PandA"
<<<<<<< before updating
dependencies = [
"setuptools>=64",
"numpy",
Expand All @@ -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",
Expand Down
14 changes: 3 additions & 11 deletions src/pandablocks_ioc/__init__.py
Original file line number Diff line number Diff line change
@@ -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"]
2 changes: 1 addition & 1 deletion tests/fixtures/panda_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -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] = [
Expand Down
6 changes: 3 additions & 3 deletions tests/test_tables.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down

0 comments on commit 03ca1b8

Please sign in to comment.