Skip to content

Commit

Permalink
More cleanups
Browse files Browse the repository at this point in the history
  • Loading branch information
xjules committed Dec 10, 2024
1 parent 6a86a2e commit 79b680f
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 54 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/test_ert.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,6 @@ jobs:
- name: Install uv
uses: astral-sh/setup-uv@v4

- name: Install dependencies on macOS
if: ${{ inputs.os == 'macos-latest' }}
run: |
echo "On macOS we need to install zeromq"
brew install zeromq
- name: Install ert
run: |
uv pip install ".[dev, everest]"
Expand Down
5 changes: 3 additions & 2 deletions src/ert/ensemble_evaluator/_ensemble.py
Original file line number Diff line number Diff line change
Expand Up @@ -291,8 +291,9 @@ async def _evaluate_inner( # pylint: disable=too-many-branches
except Exception as exc:
logger.exception(
(
"Unexpected exception in ensemble: \n"
"".join(traceback.format_exception(None, exc, exc.__traceback__))
"Unexpected exception in ensemble: \n" "".join(
traceback.format_exception(None, exc, exc.__traceback__)
)
),
exc_info=True,
)
Expand Down
46 changes: 0 additions & 46 deletions tests/ert/unit_tests/ensemble_evaluator/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,52 +17,6 @@
from ert.storage import Ensemble
from tests.ert import SnapshotBuilder

# @pytest.fixture(name="zmq_server")
# def _mock_zmq_server(host, port, messages, delay_startup=0):
# loop = new_event_loop()
# done = loop.create_future()

# async def _handler(router_socket):
# while True:
# _, __, *frames = await router_socket.recv_multipart()
# for frame in frames:
# raw_msg = frame.decode("utf-8")
# messages.append(raw_msg)
# if raw_msg == "stop":
# done.set_result(None)
# break

# async def _run_server():
# await asyncio.sleep(delay_startup)
# zmq_context = zmq.asyncio.Context() # type: ignore
# router_socket = zmq_context.socket(zmq.ROUTER)
# router_socket.bind(f"tcp://*:{port}")
# handler_task = asyncio.create_task(_handler(router_socket))
# await handler_task
# router_socket.close()

# loop.run_until_complete(_run_server())
# loop.close()


# @pytest.fixture(name="async_zmq_server")
# def _async_mock_zmq_server(port, handler, set_when_done):
# loop = new_event_loop()

# async def _run_server():
# zmq_context = zmq.asyncio.Context() # type: ignore
# router_socket = zmq_context.socket(zmq.ROUTER)
# router_socket.bind(f"tcp://*:{port}")
# while True:
# dealer, __, *frames = await router_socket.recv_multipart()
# for frame in frames:
# handler(dealer.decode("utf-8"), frame)
# if set_when_done:
# return

# loop.run_until_complete(_run_server())
# loop.close()


@pytest.fixture
def snapshot():
Expand Down

0 comments on commit 79b680f

Please sign in to comment.