diff --git a/tests/requirements.txt b/tests/requirements.txt index de597fc4..d910638e 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,5 +1,5 @@ flake8 +paho-mqtt<2 pytest pywis-pubsub -requests -paho-mqtt<2 \ No newline at end of file +requests \ No newline at end of file diff --git a/wis2box-management/Dockerfile b/wis2box-management/Dockerfile index 10d77bb8..4776c56f 100644 --- a/wis2box-management/Dockerfile +++ b/wis2box-management/Dockerfile @@ -41,7 +41,7 @@ RUN apt-get update -y && apt-get install -y ${DEBIAN_PACKAGES} \ https://github.com/geopython/pygeometa/archive/refs/tags/0.16.0.zip \ https://github.com/wmo-im/pywis-topics/archive/refs/tags/0.2.0.zip \ # install cap validator - && pip3 install --no-cache-dir capvalidator>=0.1.0-dev2 \ + && pip3 install --no-cache-dir capvalidator>=0.1.0-dev4 \ # install shapely && pip3 install --no-cache-dir cython pygeos==0.13 \ && pip3 install shapely \ diff --git a/wis2box-management/requirements.txt b/wis2box-management/requirements.txt index fe9dc4fd..ef1c7b4a 100644 --- a/wis2box-management/requirements.txt +++ b/wis2box-management/requirements.txt @@ -9,4 +9,4 @@ pywis-pubsub pywis-topics PyYAML requests -capvalidator>=0.1.0-dev3 \ No newline at end of file +capvalidator>=0.1.0-dev4 \ No newline at end of file diff --git a/wis2box-management/wis2box/data/cap_message.py b/wis2box-management/wis2box/data/cap_message.py index 784049b6..f660467a 100644 --- a/wis2box-management/wis2box/data/cap_message.py +++ b/wis2box-management/wis2box/data/cap_message.py @@ -26,7 +26,7 @@ from typing import Union from wis2box.data.base import BaseAbstractData -from capvalidator import validate_xml, get_dates +from capvalidator import validate_cap_message, get_dates LOGGER = logging.getLogger(__name__) @@ -75,7 +75,7 @@ def transform(self, input_data: Union[Path, bytes], _meta['relative_filepath'] = self.get_local_filepath(_meta['data_date']) # noqa # validate the CAP XML string content using the capvalidator package - result = validate_xml(input_bytes, strict=False) + result = validate_cap_message(input_bytes, strict=False) if not result.passed: LOGGER.error( f'Invalid CAP XML, not publishing. Reason: {result.message}')