diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml index b578a385..29bd4df4 100644 --- a/.github/workflows/containers.yml +++ b/.github/workflows/containers.yml @@ -35,7 +35,7 @@ jobs: steps: - name: Checkout branch - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up QEMU uses: docker/setup-qemu-action@v1 diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 3779d4c5..bb8e86ff 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -17,11 +17,11 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 name: setup Python with: - python-version: 3.8 + python-version: "3.10" - name: build docs ⚙️ uses: ammaraskar/sphinx-action@master with: diff --git a/.github/workflows/tests-docker.yml b/.github/workflows/tests-docker.yml index e01cb4d5..1f547525 100644 --- a/.github/workflows/tests-docker.yml +++ b/.github/workflows/tests-docker.yml @@ -7,11 +7,11 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 name: setup Python with: - python-version: 3.8 + python-version: "3.10" - name: install testing requirements 📦 working-directory: tests run: | diff --git a/.github/workflows/zaproxy.yml b/.github/workflows/zaproxy.yml index a04fb965..a8796082 100644 --- a/.github/workflows/zaproxy.yml +++ b/.github/workflows/zaproxy.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: build and start containers using tests/test.env ⚙️ run: | cp tests/test.env wis2box.env @@ -47,4 +47,4 @@ jobs: target: 'http://localhost/wis2box-webapp' rules_file_name: '.zap/rules.tsv' allow_issue_writing: 'false' - fail_action: 'true' \ No newline at end of file + fail_action: 'true' diff --git a/docker-compose.monitoring.yml b/docker-compose.monitoring.yml index d97b3af1..d4291023 100644 --- a/docker-compose.monitoring.yml +++ b/docker-compose.monitoring.yml @@ -42,7 +42,7 @@ services: restart: unless-stopped env_file: - wis2box.env - #image: ghcr.io/wmo-im/wis2box-mqtt-metrics-collector:1.0.beta1 + #image: ghcr.io/wmo-im/wis2box-mqtt-metrics-collector:latest build: context: ./wis2box-mqtt-metrics-collector depends_on: diff --git a/docker-compose.yml b/docker-compose.yml index cb13799c..b971e83f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,15 +20,6 @@ services: depends_on: - wis2box-api -# wis2box-ui-admin: -# container_name: wis2box-ui-admin -# image: ghcr.io/wmo-im/wis2box-ui-admin:latest -# restart: always -# env_file: -# - wis2box.env -# depends_on: -# - wis2box-api - wis2box-webapp: container_name: wis2box-webapp image: ghcr.io/wmo-im/wis2box-webapp:latest @@ -103,7 +94,7 @@ services: mosquitto: container_name: mosquitto - #image: ghcr.io/wmo-im/wis2box-broker:1.0.beta1 + #image: ghcr.io/wmo-im/wis2box-broker:latest restart: always build: context: ./wis2box-broker @@ -115,7 +106,7 @@ services: mem_limit: 1g memswap_limit: 1g restart: always - #image: ghcr.io/wmo-im/wis2box-management:1.0.beta1 + #image: ghcr.io/wmo-im/wis2box-management:latest build: context: ./wis2box-management #user: wis2box:wis2box @@ -154,9 +145,8 @@ services: volumes: - ${WIS2BOX_HOST_DATADIR}/downloads:/home/wis2downloader/app/data/downloads - volumes: es-data: minio-data: auth-data: - htpasswd: \ No newline at end of file + htpasswd: diff --git a/docs/Makefile b/docs/Makefile index d0c3cbf1..a799adeb 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -3,7 +3,7 @@ # You can set these variables from the command line, and also # from the environment for the first two. -SPHINXOPTS ?= +SPHINXOPTS = -W SPHINXBUILD ?= sphinx-build SOURCEDIR = source BUILDDIR = build @@ -17,4 +17,5 @@ help: # Catch-all target: route all unknown targets to Sphinx using the new # "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS). %: Makefile + echo @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) diff --git a/docs/requirements.txt b/docs/requirements.txt index 6e52ea48..6b8ebd60 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -2,6 +2,7 @@ ipython_genutils jinja2 jupyter nbsphinx +pygments-csv-lexer pyzmq==23.2.1 pypandoc sphinx diff --git a/docs/source/user/gts-headers-in-wis2.rst b/docs/source/user/gts-headers-in-wis2.rst index f7507559..ef4c27ce 100644 --- a/docs/source/user/gts-headers-in-wis2.rst +++ b/docs/source/user/gts-headers-in-wis2.rst @@ -14,10 +14,12 @@ To enable the WIS2 to GTS Gateway to correctly identify the data to be republish .. code-block:: json - "properties": { - "gts": { - "ttaaii": "FTAE31", - "cccc": "VTBB" + { + "properties": { + "gts": { + "ttaaii": "FTAE31", + "cccc": "VTBB" + } } } @@ -47,10 +49,12 @@ the corresponding GTS headers will be added to the WIS2 Notification Message as .. code-block:: json - "properties": { - "gts": { - "ttaaii": "ISMD01", - "cccc": "LIBB" + { + "properties": { + "gts": { + "ttaaii": "ISMD01", + "cccc": "LIBB" + } } }