pyrelukko 0.5.0__tar.gz → 0.6.0__tar.gz

{pyrelukko-0.5.0 → pyrelukko-0.6.0}/.gitlab-ci.yml

@@ -1,18 +1,11 @@
 variables:
   FF_TIMESTAMPS: true
-  BUILD_IMAGE:
-    description: Used in rules, if "true" and web triggered it builds the image!
+  RUN_PYLINT:
+    description: Used in rules, if "true" and web triggered run pylint.
     value: "false"
     options:
     - "false"
     - "true"
-  IMAGE_NAME: py-rf-image
-  IMAGE_TAG:
-    description: >-
-      The "tag" added to the image name for the test / lint image.
-      Remove this when you trigger by hand an image build and want it to use
-      the new built image with Git short sha tag (X icon on the right)!
-    value: "latest"
   RUN_PYTEST:
     description: Used in rules, if "true" and web triggered run the pytests.
     value: "false"
@@ -36,44 +29,9 @@ variables:
 #    - "true"
 
 
-build-py-rf-image:
-  stage: build
-  image: docker:25
-  services:
-    - name: docker:25-dind
-      alias: docker
-  before_script:
-    - docker info
-  before_script:
-    - echo "Login to Gitlab container registry"
-    - echo "$CI_REGISTRY_PASSWORD" | docker login --username $CI_REGISTRY_USER --password-stdin $CI_REGISTRY
-  script:
-    - echo "Build container image..."
-    - ./cicd/build-py-rf-image.sh
-    - echo "Export IMAGE_TAG var to next stage!"
-    - echo "IMAGE_TAG=${CI_COMMIT_SHORT_SHA}" > image_tag.env
-    - echo "Build complete."
-  artifacts:
-    reports:
-      dotenv: image_tag.env
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-      changes:
-        - .gitlab-ci.yml
-        - cicd/build-py-rf-image.sh
-        - container/**/*
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
-      changes:
-        - .gitlab-ci.yml
-        - cicd/build-py-rf-image.sh
-        - container/**/*
-    - if: $CI_PIPELINE_SOURCE == "web" && $BUILD_IMAGE == "true"
-      when: always
-
-
 run-pylint:
   stage: test
-  image: "${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:${IMAGE_TAG}"
+  image: "registry.gitlab.com/relukko/py-tox-images/py-3.13-tox"
   rules:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
       changes:
@@ -81,6 +39,8 @@ run-pylint:
     - if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       changes:
         - src/**/*.py
+    - if: $CI_PIPELINE_SOURCE == "web" && $RUN_PYLINT == "true"
+      when: always
   before_script:
     - echo "Running PyLint."
   script:
@@ -135,14 +95,18 @@ run-pytest:
     when: always
     expire_in: 2 week
     paths:
-      - pytest-junit.xml
+      - pytest-junit*.xml
+      - log*.html
+      - output*.xml
+      - xunit*.xml
     reports:
-      junit: pytest-junit.xml
+      junit:
+        - pytest-junit*.xml
+        - xunit*.xml
 
- 
 run-shellcheck:
   stage: test
-  image: "${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:${IMAGE_TAG}"
+  image: "registry.gitlab.com/relukko/py-tox-images/py-3.13-tox"
   rules:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
       changes:
@@ -154,10 +118,11 @@ run-shellcheck:
     - echo "Running ShellCheck."
   script:
     - ./cicd/run_shellcheck.sh
- 
+
+
 # pages:
 #   stage: deploy
-#   image: "${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:${IMAGE_TAG}"
+#   image: "registry.gitlab.com/relukko/py-tox-images/py-3.13-tox"
 #   rules:
 #     - if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
 #       changes:

{pyrelukko-0.5.0 → pyrelukko-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyrelukko
-Version: 0.5.0
+Version: 0.6.0
 Summary: Relukko client.
 Author-email: Reto Zingg <g.d0b3rm4n@gmail.com>
 Requires-Python: >=3.10

pyrelukko-0.6.0/cicd/run_docs_pages.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# Main script execution
+main() {
+    tox run -e docs
+}
+
+# Execute the main function
+main
+
+# vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:

pyrelukko-0.6.0/cicd/run_pylint.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# Main script execution
+main() {
+    tox run -e pylint
+}
+
+# Execute the main function
+main
+
+# vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:

pyrelukko-0.6.0/cicd/run_pytest.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# Main script execution
+main() {
+    tox run --skip-missing-interpreters --skip-env 'pylint|shellcheck|docs'
+}
+
+# Execute the main function
+main
+
+# vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:

pyrelukko-0.6.0/cicd/run_shellcheck.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# Main script execution
+main() {
+    tox run -e shellcheck
+}
+
+# Execute the main function
+main
+
+# vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:

pyrelukko-0.6.0/cicd/tox_docs_pages.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# SCRIPT_DIR=$(dirname "$(readlink -f "$0")")
+# REPO_DIR="$(readlink -f "${SCRIPT_DIR}/..")"
+# PUBLIC_DIR="${REPO_DIR}/public"
+
+# Main script execution
+main() {
+    # mkdir -p "${PUBLIC_DIR}"
+    # libdoc --pythonpath ./src  Relukko  "${PUBLIC_DIR}/index.html"
+    echo "Not Implemented yet"
+}
+
+# Execute the main function
+main
+
+# vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:

pyrelukko-0.5.0/cicd/run_shellcheck.sh → pyrelukko-0.6.0/cicd/tox_shellcheck.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_DIR=$(dirname "$(readlink -f "$0")")
-REPO_DIR="${SCRIPT_DIR}/.."
+REPO_DIR="$(readlink -f "${SCRIPT_DIR}/..")"
 
 # Main script execution
 main() {

{pyrelukko-0.5.0 → pyrelukko-0.6.0}/pyproject.toml

@@ -23,6 +23,21 @@ dependencies = [
     "websockets >= 14.1",
 ]
 
+[dependency-groups]
+test = [
+   "httpx",
+   "pytest >= 8",
+   "requests-mock >= 1.12",
+   "testcontainers",
+]
+lint = [
+    "pylint >= 3",
+    "pylint-json2html"
+]
+coverage = [
+    "pytest-cov"
+]
+
 [tool.flit.sdist]
 exclude = [".gitignore", "demo.py"]
 
@@ -34,6 +49,16 @@ Issues = "https://gitlab.com/relukko/pyrelukko/-/issues"
 requires = ["flit_core >=3.2,<4", "semantic-version >= 2.10"]
 build-backend = "flit_core.buildapi"
 
+[tool.pylint.main]
+# Files or directories to be skipped. They should be base names, not paths.
+ignore = ["LICENSE", "pyproject.toml", "version.py",
+          "README.md", "demo.py", "conftest.py", ".tox"]
+
+# Files or directories matching the regular expression patterns are skipped. The
+# regex matches against base names, not paths. The default value ignores Emacs
+# file locks
+ignore-patterns = ["^\\.#", "^test_"]
+
 [tool.pytest.ini_options]
 testpaths = [
     "tests",
@@ -41,24 +66,50 @@ testpaths = [
 pythonpath = [
     "src",
 ]
+log_cli = "True"
 
 [tool.tox]
 requires = ["tox>=4.23"]
-env_list = ["3.11", "3.12", "3.13"]
+env_list = [
+    "3.11",
+    "3.12",
+    "3.13",
+    "pylint",
+    "shellcheck",
+    "docs"
+]
 
 [tool.tox.env_run_base]
 description = "Run test under {base_python}"
-commands = [["pytest", "--junit-xml", "pytest-junit.xml"]]
-deps = ["httpx", "pytest", "testcontainers"]
-# set_env = { VIRTUALENV_DISCOVERY = "pyenv" }
+commands = [["pytest", "--junit-xml", "pytest-junit-{env_name}.xml", "--junit-prefix", "{env_name}"]]
 pass_env = [ "TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE", "DOCKER_HOST", "CI_HAS_RELUKKO", "CI_RELUKKO_*" ]
+dependency_groups = [ "test" ]
 
-[tool.pylint.main]
-# Files or directories to be skipped. They should be base names, not paths.
-ignore = ["LICENSE", "pyproject.toml", "version.py",
-          "README.md", "demo.py", "conftest.py", ".tox"]
+[tool.tox.env.pylint]
+description = "Run PyLint with {base_python}"
+dependency_groups = [ "lint" ]
+commands = [[
+        "pylint",
+        "--verbose",
+        "--rcfile",
+        "./pyproject.toml",
+        "--output-format=json:{tox_root}/pylint.out.json,parseable:{tox_root}/pylint.out.txt,text",
+        ".",
+    ]
+]
+commands_post = [
+    [
+        "pylint-json2html",
+        "-o",
+        "{tox_root}/pylint.out.html",
+        "{tox_root}/pylint.out.json",
+    ]
+]
 
-# Files or directories matching the regular expression patterns are skipped. The
-# regex matches against base names, not paths. The default value ignores Emacs
-# file locks
-ignore-patterns = ["^\\.#", "^test_"]
+[tool.tox.env.shellcheck]
+allowlist_externals = ["shellcheck", "{tox_root}/cicd/tox_shellcheck.sh"]
+commands = [[ "{tox_root}/cicd/tox_shellcheck.sh" ]]
+
+[tool.tox.env.docs]
+allowlist_externals = ["{tox_root}/cicd/tox_docs_pages.sh"]
+commands = [[ "{tox_root}/cicd/tox_docs_pages.sh" ]]

{pyrelukko-0.5.0 → pyrelukko-0.6.0}/src/pyrelukko/pyrelukko.py

@@ -39,6 +39,8 @@ RETRY_KWARGS = [
 OWN_KWARGS = [
     'acquire_wait_for_timeout',
     'acquire_modulo',
+    'disable_websocket',
+    'raise_when_acquire_fails',
     'ws_ping_interval',
     'ws_ping_timeout',
     'ws_wait_for_timeout',
@@ -75,11 +77,13 @@ class RelukkoClient:
         )
         self._setup_session(api_key, **kwargs)
         self._setup_http_adapters_retry(**kwargs)
-        self.ws_wait_for_timeout = 2
+        self.acquire_modulo = 100
+        self.acquire_wait_for_timeout = 2
+        self.disable_websocket = False
+        self.raise_when_acquire_fails = True
         self.ws_ping_interval = 60
         self.ws_ping_timeout = 20
-        self.acquire_wait_for_timeout = 2
-        self.acquire_modulo = 100
+        self.ws_wait_for_timeout = 2
         self._setup_pyrelukko_kwargs(**kwargs)
 
         self.base_url = self._setup_base_url(base_url)
@@ -224,22 +228,29 @@ class RelukkoClient:
             if elapsed_time > max_run_time:
                 self.ws_running.clear()
                 _thread_store.insert(0, None)
-                return
+                break
             # If self.message_recieved is True try to get lock ASAP!
             # Otherwise only in every Xth run in case websocket broke.
             if got_message or loop_counter % self.acquire_modulo == 0:
-                res = self._make_request(
-                    url=url, method="POST", payload=payload)
+                try:
+                    res = self._make_request(
+                        url=url, method="POST", payload=payload)
+                except (
+                    *self.exceptions, RuntimeError, requests.HTTPError) as e:
+                    logger.warning("Last exception was: %s!\nGiving up!", e)
+                    _thread_store.insert(0, e)
+                    break
             loop_counter += 1
             if res is None:
                 # Conflict 409
                 got_message = self.message_received.wait(
                     timeout=self.acquire_wait_for_timeout)
                 self.message_received.clear()
-            else:
-                _thread_store.insert(0, res)
-                self.ws_running.clear()
-                return
+                continue
+
+            _thread_store.insert(0, res)
+            self.ws_running.clear()
+            break
 
     def _check_response(self, response: requests.Response):
         match response.status_code:
@@ -247,20 +258,27 @@ class RelukkoClient:
                 return response.json()
             case 400 | 403:
                 err = response.json()
-                logger.warning(err.get('status'), err.get('message'))
+                logger.warning("4xx HTTP Error [%d](%s) - %s:%s",
+                    response.status_code, response.reason,
+                    str(err.get('status')), err.get('message'))
                 response.raise_for_status()
             case 409:
                 err = response.json()
-                logger.info(err.get('status'), err.get('message'))
+                logger.warning("409 HTTP Error [%d](%s) - %s:%s",
+                    response.status_code, response.reason,
+                    str(err.get('status')), err.get('message'))
                 return None
             case 500 | 502 | 503 | 504:
                 logger.warning("[%d](%s) %s",
                     response.status_code, response.reason, response.text)
-                raise RelukkoDoRetry()
+                raise RelukkoDoRetry(
+                    f"5xx HTTP Error: [{response.status_code}]"
+                    f"({response.reason})")
             case _:
                 logger.warning("[%d](%s) %s",
                     response.status_code, response.reason, response.text)
-                raise RuntimeError()
+                raise RuntimeError(
+                    f"Give up: [{response.status_code}]({response.reason})")
 
     def _make_request(
             self,
@@ -293,10 +311,11 @@ class RelukkoClient:
 
         url = f"{self.base_url}/v1/locks/"
 
-        self.ws_running.set()
-        self.ws_listener = threading.Thread(
-            target=asyncio.run, args=(self._websocket_listener(),))
-        self.ws_listener.start()
+        if not self.disable_websocket:
+            self.ws_running.set()
+            self.ws_listener = threading.Thread(
+                target=asyncio.run, args=(self._websocket_listener(),))
+            self.ws_listener.start()
 
         thread_store = []
         http_thread = threading.Thread(
@@ -304,9 +323,18 @@ class RelukkoClient:
             args=(url, max_run_time, payload, thread_store))
         http_thread.start()
         http_thread.join()
-        self.ws_listener.join()
 
-        return thread_store[0]
+        if not self.disable_websocket:
+            self.ws_listener.join()
+
+        if thread_store:
+            if (
+                self.raise_when_acquire_fails
+                and isinstance(thread_store[0], Exception)
+            ):
+                raise thread_store[0]
+            return thread_store[0]
+        return None
 
     def get_lock(self, lock_id: str) -> Dict:
         """

{pyrelukko-0.5.0 → pyrelukko-0.6.0}/src/pyrelukko/version.py

@@ -1,2 +1,2 @@
 # pylint: disable=all
-__version__ = "0.5.0"
+__version__ = "0.6.0"

{pyrelukko-0.5.0 → pyrelukko-0.6.0}/tests/test_relukko.py

@@ -8,6 +8,7 @@ from typing import Dict
 
 import pytest
 import requests
+from requests_mock import ANY
 from requests.adapters import HTTPAdapter
 from requests.cookies import cookiejar_from_dict
 from urllib3.util import parse_url
@@ -19,6 +20,8 @@ from pyrelukko.retry import retry
 
 SCRIPT_DIR = Path(__file__).parent.absolute()
 
+logging.basicConfig()
+logging.getLogger().setLevel(logging.DEBUG)
 logger = logging.getLogger(__name__)
 
 
@@ -64,6 +67,8 @@ def test_init_relukko_client():
     assert relukko.ws_ping_timeout == 20
     assert relukko.acquire_wait_for_timeout == 2
     assert relukko.acquire_modulo == 100
+    assert relukko.disable_websocket == False
+    assert relukko.raise_when_acquire_fails == True
 
     with pytest.raises(ValueError):
         RelukkoClient(base_url=1000, api_key="")
@@ -179,6 +184,8 @@ def test_reconfigure_relukko_client():
     assert relukko.ws_ping_timeout == 20
     assert relukko.acquire_wait_for_timeout == 2
     assert relukko.acquire_modulo == 100
+    assert relukko.disable_websocket == False
+    assert relukko.raise_when_acquire_fails == True
 
 
 def test_reconfigure_relukko_client_extended():
@@ -204,6 +211,7 @@ def test_reconfigure_relukko_client_extended():
         ws_wait_for_timeout=ws_wait_for_timeout, acquire_modulo=acquire_modulo,
         ws_ping_interval=ws_ping_interval, ws_ping_timeout=ws_ping_timeout,
         acquire_wait_for_timeout=acquire_wait_for_timeout,
+        disable_websocket=True, raise_when_acquire_fails=False,
     )
 
     assert relukko.session.trust_env == False
@@ -241,6 +249,8 @@ def test_reconfigure_relukko_client_extended():
     assert relukko.ws_ping_timeout == ws_ping_timeout
     assert relukko.acquire_wait_for_timeout == acquire_wait_for_timeout
     assert relukko.acquire_modulo == acquire_modulo
+    assert relukko.disable_websocket == True
+    assert relukko.raise_when_acquire_fails == False
 
 
 def test_init_relukko_client_extented():
@@ -259,6 +269,7 @@ def test_init_relukko_client_extented():
         ws_wait_for_timeout=ws_wait_for_timeout, acquire_modulo=acquire_modulo,
         ws_ping_interval=ws_ping_interval, ws_ping_timeout=ws_ping_timeout,
         acquire_wait_for_timeout=acquire_wait_for_timeout,
+        disable_websocket=True, raise_when_acquire_fails=False,
     )
 
     assert relukko.session.trust_env == False
@@ -289,6 +300,8 @@ def test_init_relukko_client_extented():
     assert relukko.ws_ping_timeout == ws_ping_timeout
     assert relukko.acquire_wait_for_timeout == acquire_wait_for_timeout
     assert relukko.acquire_modulo == acquire_modulo
+    assert relukko.disable_websocket == True
+    assert relukko.raise_when_acquire_fails == False
 
 
 def test_init_relukko_client_ssl_ctx():
@@ -378,6 +391,188 @@ def test_reconfigre_relukko_client_retry():
     assert relukko.exceptions == exceptions
 
 
+def test_aqcuire_http_status_code_400_with_raise(requests_mock):
+    requests_mock.register_uri(
+        ANY,
+        ANY,
+        status_code=400,
+        reason="Bad Request",
+        json={"status": 400, "message": "Bad Request"},
+    )
+
+    relukko = RelukkoClient(
+        base_url="http://relukko", api_key="key",
+        delay=1, backoff=1.01, disable_websocket=True,
+    )
+    with pytest.raises(requests.HTTPError):
+        relukko.acquire_relukko("400Lock", "PyTest", 300)
+
+
+def test_aqcuire_http_status_code_400_without_raise(requests_mock):
+    requests_mock.register_uri(
+        ANY,
+        ANY,
+        status_code=400,
+        reason="Bad Request",
+        json={"status": 400, "message": "Bad Request"},
+    )
+
+    relukko = RelukkoClient(
+        base_url="http://relukko", api_key="key",disable_websocket=True,
+        delay=1, backoff=1.01, raise_when_acquire_fails=False,
+    )
+    lock = relukko.acquire_relukko("500Lock", "PyTest", 300)
+    assert isinstance(lock, requests.exceptions.HTTPError)
+
+
+def test_aqcuire_http_status_code_418_with_raise(requests_mock):
+    requests_mock.register_uri(
+        ANY,
+        ANY,
+        status_code=418,
+        reason="I'm a teapot",
+        text="The server refuses the attempt to brew coffee with a teapot.",
+    )
+
+    relukko = RelukkoClient(
+        base_url="http://relukko", api_key="key",
+        delay=1, backoff=1.01, disable_websocket=True,
+    )
+    with pytest.raises(RuntimeError):
+        relukko.acquire_relukko("418Lock", "PyTest", 300)
+
+
+def test_aqcuire_http_status_code_418_without_raise(requests_mock):
+    requests_mock.register_uri(
+        ANY,
+        ANY,
+        status_code=418,
+        reason="I'm a teapot",
+        text="The server refuses the attempt to brew coffee with a teapot.",
+    )
+
+    relukko = RelukkoClient(
+        base_url="http://relukko", api_key="key",disable_websocket=True,
+        delay=1, backoff=1.01, raise_when_acquire_fails=False,
+    )
+    lock = relukko.acquire_relukko("418Lock", "PyTest", 300)
+    assert isinstance(lock, RuntimeError)
+
+
+def test_aqcuire_http_status_code_500_with_raise(requests_mock):
+    requests_mock.register_uri(
+        ANY,
+        ANY,
+        status_code=500,
+        reason="Internal Server Error",
+    )
+
+    relukko = RelukkoClient(
+        base_url="http://relukko", api_key="key",
+        delay=1, backoff=1.01, disable_websocket=True,
+    )
+    with pytest.raises(RelukkoDoRetry):
+        relukko.acquire_relukko("500Lock", "PyTest", 300)
+
+
+def test_aqcuire_http_status_code_500_without_raise(requests_mock):
+    requests_mock.register_uri(
+        ANY,
+        ANY,
+        status_code=500,
+        reason="Internal Server Error",
+    )
+
+    relukko = RelukkoClient(
+        base_url="http://relukko", api_key="key",disable_websocket=True,
+        delay=1, backoff=1.01, raise_when_acquire_fails=False,
+    )
+    lock = relukko.acquire_relukko("500Lock", "PyTest", 300)
+    assert isinstance(lock, RelukkoDoRetry)
+
+
+def test_aqcuire_relukko_retry_with_max_delay(requests_mock, caplog):
+    requests_mock.register_uri(
+        ANY,
+        ANY,
+        status_code=500,
+        reason="Internal Server Error",
+    )
+
+    relukko = RelukkoClient(
+        base_url="http://relukko", api_key="key",disable_websocket=True,
+        delay=1, backoff=3, raise_when_acquire_fails=False,
+        max_delay=2,
+    )
+
+    lock = relukko.acquire_relukko("MaxDelayLock", "PyTest", 300)
+
+    one_sec_count = 0
+    two_sec_count = 0
+    for record in caplog.records:
+        if "Retrying in 2 seconds..." in record.message:
+            two_sec_count += 1
+        elif "Retrying in 1 seconds..." in record.message:
+            one_sec_count += 1
+
+    assert one_sec_count == 1
+    assert two_sec_count == 2
+    assert isinstance(lock, RelukkoDoRetry)
+
+
+def test_get_relukko_retry_400(requests_mock):
+    requests_mock.register_uri(
+        ANY,
+        ANY,
+        status_code=400,
+        reason="Bad Request",
+        json={"status": 400, "message": "Bad Request"},
+    )
+
+    relukko = RelukkoClient(
+        base_url="http://relukko", api_key="key",disable_websocket=True,
+        delay=1, backoff=0.5, raise_when_acquire_fails=False,
+    )
+
+    with pytest.raises(requests.HTTPError):
+        relukko.get_lock("GetLock400")
+
+
+def test_get_relukko_retry_418(requests_mock):
+    requests_mock.register_uri(
+        ANY,
+        ANY,
+        status_code=418,
+        reason="I'm a teapot",
+        text="The server refuses the attempt to brew coffee with a teapot.",
+    )
+
+    relukko = RelukkoClient(
+        base_url="http://relukko", api_key="key",disable_websocket=True,
+        delay=1, backoff=0.5, raise_when_acquire_fails=False,
+    )
+
+    with pytest.raises(RuntimeError):
+        relukko.get_lock("GetLock418")
+
+
+def test_get_relukko_retry_500(requests_mock):
+    requests_mock.register_uri(
+        ANY,
+        ANY,
+        status_code=500,
+        reason="Internal Server Error",
+    )
+
+    relukko = RelukkoClient(
+        base_url="http://relukko", api_key="key",disable_websocket=True,
+        delay=1, backoff=0.5, raise_when_acquire_fails=False,
+    )
+
+    with pytest.raises(RelukkoDoRetry):
+        relukko.get_lock("GetLock500")
+
+
 def test_acquire_relukko(relukko_backend):
     relukko, _ = relukko_backend
 

pyrelukko-0.5.0/cicd/build-py-rf-image.sh

@@ -1,48 +0,0 @@
-#!/bin/sh
-
-set -e
-
-SCRIPT_DIR=$(dirname "$(readlink -f "$0")")
-REPO_DIR="${SCRIPT_DIR}/.."
-CONTAINER_DIR="${REPO_DIR}/container"
-CONTAINER_CMD="docker"
-
-# IMAGE_NAME should normally come from .gitlab-ci.yml file,
-# set default for local usage.
-if [ -z "${IMAGE_NAME+x}" ]; then
-    IMAGE_NAME=py-rf-image-local
-fi
-
-cd "${CONTAINER_DIR}" || exit
-
-${CONTAINER_CMD} build -t "${IMAGE_NAME}:latest" --file Containerfile .
-
-${CONTAINER_CMD} images
-
-if [ -n "${CI_REGISTRY_IMAGE}" ]; then
-    # In Gitlab
-
-    # Tag with Git commit short sha and push
-    IMAGE_WITH_GIT_SHA="${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:${CI_COMMIT_SHORT_SHA}"
-    echo "IMAGE_WITH_GIT_SHA: ${IMAGE_WITH_GIT_SHA}"
-
-    ${CONTAINER_CMD} tag "${IMAGE_NAME}:latest" "${IMAGE_WITH_GIT_SHA}"
-    ${CONTAINER_CMD} push "${IMAGE_WITH_GIT_SHA}"
-
-    if [ "${CI_COMMIT_BRANCH}" = "${CI_DEFAULT_BRANCH}" ]; then
-        # We run in default branch, also tag with latest
-        # Tag with "latest" (overwrites last 'latest' in registry) and push
-        IMAGE_WITH_LATEST="${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:latest"
-
-        echo "Tag image with as 'latest': ${IMAGE_WITH_LATEST}"
-
-        ${CONTAINER_CMD} tag "${IMAGE_NAME}:latest" "${IMAGE_WITH_LATEST}"
-        ${CONTAINER_CMD} push "${IMAGE_WITH_LATEST}"
-    fi
-else
-    echo "Runs locally, no pushing!"
-fi
-
-cd -
-
-# vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:

pyrelukko-0.5.0/cicd/run_docs_pages.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-SCRIPT_DIR=$(dirname "$(readlink -f "$0")")
-REPO_DIR="${SCRIPT_DIR}/.."
-PUBLIC_DIR="${REPO_DIR}/public"
-
-# Main script execution
-main() {
-    mkdir -p "${PUBLIC_DIR}"
-    # libdoc --pythonpath ./src  Relukko  "${PUBLIC_DIR}/index.html"
-    echo "Not Implemented yet"
-}
-
-# Execute the main function
-main
-
-# vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:

pyrelukko-0.5.0/cicd/run_pylint.sh

@@ -1,24 +0,0 @@
-#!/bin/bash
-
-SCRIPT_DIR=$(dirname "$(readlink -f "$0")")
-REPO_DIR="${SCRIPT_DIR}/.."
-
-# Main script execution
-main() {
-    pylint --verbose \
-            --rcfile "${REPO_DIR}/pyproject.toml" \
-            --output-format=json:pylint.out.json,parseable:pylint.out.txt,text \
-            "${REPO_DIR}"
-    pylint_exit_code=$?
-
-    pylint-json2html \
-        -o "${REPO_DIR}/pylint.out.html" \
-        "${REPO_DIR}/pylint.out.json"
-
-    return ${pylint_exit_code}
-}
-
-# Execute the main function
-main
-
-# vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:

pyrelukko-0.5.0/cicd/run_pytest.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# SCRIPT_DIR=$(dirname "$(readlink -f "$0")")
-# REPO_DIR="${SCRIPT_DIR}/.."
-
-# Main script execution
-main() {
-    # pytest --junit-xml "${REPO_DIR}/pytest-junit.xml"
-    tox run --skip-missing-interpreters
-}
-
-# Execute the main function
-main
-
-# vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:

pyrelukko-0.5.0/container/Containerfile

@@ -1,5 +0,0 @@
-FROM python:3.13-alpine
-
-RUN apk add --no-cache bash shellcheck
-COPY requirements.txt /opt/requirements.txt
-RUN pip install --no-cache-dir -r /opt/requirements.txt

pyrelukko-0.5.0/container/requirements.txt

@@ -1,5 +0,0 @@
-pylint==3.3.1
-pylint-json2html==0.5.0
-pytest==8.3.3
-requests==2.32.3
-websockets==13.1