diff --git a/mipdb/Dockerfile b/mipdb/Dockerfile index aa367e812..86cfdbc99 100644 --- a/mipdb/Dockerfile +++ b/mipdb/Dockerfile @@ -29,7 +29,7 @@ WORKDIR $DATA_PATH ####################################################### # Installing dependencies ####################################################### -RUN pip install mipdb==2.4.6 # Must be updated together with pyproject.toml +RUN pip install mipdb==2.4.7 # Must be updated together with pyproject.toml RUN pip install click==8.1.2 RUN pip install pymonetdb==1.6.3 # Must be updated together with pyproject.toml diff --git a/monetdb/Dockerfile b/monetdb/Dockerfile index bc35fb165..93ba6e68b 100755 --- a/monetdb/Dockerfile +++ b/monetdb/Dockerfile @@ -3,8 +3,8 @@ FROM madgik/exareme2_db_base:0.1 ####################################################### # Download monetdb source files ####################################################### -RUN wget --output-document=/home/MonetDB-11.45.13.tar.bz2 --no-check-certificate https://www.monetdb.org/downloads/sources/Sep2022-SP2/MonetDB-11.45.13.tar.bz2 -RUN tar -xf /home/MonetDB-11.45.13.tar.bz2 -C /home/ +RUN wget --output-document=/home/monetDB.tar.bz2 --no-check-certificate https://www.monetdb.org/downloads/sources/Dec2023/MonetDB-11.49.1.tar.bz2 +RUN tar -xf /home/monetDB.tar.bz2 -C /home/ ####################################################### # Install monetdb @@ -12,7 +12,7 @@ RUN tar -xf /home/MonetDB-11.45.13.tar.bz2 -C /home/ RUN pip3 install numpy==1.24.1 # Must be updated together with pyproject.toml RUN mkdir /home/monetdb-build WORKDIR /home/monetdb-build -RUN cmake -DCMAKE_BUILD_TYPE=Release -DASSERT=ON -DSTRICT=ON -DCMAKE_INSTALL_PREFIX=/usr/local/bin/monetdb /home/MonetDB-11.45.13 +RUN cmake -DCMAKE_BUILD_TYPE=Release -DASSERT=ON -DSTRICT=ON -DCMAKE_INSTALL_PREFIX=/usr/local/bin/monetdb /home/MonetDB-11.49.1 RUN cmake --build . RUN cmake --build . --target install ENV PATH="/usr/local/bin/monetdb/bin:$PATH" @@ -22,8 +22,8 @@ EXPOSE 50000 ####################################################### # Installation clean up ####################################################### -RUN rm /home/MonetDB-11.45.13.tar.bz2 -RUN rm -rf /home/MonetDB-11.45.13/ +RUN rm /home/monetDB.tar.bz2 +RUN rm -rf /home/MonetDB-11.49.1 RUN rm -rf /home/monetdb-build ####################################################### diff --git a/poetry.lock b/poetry.lock index 33c38c794..eabefac96 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1340,14 +1340,14 @@ files = [ [[package]] name = "mipdb" -version = "2.4.6" +version = "2.4.7" description = "" category = "dev" optional = false python-versions = ">=3.8,<3.9" files = [ - {file = "mipdb-2.4.6-py3-none-any.whl", hash = "sha256:83cc9390f8836feaa88511bf1cd3eff63a2b2bd5acc919631a8d9d3268775ecc"}, - {file = "mipdb-2.4.6.tar.gz", hash = "sha256:e2048009f8ebadb855853da9e678d2bf2f68998871a827be760adc9ee2adc04c"}, + {file = "mipdb-2.4.7-py3-none-any.whl", hash = "sha256:ed725e2411dfbdd571a17692dd9ae8dc03ececf1df4b6d0d49d846e113e0477a"}, + {file = "mipdb-2.4.7.tar.gz", hash = "sha256:11ea083bb3448c50b8603aca17e19527e89a6cd3126e2b94f0d8c65f30cbf978"}, ] [package.dependencies] @@ -2863,4 +2863,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = "~3.8" -content-hash = "8767d3dde97f28013dbde77421a6b4c522c579ab9b7a3f708b23a10e14573b0a" +content-hash = "aec9e3f0d7595f43c816b0a0d1689f82f3daf3678958b6f8c665e03e945332fc" diff --git a/pyproject.toml b/pyproject.toml index 6466fe563..d22ccf6a5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -50,7 +50,9 @@ pytest-subtests = "~0.11" freezegun = "~1.2" hypothesis = "~6.81" pytest-rerunfailures = "~12.0" -mipdb = "2.4.6" # Must be updated together with mipdb Dockerfile + +[tool.poetry.group.dev.dependencies] +mipdb = "2.4.7" # Must be updated together with mipdb Dockerfile [tool.pytest.ini_options] markers = [