From 6a30c34876e872406c946aa174f56affdaa9516b Mon Sep 17 00:00:00 2001 From: Dmitri Gavrilov Date: Wed, 3 Dec 2025 13:18:18 -0500 Subject: [PATCH 1/7] CI: use GH action to install Redis --- .github/workflows/testing.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 27a504e..2d794a8 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] + python-version: ["3.10", "3.11", "3.12", "3.13"] # pydantic-version: ["<2.0.0", ">=2.0.0"] # exclude: # - python-version: "3.9" @@ -29,9 +29,12 @@ jobs: uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} + - uses: shogo82148/actions-setup-redis@v1 + with: + redis-version: "7.x" - name: Install dependencies run: | - sudo apt install redis + # sudo apt install redis # Start LDAP source start_LDAP.sh From 9703da7477c70cdc158d8e882f4d2dbba9da087e Mon Sep 17 00:00:00 2001 From: Dmitri Gavrilov Date: Wed, 3 Dec 2025 13:19:31 -0500 Subject: [PATCH 2/7] CI: use GH action to install Redis --- .github/workflows/docs_publish.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/docs_publish.yml b/.github/workflows/docs_publish.yml index 8b0e67b..49d73c3 100644 --- a/.github/workflows/docs_publish.yml +++ b/.github/workflows/docs_publish.yml @@ -22,6 +22,9 @@ jobs: uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} + - uses: shogo82148/actions-setup-redis@v1 + with: + redis-version: "7.x" - name: Install dependencies run: | sudo apt install redis From f10f4731ece4dcaa4c03aff49996d8625222bc85 Mon Sep 17 00:00:00 2001 From: Dmitri Gavrilov Date: Wed, 3 Dec 2025 14:09:02 -0500 Subject: [PATCH 3/7] CI: switch to osixia/openldap image --- .github/workflows/docker-configs/ldap-docker-compose.yml | 4 ++-- start_LDAP.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-configs/ldap-docker-compose.yml b/.github/workflows/docker-configs/ldap-docker-compose.yml index a50b04d..52073a8 100644 --- a/.github/workflows/docker-configs/ldap-docker-compose.yml +++ b/.github/workflows/docker-configs/ldap-docker-compose.yml @@ -2,7 +2,7 @@ version: '2' services: openldap: - image: docker.io/bitnami/openldap:2.6 + image: docker.io/osixia/openldap:latest ports: - '1389:1389' - '1636:1636' @@ -12,7 +12,7 @@ services: - LDAP_USERS=user01,user02 - LDAP_PASSWORDS=password1,password2 volumes: - - 'openldap_data:/bitnami/openldap' + - 'openldap_data:/osixia/openldap' volumes: openldap_data: diff --git a/start_LDAP.sh b/start_LDAP.sh index d71c662..37920ed 100644 --- a/start_LDAP.sh +++ b/start_LDAP.sh @@ -3,6 +3,6 @@ set -e # Start LDAP server in docker container -sudo docker pull bitnami/openldap:latest +sudo docker pull osixia/openldap:latest sudo docker compose -f .github/workflows/docker-configs/ldap-docker-compose.yml up -d sudo docker ps From d5d161633f91c4d476a5b0f1f85010d18023d6ed Mon Sep 17 00:00:00 2001 From: Dmitri Gavrilov Date: Wed, 3 Dec 2025 14:10:13 -0500 Subject: [PATCH 4/7] STY: fix pre-commit --- docs/source/control_re_manager.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/control_re_manager.rst b/docs/source/control_re_manager.rst index a082120..789e2bb 100644 --- a/docs/source/control_re_manager.rst +++ b/docs/source/control_re_manager.rst @@ -430,7 +430,7 @@ The following WebSockets are currently implemented: For example, the console output stream may be received by connecting to the socket with ``ws://localhost:60610/api/console_output/ws`` URI. -Currently ``/info/ws`` and ``/status/ws`` sockets are streaming the same sequence of RE Manager +Currently ``/info/ws`` and ``/status/ws`` sockets are streaming the same sequence of RE Manager status messages. Additional messages may be added to the system info stream in the future. Message format for console output messages:: From d599ed30db8c7e8c6f6e4793157ccc28d9af0b21 Mon Sep 17 00:00:00 2001 From: Dmitri Gavrilov Date: Wed, 3 Dec 2025 15:18:26 -0500 Subject: [PATCH 5/7] TST: potential fix for LDAP tests --- .github/workflows/docker-configs/ldap-docker-compose.yml | 4 ++-- .github/workflows/testing.yml | 6 ++++++ start_LDAP.sh | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-configs/ldap-docker-compose.yml b/.github/workflows/docker-configs/ldap-docker-compose.yml index 52073a8..5cf12a8 100644 --- a/.github/workflows/docker-configs/ldap-docker-compose.yml +++ b/.github/workflows/docker-configs/ldap-docker-compose.yml @@ -2,7 +2,7 @@ version: '2' services: openldap: - image: docker.io/osixia/openldap:latest + image: docker.io/bitnami/openldap:latest ports: - '1389:1389' - '1636:1636' @@ -12,7 +12,7 @@ services: - LDAP_USERS=user01,user02 - LDAP_PASSWORDS=password1,password2 volumes: - - 'openldap_data:/osixia/openldap' + - 'openldap_data:/bitnami/openldap' volumes: openldap_data: diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 2d794a8..9a12459 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -36,6 +36,12 @@ jobs: run: | # sudo apt install redis + pushd .. + git clone https://github.com/bitnami/containers.git + cd bitnami/2.6/debian-12 + docker build -t bitnami/openldap:latest . + popd + # Start LDAP source start_LDAP.sh diff --git a/start_LDAP.sh b/start_LDAP.sh index 37920ed..8b612de 100644 --- a/start_LDAP.sh +++ b/start_LDAP.sh @@ -3,6 +3,6 @@ set -e # Start LDAP server in docker container -sudo docker pull osixia/openldap:latest +# sudo docker pull osixia/openldap:latest sudo docker compose -f .github/workflows/docker-configs/ldap-docker-compose.yml up -d sudo docker ps From 9f796663edb8c380e5d4265a161c388cbe9a1d8b Mon Sep 17 00:00:00 2001 From: Dmitri Gavrilov Date: Wed, 3 Dec 2025 15:31:46 -0500 Subject: [PATCH 6/7] TST: fix directory name --- .github/workflows/testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 9a12459..ad88ec1 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -38,7 +38,7 @@ jobs: pushd .. git clone https://github.com/bitnami/containers.git - cd bitnami/2.6/debian-12 + cd containers/bitnami/2.6/debian-12 docker build -t bitnami/openldap:latest . popd From 30e300a5b36bec8c626e7f582c530da3c4466325 Mon Sep 17 00:00:00 2001 From: Dmitri Gavrilov Date: Wed, 3 Dec 2025 18:46:11 -0500 Subject: [PATCH 7/7] CI: fix bitnami repository name --- .github/workflows/testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index ad88ec1..b7d9d54 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -38,7 +38,7 @@ jobs: pushd .. git clone https://github.com/bitnami/containers.git - cd containers/bitnami/2.6/debian-12 + cd containers/bitnami/openldap/2.6/debian-12 docker build -t bitnami/openldap:latest . popd