From 720e91ee8d8953d87e7b7f12fb3f7e66e2ffa3d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D1=80=D1=82=D1=8B=D0=BD=D0=BE=D0=B2=20=D0=9C?= =?UTF-8?q?=D0=B0=D0=BA=D1=81=D0=B8=D0=BC=20=D0=A1=D0=B5=D1=80=D0=B3=D0=B5?= =?UTF-8?q?=D0=B5=D0=B2=D0=B8=D1=87?= Date: Mon, 15 Apr 2024 10:34:33 +0000 Subject: [PATCH 1/4] [DOP-15023] Bump version --- .env.docker | 1 - .env.local | 1 - .github/workflows/dev-release.yaml | 1 + docker/Dockerfile.worker | 2 ++ docs/conf.py | 2 +- pyproject.toml | 3 ++- syncmaster/__init__.py | 2 +- 7 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.env.docker b/.env.docker index cc08d70b..1d99c33c 100644 --- a/.env.docker +++ b/.env.docker @@ -51,4 +51,3 @@ ENV=LOCAL SPARK_CONF_DIR=/app/tests/spark/hive/conf/ HADOOP_CONF_DIR=/app/tests/spark/hadoop/ HIVE_CONF_DIR=/app/tests/spark/hive/conf/ -CREATE_SPARK_SESSION_FUNCTION=tests.spark.get_worker_spark_session.get_worker_spark_session diff --git a/.env.local b/.env.local index bc58de7e..bed1f051 100644 --- a/.env.local +++ b/.env.local @@ -51,4 +51,3 @@ export ENV=LOCAL export SPARK_CONF_DIR=./app/tests/spark/hive/conf/ export HADOOP_CONF_DIR=./app/tests/spark/hadoop/ export HIVE_CONF_DIR=./app/tests/spark/hive/conf/ -export CREATE_SPARK_SESSION_FUNCTION=tests.spark.get_worker_spark_session.get_worker_spark_session diff --git a/.github/workflows/dev-release.yaml b/.github/workflows/dev-release.yaml index ce0ffab3..9f83cc8e 100644 --- a/.github/workflows/dev-release.yaml +++ b/.github/workflows/dev-release.yaml @@ -43,6 +43,7 @@ jobs: - name: Generate unique version and update test version run: | poetry self add poetry-bumpversion + poetry self install version=$(poetry version -s) poetry version "${version}.dev${GITHUB_RUN_ID}" diff --git a/docker/Dockerfile.worker b/docker/Dockerfile.worker index 8df5f2e0..2afbb450 100644 --- a/docker/Dockerfile.worker +++ b/docker/Dockerfile.worker @@ -37,6 +37,8 @@ CMD ["--loglevel=info"] FROM prod as test +ENV CREATE_SPARK_SESSION_FUNCTION=tests.spark.get_worker_spark_session.get_worker_spark_session + # CI runs tests in the worker container, so we need backend dependencies too RUN poetry install --no-root --extras "worker backend" --with test RUN sed -i 's/python -m/coverage run -m/g' /app/entrypoint.sh diff --git a/docs/conf.py b/docs/conf.py index 5a215b31..d300407d 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -36,7 +36,7 @@ # The short X.Y version. # this value is updated automatically by `poetry version ...` and poetry-bumpversion plugin -ver = Version.parse("0.1.1") +ver = Version.parse("0.1.3") version = ver.base_version # The full version, including alpha/beta/rc tags. release = ver.public diff --git a/pyproject.toml b/pyproject.toml index d838cf8b..0ae08339 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "data-syncmaster" -version = "0.1.2" +version = "0.1.3" license = "Apache-2.0" description = "Syncmaster REST API + Worker" authors = ["DataOps.ETL "] @@ -199,6 +199,7 @@ exclude_lines = [ + [tool.poetry.group.docs.dependencies] autodoc-pydantic = {version = "^2.0.1", python = ">=3.8"} numpydoc = {version = "^1.6.0", python = ">=3.8"} diff --git a/syncmaster/__init__.py b/syncmaster/__init__.py index e0cc2912..8a7580c3 100644 --- a/syncmaster/__init__.py +++ b/syncmaster/__init__.py @@ -1,6 +1,6 @@ # SPDX-FileCopyrightText: 2023-2024 MTS (Mobile Telesystems) # SPDX-License-Identifier: Apache-2.0 -_raw_version = "0.1.1" +_raw_version = "0.1.3" # version always contain only release number like 0.0.1 __version__ = ".".join(_raw_version.split(".")[:3]) # noqa: WPS410 From 227cd26c9fd97dd03658c2e832d283a499524d55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D1=80=D1=82=D1=8B=D0=BD=D0=BE=D0=B2=20=D0=9C?= =?UTF-8?q?=D0=B0=D0=BA=D1=81=D0=B8=D0=BC=20=D0=A1=D0=B5=D1=80=D0=B3=D0=B5?= =?UTF-8?q?=D0=B5=D0=B2=D0=B8=D1=87?= Date: Mon, 15 Apr 2024 17:49:53 +0300 Subject: [PATCH 2/4] [DOP-15023] Fix backend entrypoint --- docker/entrypoint_backend.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/entrypoint_backend.sh b/docker/entrypoint_backend.sh index 91ed0cfb..15b9dab7 100755 --- a/docker/entrypoint_backend.sh +++ b/docker/entrypoint_backend.sh @@ -4,4 +4,4 @@ set -e python -m syncmaster.db.migrations upgrade head # exec is required to forward all signals to the main process -exec python -m syncmaster.backend --host 0.0.0.0 --port 8000 "$@" & +exec python -m syncmaster.backend --host 0.0.0.0 --port 8000 "$@" From a934f82c2ac034376212b683e1bb52dd4adc1772 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D1=80=D1=82=D1=8B=D0=BD=D0=BE=D0=B2=20=D0=9C?= =?UTF-8?q?=D0=B0=D0=BA=D1=81=D0=B8=D0=BC=20=D0=A1=D0=B5=D1=80=D0=B3=D0=B5?= =?UTF-8?q?=D0=B5=D0=B2=D0=B8=D1=87?= Date: Mon, 15 Apr 2024 17:51:38 +0300 Subject: [PATCH 3/4] [DOP-15023] Fix backend entrypoint --- docs/changelog/0.1.3.rst | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 docs/changelog/0.1.3.rst diff --git a/docs/changelog/0.1.3.rst b/docs/changelog/0.1.3.rst new file mode 100644 index 00000000..73390c74 --- /dev/null +++ b/docs/changelog/0.1.3.rst @@ -0,0 +1,7 @@ +0.1.3 (2024-04-15) +================== + +Bug Fixes +---------- + +Fix backend image entrypoint. From fc0534dc807fd12d6d03644213b5d91f8d1166a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D1=80=D1=82=D1=8B=D0=BD=D0=BE=D0=B2=20=D0=9C?= =?UTF-8?q?=D0=B0=D0=BA=D1=81=D0=B8=D0=BC=20=D0=A1=D0=B5=D1=80=D0=B3=D0=B5?= =?UTF-8?q?=D0=B5=D0=B2=D0=B8=D1=87?= Date: Mon, 15 Apr 2024 17:53:37 +0300 Subject: [PATCH 4/4] [DOP-15023] Fix backend entrypoint --- docs/changelog/index.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/changelog/index.rst b/docs/changelog/index.rst index d78d4b4b..47cc6f2d 100644 --- a/docs/changelog/index.rst +++ b/docs/changelog/index.rst @@ -3,5 +3,6 @@ :caption: Changelog DRAFT + 0.1.3 0.1.2 0.1.1