Merge branch 'develop'

.github/workflows/docker-image.yml

@@ -40,7 +40,7 @@ jobs:
           fi
 
       - name: Build Backend image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           tags: ${{ env.TAG }}
           context: .

.github/workflows/test.yml

@@ -36,7 +36,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Build Backend Container
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           tags: mtsrus/horizon-backend:${{ github.sha }}
           context: .
@@ -144,7 +144,8 @@ jobs:
       - name: Download all raw coverage data
         uses: actions/download-artifact@v4
         with:
-          path: coverage-data
+          path: coverage-data/
+          pattern: raw-coverage-*
 
       - name: Combine Coverage Data
         run: |

.pre-commit-config.yaml

@@ -87,7 +87,7 @@ repos:
           - black==24.4.2
 
   - repo: https://github.com/pycqa/bandit
-    rev: 1.7.8
+    rev: 1.7.9
     hooks:
       - id: bandit
         args:

.readthedocs.yaml

@@ -8,9 +8,11 @@ build:
     - libldap2-dev
     - libsasl2-dev
   jobs:
+    post_checkout:
+      - git fetch --unshallow || true
     post_create_environment:
       - python -m pip install poetry
-      - python -m pip install sphinx-plantuml # remove after https://github.com/zqmillet/sphinx-plantuml/pull/4
+      - python -m pip install --no-deps sphinx-plantuml # remove after https://github.com/zqmillet/sphinx-plantuml/pull/4
       - VIRTUAL_ENV=$READTHEDOCS_VIRTUALENV_PATH python -m poetry config virtualenvs.create false
       - VIRTUAL_ENV=$READTHEDOCS_VIRTUALENV_PATH python -m poetry config virtualenvs.prefer-active-python true
       - VIRTUAL_ENV=$READTHEDOCS_VIRTUALENV_PATH python -m poetry debug info

docs/changelog/1.0.1.rst

@@ -0,0 +1,12 @@
+1.0.1 (2024-06-27)
+==================
+
+Dependencies
+------------
+
+- Bump minimal ``urllib3`` version to ``1.26.0``, to avoid exceptions like:
+
+.. code::
+
+    ValidationError: 1 validation error for HorizonClientSync__root__
+        __init__() got an unexpected keyword argument 'allowed_methods' (type=type_error)

docs/changelog/index.rst

@@ -3,6 +3,7 @@
     :caption: Changelog
 
     DRAFT
+    1.0.1
     1.0.0
     0.2.1
     0.2.0

docs/conf.py

@@ -34,7 +34,7 @@
 # The short X.Y version.
 
 # this value is updated automatically by `poetry version ...` and poetry-bumpversion plugin
-ver = Version.parse("1.0.0")
+ver = Version.parse("1.0.1")
 version = ver.base_version
 # The full version, including alpha/beta/rc tags.
 release = ver.public
@@ -58,7 +58,9 @@
     "sphinxcontrib.plantuml",
     "sphinx_favicon",
     "sphinxarg.ext",
+    "sphinx_last_updated_by_git",
 ]
+
 swagger = [
     {
         "name": "Horizon REST API",
@@ -69,6 +71,7 @@
         },
     },
 ]
+
 numpydoc_show_class_members = True
 autodoc_pydantic_model_show_config = False
 autodoc_pydantic_model_show_config_summary = False
@@ -133,6 +136,9 @@
     {"rel": "icon", "href": "icon.svg", "type": "image/svg+xml"},
 ]
 
+# TODO: remove after https://github.com/mgeier/sphinx-last-updated-by-git/pull/77
+git_exclude_patterns = ["docs/_static/logo.svg"]
+
 # The master toctree document.
 master_doc = "index"
 

horizon/__init__.py

@@ -3,7 +3,7 @@
 
 # _raw_version could contain pre-release version, like 0.0.1dev123
 # value is updated automatically by `poetry version ...` and poetry-bumpversion plugin
-_raw_version = "1.0.0"
+_raw_version = "1.0.1"
 
 # version always contain only release number like 0.0.1
 __version__ = ".".join(_raw_version.split(".")[:3])  # noqa: WPS410

horizon/client/sync.py

@@ -988,7 +988,7 @@ def _configure_retries(cls, values):
 
         optional_retry_args = {}
         if retry_config.backoff_jitter is not None:
-            # added to Retry class onlu in urllib3 2.0+
+            # added to Retry class only in urllib3 2.0+
             optional_retry_args["backoff_jitter"] = retry_config.backoff_jitter
 
         retries = Retry(

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "data-horizon"
-version = "1.0.0"
+version = "1.0.1"
 license = "Apache-2.0"
 description = "Horizon REST API + client"
 authors = ["DataOps.ETL <onetools@mts.ru>"]
@@ -97,6 +97,7 @@ authlib = [
   {version = ">=1.2.1", optional = true, python = ">=3.8"},
 ]
 requests = {version = "*", optional = true}
+urllib3 = {version = ">=1.26.0", optional = true}
 bonsai = {version = "^1.5.3", optional = true}
 python-json-logger = {version = "*", optional = true}
 coloredlogs = {version = "*", optional = true}
@@ -143,6 +144,7 @@ ldap = [
 client-sync = [
   "authlib",
   "requests",
+  "urllib3",
 ]
 
 [tool.poetry.group.test.dependencies]
@@ -217,6 +219,7 @@ sphinx-issues = {version = ">=3.0.1,<5.0.0", python = ">=3.8"}
 sphinx-design = {version = "^0.5.0", python = ">=3.8"}
 sphinx-favicon = {version = "^1.0.1", python = ">=3.8"}
 sphinx-argparse = {version = ">=0.2.5,<0.5.0", python = ">=3.8"}
+sphinx-last-updated-by-git = {version = "^0.3.7", python = ">=3.8"}
 # uncomment after https://github.com/zqmillet/sphinx-plantuml/pull/4
 # sphinx-plantuml = {version = "^1.0.0", python = ">=3.8"}