Skip to content
This repository has been archived by the owner on Sep 2, 2024. It is now read-only.

use daq config service from pypi #1524

Merged
merged 1 commit into from
Aug 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ install_requires =
# These dependencies may be issued as pre-release versions and should have a pin constraint
# as by default pip-install will not upgrade to a pre-release.
#
daq-config-server @ git+https://github.com/DiamondLightSource/daq-config-server.git
daq-config-server >= 0.1.1
ophyd == 1.9.0
ophyd-async >= 0.3a5
bluesky >= 1.13.0a4
Expand Down
3 changes: 0 additions & 3 deletions src/hyperion/external_interaction/config_server.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
from typing import TypeVar

from daq_config_server.client import ConfigServer
from pydantic import BaseModel

from hyperion.log import LOGGER
from hyperion.parameters.constants import CONST

_CONFIG_SERVER: ConfigServer | None = None
T = TypeVar("T")


def config_server() -> ConfigServer:
Expand Down
6 changes: 5 additions & 1 deletion src/hyperion/parameters/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,11 @@ class HyperionConstants:
TRIGGER = TriggerConstants()
CALLBACK_0MQ_PROXY_PORTS = (5577, 5578)
DESCRIPTORS = DocDescriptorNames()
CONFIG_SERVER_URL = "https://daq-config.diamond.ac.uk/api"
CONFIG_SERVER_URL = (
"http://fake-url-not-real"
if TEST_MODE
else "https://daq-config.diamond.ac.uk/api"
)
GRAYLOG_PORT = 12232
PARAMETER_SCHEMA_DIRECTORY = "src/hyperion/parameters/schemas/"
ZOCALO_ENV = "dev_artemis" if TEST_MODE else "artemis"
Expand Down
Loading