Skip to content

Commit

Permalink
Use Alpine's biopython instead of pulling and building
Browse files Browse the repository at this point in the history
  • Loading branch information
nutjob4life committed Feb 9, 2024
1 parent b7dea50 commit f6746c8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ RUN \
RUN \
build_deps="automake bzip2-dev cyrus-sasl-dev git g++ gcc libffi-dev libjpeg-turbo-dev libwebp-dev libxml2-dev libxslt-dev make musl-dev openjpeg-dev openldap-dev openssl-dev pcre-dev python3-dev postgresql-dev su-exec tiff-dev zlib-dev " &&\
run_deps="curl krb5-libs libgcc libjpeg-turbo libldap libpq libsasl libstdc++ libwebp libxml2 libxslt netcat-openbsd openjpeg python3 rsync tiff tidyhtml" &&\
py_deps="py3-numpy py3-pandas py3-pillow py3-psycopg2" &&\
py_deps="py3-numpy py3-pandas py3-pillow py3-psycopg2 py3-biopython" &&\
/sbin/apk update --quiet &&\
/sbin/apk add --no-progress --quiet --virtual /edrn-build $build_deps &&\
/sbin/apk add --no-progress --quiet $run_deps &&\
Expand All @@ -74,6 +74,7 @@ RUN [ "`/usr/bin/python3 -c 'import numpy; print(numpy.__version__)'`" = "1.24.4
RUN [ "`/usr/bin/python3 -c 'import pandas; print(pandas.__version__)'`" = "1.5.3" ]
RUN [ "`/usr/bin/python3 -c 'import PIL; print(PIL.__version__)'`" = "9.5.0" ]
RUN [ "`/usr/bin/python3 -c 'import psycopg2; print(psycopg2.__version__)'`" = "2.9.6 (dt dec pq3 ext lo64)" ]
RUN [ "`/usr/bin/python3 -c 'import Bio; print(Bio.__version__)'`" = "1.81" ]

RUN \
: See https://github.com/python-ldap/python-ldap/issues/432 for workaround to Python LDAP vs OpenLDAP 2.5 issue &&\
Expand Down
2 changes: 1 addition & 1 deletion src/eke.biomarkers/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ install_requires =
eke.knowledge
edrnsite.content
edrn.auth
biopython ~= 1.79
biopython == 1.81 # Must mathc py3-biopython package in Dockerfile
django < 5
django_plotly_dash == 1.7.1
numpy == 1.24.4 # Must match py3-numpy package in Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion src/eke.knowledge/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ install_requires =
edrnsite.controls
edrn.collabgroups
eke.geocoding
biopython ~= 1.79
biopython == 1.81 # Must match py3-biopython package in Dockerfile
boto3 ~= 1.24.75
celery ~= 5.2.7
dash-dangerously-set-inner-html ~= 0.0.2
Expand Down

0 comments on commit f6746c8

Please sign in to comment.