#61: Updated dependencies (#62)

fixes #61
exasol · Jul 29, 2024 · 9ba6f37 · 9ba6f37
1 parent 5671d29
commit 9ba6f37
Show file tree

Hide file tree

Showing 8 changed files with 309 additions and 303 deletions.
diff --git a/doc/changes/changelog.md b/doc/changes/changelog.md
@@ -1,5 +1,6 @@
 # Changes
 
+* [1.5.0](changes_1.5.0.md)
 * [1.4.0](changes_1.4.0.md)
 * [1.3.4](changes_1.3.4.md)
 * [1.3.3](changes_1.3.3.md)

diff --git a/doc/changes/changes_1.5.0.md b/doc/changes/changes_1.5.0.md
@@ -0,0 +1,12 @@
+# Script-Languages-Container-CI 1.5.0, 2024-07-29
+
+Code name: Update Dependencies
+
+## Summary
+
+Updated several dependencies.
+
+## Dependencies
+
+ - #61: Updated dependencies
+
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.4.0"
+version = "1.5.0"
 description = "Implements CI builds for script-language-container."
 
 license = "MIT"
@@ -13,8 +13,8 @@ authors = [
 python = ">=3.10.0,<4.0"
 click = "^8.1.7"
 GitPython = ">=3.1.0"
-exasol-script-languages-container-tool = "^0.19.0"
-exasol-integration-test-docker-environment = "^3.0.0"
+exasol-script-languages-container-tool = "^0.20.0"
+exasol-integration-test-docker-environment = "^3.1.0"
 PyGithub = "^2.3.0"
 setuptools = "^70.0.0"
 datamodel-code-generator = ">=0.25.5 <0.30.0"

diff --git a/test/integration_tests/resources/test_containers/failing/build/Dockerfile b/test/integration_tests/resources/test_containers/failing/build/Dockerfile
@@ -1,13 +1,13 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 ENV DEBIAN_FRONTEND=noninteractive
 
 COPY deps/01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc
 
 RUN apt-get -y update && \
     apt-get -y install \
-        openjdk-11-jdk \
+        openjdk-17-jdk \
         locales \
-        python3.8-venv \
+        python3.10-venv \
         python3-pip \
         unixodbc \
         unixodbc-dev \
@@ -22,9 +22,9 @@ RUN apt-get -y update && \
 RUN curl -fsSL https://get.docker.com | bash
 
 RUN mkdir -p downloads/ODBC downloads/JDBC downloads/EXAplus
-RUN curl -s https://exasol-script-languages-dependencies.s3.eu-central-1.amazonaws.com/EXASOL_ODBC-7.0.11.tar.gz | tar -C downloads/ODBC --strip-components 1 -zxf -
-RUN curl -s https://x-up.s3.amazonaws.com/7.x/7.1.14/EXASOL_JDBC-7.1.14.tar.gz | tar -C downloads/JDBC --strip-components 1 -zxf -
-RUN curl -s https://exasol-script-languages-dependencies.s3.eu-central-1.amazonaws.com/EXAplus-7.0.11.tar.gz | tar -C downloads/EXAplus --strip-components 1 -zxf -
+RUN curl -s https://x-up.s3.amazonaws.com/7.x/24.1.1/Exasol_ODBC-24.1.1-Linux_x86_64.tar.gz  | tar -C downloads/ODBC --strip-components 2 -zxf -
+RUN curl -s https://x-up.s3.amazonaws.com/7.x/24.1.1/Exasol_JDBC-24.1.1.tar.gz | tar -C downloads/JDBC --strip-components 2 -zxf -
+RUN curl -s https://x-up.s3.amazonaws.com/7.x/24.1.1/EXAplus-24.1.1.tar.gz | tar -C downloads/EXAplus --strip-components 2 -zxf -
 ENV EXAPLUS=/downloads/EXAplus/exaplus
 
 COPY deps/requirements.txt requirements.txt

diff --git a/test/integration_tests/resources/test_containers/failing/build/deps/requirements.txt b/test/integration_tests/resources/test_containers/failing/build/deps/requirements.txt
@@ -1,6 +1,6 @@
-pyodbc<5.0.0
+pyodbc
 pytz
 lxml
 docker
 scipy
-https://github.com/exasol/exasol-python-test-framework/releases/download/0.1.0/exasol_python_test_framework-0.1.0-py3-none-any.whl
+exasol-python-test-framework==0.6.0
diff --git a/test/integration_tests/resources/test_containers/successful/build/Dockerfile b/test/integration_tests/resources/test_containers/successful/build/Dockerfile
@@ -1,13 +1,13 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 ENV DEBIAN_FRONTEND=noninteractive
 
 COPY deps/01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc
 
 RUN apt-get -y update && \
     apt-get -y install \
-        openjdk-11-jdk \
+        openjdk-17-jdk \
         locales \
-        python3.8-venv \
+        python3.10-venv \
         python3-pip \
         unixodbc \
         unixodbc-dev \
@@ -22,9 +22,9 @@ RUN apt-get -y update && \
 RUN curl -fsSL https://get.docker.com | bash
 
 RUN mkdir -p downloads/ODBC downloads/JDBC downloads/EXAplus
-RUN curl -s https://exasol-script-languages-dependencies.s3.eu-central-1.amazonaws.com/EXASOL_ODBC-7.0.11.tar.gz | tar -C downloads/ODBC --strip-components 1 -zxf -
-RUN curl -s https://x-up.s3.amazonaws.com/7.x/7.1.14/EXASOL_JDBC-7.1.14.tar.gz | tar -C downloads/JDBC --strip-components 1 -zxf -
-RUN curl -s https://exasol-script-languages-dependencies.s3.eu-central-1.amazonaws.com/EXAplus-7.0.11.tar.gz | tar -C downloads/EXAplus --strip-components 1 -zxf -
+RUN curl -s https://x-up.s3.amazonaws.com/7.x/24.1.1/Exasol_ODBC-24.1.1-Linux_x86_64.tar.gz  | tar -C downloads/ODBC --strip-components 2 -zxf -
+RUN curl -s https://x-up.s3.amazonaws.com/7.x/24.1.1/Exasol_JDBC-24.1.1.tar.gz | tar -C downloads/JDBC --strip-components 2 -zxf -
+RUN curl -s https://x-up.s3.amazonaws.com/7.x/24.1.1/EXAplus-24.1.1.tar.gz | tar -C downloads/EXAplus --strip-components 2 -zxf -
 ENV EXAPLUS=/downloads/EXAplus/exaplus
 
 COPY deps/requirements.txt requirements.txt

diff --git a/test/integration_tests/resources/test_containers/successful/build/deps/requirements.txt b/test/integration_tests/resources/test_containers/successful/build/deps/requirements.txt
@@ -1,6 +1,6 @@
-pyodbc<5.0.0
+pyodbc
 pytz
 lxml
 docker
 scipy
-https://github.com/exasol/exasol-python-test-framework/releases/download/0.1.0/exasol_python_test_framework-0.1.0-py3-none-any.whl
+exasol-python-test-framework==0.6.0