Skip to content

Commit de59e1e

Browse files
committed
ENG-7595 Update MFR Dockerfile and (dev-)requirements.txt files to make it possible to create image and mfr-requirements, mfr containers for py3.13 without errors
1 parent a7ef407 commit de59e1e

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.6-slim-buster
1+
FROM python:3.13-slim
22

33
# ensure unoconv can locate the uno library
44
ENV PYTHONPATH /usr/lib/python3/dist-packages
@@ -43,9 +43,9 @@ RUN usermod -d /home www-data \
4343
RUN mkdir -p /code
4444
WORKDIR /code
4545

46-
RUN pip install -U pip==18.1
47-
RUN pip install setuptools==37.0.0
48-
RUN pip install unoconv==0.8.2
46+
RUN pip install -U pip==24.0
47+
RUN pip install setuptools==69.5.1
48+
RUN pip install unoconv==0.9.0
4949

5050
COPY ./requirements.txt /code/
5151

@@ -61,4 +61,4 @@ RUN python setup.py develop
6161

6262
EXPOSE 7778
6363

64-
CMD ["gosu", "www-data", "invoke", "server"]
64+
CMD ["gosu", "www-data", "invoke", "server"]

dev-requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ coveralls
99
flake8==3.0.4
1010
ipdb
1111
mccabe
12-
pydevd==0.0.6
12+
pydevd==3.3.0
1313
pyflakes
1414
pytest==2.8.2
1515
pytest-cov==2.2.0
16-
pyzmq==14.4.1
16+
pyzmq==26.1.0

requirements.txt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
aiohttp==0.18.4
1+
aiohttp==3.10.6
22
chardet==2.3.0
33
furl==0.4.2
44
humanfriendly==2.1
5-
invoke==0.13.0
5+
invoke==2.2.0
66
mako==1.0.1
7-
raven==5.27.0
8-
setuptools==37.0.0
7+
sentry-sdk==2.22.0
8+
setuptools==78.1.0
99
stevedore==1.2.0
10-
tornado==4.3
10+
tornado==6.4.2
1111

1212
# WaterButler
13-
git+https://github.com/CenterForOpenScience/waterbutler.git@0.38.6#egg=waterbutler
13+
git+https://github.com/CenterForOpenScience/waterbutler.git@feature/buff-worms
1414
agent==0.1.2
1515
google-auth==1.4.1
1616

@@ -23,7 +23,7 @@ pydocx==0.7.0
2323

2424
# Image
2525
olefile==0.44
26-
Pillow==4.3.0
26+
Pillow==11.0.0
2727
psd-tools==1.4
2828

2929
# IPython
@@ -36,7 +36,7 @@ jinja2==2.10.1
3636
mistune==0.8.1
3737

3838
# Pdf
39-
reportlab==3.6.5
39+
reportlab==4.2.4
4040

4141
# Pptx
4242
# python-pptx==0.5.7
@@ -45,10 +45,10 @@ reportlab==3.6.5
4545
docutils==0.12
4646

4747
# Tabular
48-
pandas==0.25.1
48+
pandas==2.2.3
4949
xlrd==1.0.0
50-
h5py==2.7.0
51-
scipy==0.19.1
50+
h5py==3.13
51+
scipy==1.14.1
5252

5353
# Md
5454
markdown==2.6.2

0 commit comments

Comments
 (0)