#63: Updated to exaslct 1.0.0 (#64)

fixes #63 Co-authored-by: Christoph Pirkl <[email protected]> --------- Co-authored-by: Christoph Pirkl <[email protected]>
exasol · Sep 4, 2024 · 5ad84bf · 5ad84bf
1 parent 9ba6f37
commit 5ad84bf
Show file tree

Hide file tree

Showing 14 changed files with 411 additions and 374 deletions.
diff --git a/doc/changes/changelog.md b/doc/changes/changelog.md
@@ -1,5 +1,6 @@
 # Changes
 
+* [1.6.0](changes_1.6.0.md)
 * [1.5.0](changes_1.5.0.md)
 * [1.4.0](changes_1.4.0.md)
 * [1.3.4](changes_1.3.4.md)

diff --git a/doc/changes/changes_1.6.0.md b/doc/changes/changes_1.6.0.md
@@ -0,0 +1,12 @@
+# Script-Languages-Container-CI 1.6.0, 2024-09-04
+
+Code name: Update SLCT to 1.0.0
+
+## Summary
+
+Updated several dependencies.
+
+## Dependencies
+
+ - #63: Updated slct
+
diff --git a/exasol_script_languages_container_ci/lib/ci_build.py b/exasol_script_languages_container_ci/lib/ci_build.py
@@ -1,10 +1,9 @@
 import logging
-from typing import Tuple, Dict, Optional
+from typing import Tuple, Optional
 
 from exasol_integration_test_docker_environment.lib.api.build_test_container import build_test_container
-from exasol_integration_test_docker_environment.lib.docker.images.image_info import ImageInfo
-from exasol_script_languages_container_tool.lib.api import build
-from exasol_script_languages_container_tool.lib.tasks.test.test_container_content import build_test_container_content
+from exasol.slc.api import build
+from exasol.slc.internal.tasks.test.test_container_content import build_test_container_content
 
 from exasol_script_languages_container_ci.lib.ci_step_output_printer import CIStepOutputPrinterProtocol, \
     CIStepOutputPrinter

diff --git a/exasol_script_languages_container_ci/lib/ci_export.py b/exasol_script_languages_container_ci/lib/ci_export.py
@@ -1,8 +1,7 @@
 import logging
 from typing import Tuple
 
-from exasol_script_languages_container_tool.lib.api import export
-from exasol_script_languages_container_tool.lib.tasks.export.export_containers import ExportContainerResult
+from exasol.slc.api import export
 
 from exasol_script_languages_container_ci.lib.ci_step_output_printer import CIStepOutputPrinterProtocol, \
     CIStepOutputPrinter

diff --git a/exasol_script_languages_container_ci/lib/ci_push.py b/exasol_script_languages_container_ci/lib/ci_push.py
@@ -1,7 +1,7 @@
 import logging
 from typing import Tuple
 
-from exasol_script_languages_container_tool.lib.api.push import push
+from exasol.slc.api.push import push
 
 from exasol_script_languages_container_ci.lib.ci_step_output_printer import CIStepOutputPrinterProtocol, \
     CIStepOutputPrinter

diff --git a/exasol_script_languages_container_ci/lib/ci_security_scan.py b/exasol_script_languages_container_ci/lib/ci_security_scan.py
@@ -1,8 +1,8 @@
 import logging
 from pathlib import Path
-from typing import Tuple, Callable
+from typing import Tuple
 
-from exasol_script_languages_container_tool.lib.api import security_scan
+from exasol.slc.api import security_scan
 
 from exasol_script_languages_container_ci.lib.ci_step_output_printer import CIStepOutputPrinterProtocol, \
     CIStepOutputPrinter

diff --git a/exasol_script_languages_container_ci/lib/ci_test.py b/exasol_script_languages_container_ci/lib/ci_test.py
@@ -1,8 +1,8 @@
 import logging
 from typing import Tuple, Protocol
 
-from exasol_script_languages_container_tool.lib.api.run_db_tests import run_db_test
-from exasol_script_languages_container_tool.lib.tasks.test.test_container import AllTestsResult
+from exasol.slc.api.run_db_tests import run_db_test
+from exasol.slc.models.test_result import AllTestsResult
 
 from exasol_script_languages_container_ci.lib.ci_step_output_printer import CIStepOutputPrinterProtocol, \
     CIStepOutputPrinter

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "exasol-script-languages-container-ci"
-version = "1.5.0"
+version = "1.6.0"
 description = "Implements CI builds for script-language-container."
 
 license = "MIT"
@@ -13,10 +13,10 @@ authors = [
 python = ">=3.10.0,<4.0"
 click = "^8.1.7"
 GitPython = ">=3.1.0"
-exasol-script-languages-container-tool = "^0.20.0"
+exasol-script-languages-container-tool = "^1.0.0"
 exasol-integration-test-docker-environment = "^3.1.0"
 PyGithub = "^2.3.0"
-setuptools = "^70.0.0"
+setuptools = "^73.0.0"
 datamodel-code-generator = ">=0.25.5 <0.30.0"
 
 [build-system]

diff --git a/scripts/build/build_release.sh b/scripts/build/build_release.sh
diff --git a/test/integration_tests/resources/flavors/failing_run_db_test/flavor_base/build_steps.py b/test/integration_tests/resources/flavors/failing_run_db_test/flavor_base/build_steps.py
@@ -1,6 +1,6 @@
 from typing import Dict
 
-from exasol_script_languages_container_tool.lib.tasks.build.docker_flavor_image_task import DockerFlavorAnalyzeImageTask
+from exasol.slc.internal.tasks.build.docker_flavor_image_task import DockerFlavorAnalyzeImageTask
 
 
 class AnalyzeBaseTestBuildRun(DockerFlavorAnalyzeImageTask):

diff --git a/test/integration_tests/resources/flavors/failing_security_scan/flavor_base/build_steps.py b/test/integration_tests/resources/flavors/failing_security_scan/flavor_base/build_steps.py
@@ -1,6 +1,6 @@
 from typing import Dict
 
-from exasol_script_languages_container_tool.lib.tasks.build.docker_flavor_image_task import DockerFlavorAnalyzeImageTask
+from exasol.slc.internal.tasks.build.docker_flavor_image_task import DockerFlavorAnalyzeImageTask
 
 
 class AnalyzeBaseTestBuildRun(DockerFlavorAnalyzeImageTask):

diff --git a/test/integration_tests/resources/flavors/successful/flavor_base/build_steps.py b/test/integration_tests/resources/flavors/successful/flavor_base/build_steps.py
@@ -1,6 +1,6 @@
 from typing import Dict
 
-from exasol_script_languages_container_tool.lib.tasks.build.docker_flavor_image_task import DockerFlavorAnalyzeImageTask
+from exasol.slc.internal.tasks.build.docker_flavor_image_task import DockerFlavorAnalyzeImageTask
 
 
 class AnalyzeBaseTestBuildRun(DockerFlavorAnalyzeImageTask):

diff --git a/test/unit_tests/test_ci_test.py b/test/unit_tests/test_ci_test.py
@@ -4,7 +4,7 @@
 from unittest.mock import call, create_autospec, MagicMock
 
 import pytest
-from exasol_script_languages_container_tool.lib.tasks.test.test_container import AllTestsResult
+from exasol.slc.models.test_result import AllTestsResult
 
 from exasol_script_languages_container_ci.lib.ci_step_output_printer import CIStepOutputPrinterProtocol
 from exasol_script_languages_container_ci.lib.ci_test import CIExecuteTest, DBTestRunnerProtocol