Merge branch 'feature/version-upgrade-knutils-logging' into 'master'

Upgrade python version & change logger

See merge request knecon/research/pyinfra!80

.gitlab-ci.yml

@@ -3,6 +3,9 @@ include:
     ref: 0.2.6
     file: "/ci-templates/research/python_pkg_venv_test_build_release_gitlab-ci.yml"
 
+default:
+  image: python:3.10
+
 run-tests:
   script:
     - pytest .

pyinfra/k8s_probes/startup.py

@@ -1,5 +1,5 @@
 import sys
-from loguru import logger
+from kn_utils.logging import logger
 from pathlib import Path
 
 from pyinfra.queue.queue_manager import token_file_name

pyinfra/payload_processing/processor.py

@@ -1,4 +1,4 @@
-from loguru import logger
+from kn_utils.logging import logger
 from dataclasses import asdict
 from typing import Callable, List
 

pyinfra/queue/queue_manager.py

@@ -5,7 +5,7 @@ import logging
 import pika
 import pika.exceptions
 import signal
-from loguru import logger
+from kn_utils.logging import logger
 from pathlib import Path
 from pika.adapters.blocking_connection import BlockingChannel
 

pyinfra/storage/storage_provider.py

@@ -1,6 +1,6 @@
 from dataclasses import asdict
 from functools import partial, lru_cache
-from loguru import logger
+from kn_utils.logging import logger
 from typing import Tuple
 
 from pyinfra.config import Config

pyinfra/storage/storages/azure.py

@@ -1,7 +1,7 @@
 import logging
 from azure.storage.blob import BlobServiceClient, ContainerClient
 from itertools import repeat
-from loguru import logger
+from kn_utils.logging import logger
 from operator import attrgetter
 from retry import retry
 

pyinfra/storage/storages/s3.py

@@ -1,6 +1,6 @@
 import io
 from itertools import repeat
-from loguru import logger
+from kn_utils.logging import logger
 from minio import Minio
 from operator import attrgetter
 from retry import retry

pyproject.toml

@@ -1,36 +1,40 @@
 [tool.poetry]
 name = "pyinfra"
-version = "1.8.0"
+version = "1.9.0"
 description = ""
 authors = ["Team Research <research@knecon.com>"]
 license = "All rights reseverd"
 readme = "README.md"
 
 [tool.poetry.dependencies]
-python = "^3.8"
-pika = "^1.2.0"
-retry = "^0.9.2"
-minio = "^7.1.3"
-azure-core = "^1.22.1"
-azure-storage-blob = "^12.9.0"
-funcy = "^1.17"
-prometheus-client = "^0.16.0"
-pycryptodome = "^3.17"
-loguru = "^0.6.0"
+python = "^3.10"
+# infra, deployment
+pika = "^1.3"
+retry = "^0.9"
+minio = "^7.1"
+prometheus-client = "^0.18"
+# azure
+azure-core = "^1.29"
+azure-storage-blob = "^12.13"
+# misc utils
+funcy = "^2"
+pycryptodome = "^3.19"
+# research shared packages
+kn-utils = { version = "^0.2.3", source = "gitlab-research" }
 
 [tool.poetry.group.dev.dependencies]
-pytest = "^7.1.3"
-ipykernel = "^6.16.0"
-black = { version = "^23.1a1", allow-prereleases = true }
-pylint = "^2.15.10"
-coverage = "^7.2.0"
-requests = "^2.28.2"
-testcontainers = "^3.7.1"
+pytest = "^7"
+ipykernel = "^6.26.0"
+black = "^23.10"
+pylint = "^3"
+coverage = "^7.3"
+requests = "^2.31"
 
 [tool.pytest.ini_options]
 minversion = "6.0"
 addopts = "-ra -q"
 testpaths = ["tests", "integration"]
+norecursedirs = "tests/tests_with_docker_compose"
 log_cli = 1
 log_cli_level = "DEBUG"
 

pytest.ini

@@ -1,5 +0,0 @@
-[pytest]
-norecursedirs = tests/tests_with_docker_compose
-; storage tests and queue manager tests are disabled, since docker compose takes too long to start for regular tests.
-; They should be run though once before a release.
-; The queue manager tests are also disabled because they are not stable.

tests/unit_tests/test_knutils.py

@@ -0,0 +1,14 @@
+def test_necessary_log_levels_are_supported_by_kn_utils():
+    from kn_utils.logging import logger
+
+    logger.setLevel("TRACE")
+
+    logger.trace("trace")
+    logger.debug("debug")
+    logger.info("info")
+    logger.warning("warning")
+    logger.critical("critical")
+
+    err = Exception("exception")
+    logger.exception(err)
+    logger.error(err)