From 5a283f605148e2496f9c2548fed17241ecbb35c6 Mon Sep 17 00:00:00 2001 From: Konstantin Malanchev Date: Tue, 4 Jun 2024 14:44:36 -0400 Subject: [PATCH] Update python to 3.11 --- Dockerfile | 26 +++++++------------------- requirements.txt | 8 ++++---- 2 files changed, 11 insertions(+), 23 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1e01a97..d243c1e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-bookworm +FROM python:3.11-bookworm # Timezone settings ENV TZ=Europe/Moscow @@ -29,25 +29,13 @@ RUN echo "main_memory = 50000000" > /etc/texmf/texmf.d/10main_memory.cnf \ && texhash \ && fmtutil-sys --all || test 1 -# Install Python build deps for ARM64: +# Install Python build deps, mostly needed for ARM64 # healpy: cfitsio -# confluence-kafka: z, ssl, sasl2, zstd, rdkafka -RUN [ $(arch) = "x86_64" ] \ - || ( \ - apt-get update \ - && apt-get install -y --no-install-recommends libcfitsio-dev libz-dev libssl-dev libsasl2-dev libzstd-dev \ - && rm -rf /var/lib/apt/lists/* \ - && curl -LOJ https://github.com/edenhill/librdkafka/archive/refs/tags/v1.9.2.tar.gz \ - && tar -xzvf librdkafka-1.9.2.tar.gz \ - && rm librdkafka-1.9.2.tar.gz \ - && cd /librdkafka-1.9.2 \ - && ./configure --prefix=/usr \ - && make \ - && make install \ - && cd / \ - && rm -rf /librdkafka-1.9.2 \ - && ldconfig \ - ) +# h5py: hdf5 +# confluence-kafka: rdkafka +RUN apt-get update \ + && apt-get install -y --no-install-recommends libhdf5-dev libcfitsio-dev librdkafka-dev \ + && rm -rf /var/lib/apt/lists/* # Install dependencies COPY requirements.txt /app/ diff --git a/requirements.txt b/requirements.txt index 2d8904c..5daf068 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ alerce==1.2.0 antares-client==1.2.0 -astropy==6.0.0 +astropy==6.1.0 astroquery==0.4.6 asttokens==2.2.1 async-timeout==4.0.2 @@ -33,7 +33,7 @@ executing==1.2.0 Flask==2.3.2 fonttools==4.43.0 gunicorn==20.1.0 -h5py==3.7.0 +h5py==3.11.0 healpy==1.16.6 html5lib==1.1 idna==3.7 @@ -60,7 +60,7 @@ matplotlib==3.6.2 matplotlib-inline==0.1.6 more-itertools==9.1.0 nest-asyncio==1.5.6 -numpy==1.24.3 +numpy==1.26.4 orjson==3.9.15 packaging==21.3 pandas==2.1.2 @@ -77,7 +77,7 @@ psutil==5.9.4 ptyprocess==0.7.0 pure-eval==0.2.2 pycparser==2.21 -pyerfa==2.0.0.1 +pyerfa==2.0.1.4 Pygments==2.15.1 pyparsing==3.0.9 pytest==7.2.0