Skip to content

Commit

Permalink
Merge pull request #661 from hms-dbmi/fix-dependency-updates
Browse files Browse the repository at this point in the history
develop(dependencies): Reverted to Python 3.11 due to AWS CLIv2 incompatibility; updated Python dependencies
  • Loading branch information
b32147 authored Mar 25, 2024
2 parents e07135d + 46621df commit 63a2d12
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 21 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM hmsdbmitc/dbmisvc:debian12-slim-python3.12-0.6.0 AS builder
FROM hmsdbmitc/dbmisvc:debian12-slim-python3.11-0.6.1 AS builder

# Install requirements
RUN apt-get update \
Expand All @@ -20,7 +20,7 @@ RUN pip install -U wheel \
&& pip wheel -r /requirements.txt \
--wheel-dir=/root/wheels

FROM hmsdbmitc/dbmisvc:debian12-slim-python3.12-0.6.0
FROM hmsdbmitc/dbmisvc:debian12-slim-python3.11-0.6.1

# Copy Python wheels from builder
COPY --from=builder /root/wheels /root/wheels
Expand Down
39 changes: 20 additions & 19 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,29 +12,29 @@ arrow==1.3.0 \
--hash=sha256:c728b120ebc00eb84e01882a6f5e7927a53960aa990ce7dd2b10f39005a67f80 \
--hash=sha256:d4540617648cb5f895730f1ad8c82a65f2dad0166f57b75f3ca54759c4d67a85
# via django-q
asgiref==3.7.2 \
--hash=sha256:89b2ef2247e3b562a16eef663bc0e2e703ec6468e2fa8a5cd61cd449786d4f6e \
--hash=sha256:9e0ce3aa93a819ba5b45120216b23878cf6e8525eb3848653452b4192b92afed
asgiref==3.8.1 \
--hash=sha256:3e1e3ecc849832fe52ccf2cb6686b7a55f82bb1d6aee72a58826471390335e47 \
--hash=sha256:c343bd80a0bec947a9860adb4c432ffa7db769836c64238fc34bdc3fec84d590
# via
# django
# django-countries
awscli==1.32.64 \
--hash=sha256:498ce59cdaa8445eb19e8520ece5345c5cf69001c3f3a0824b1b64292b794986 \
--hash=sha256:9f4510a771ce65f3ccc271b946facb84a74b450ce3e1089627dccaf9eba3006b
awscli==1.32.69 \
--hash=sha256:86dd1d4c9ad6f26200ce76825ce75c14dc06d7918beac11384c2452936984b42 \
--hash=sha256:9cefbe656c2422efde10c40b2eefd82bef02f86da44042882427df2529f8cf53
# via -r requirements.in
blessed==1.20.0 \
--hash=sha256:0c542922586a265e699188e52d5f5ac5ec0dd517e5a1041d90d2bbf23f906058 \
--hash=sha256:2cdd67f8746e048f00df47a2880f4d6acbcdb399031b604e34ba8f71d5787680
# via django-q
boto3==1.34.64 \
--hash=sha256:8c6fbd3d45399a4e4685010117fb2dc52fc6afdab5a9460957d463ae0c2cc55d \
--hash=sha256:e5d681f443645e6953ed0727bf756bf16d85efefcb69cf051d04a070ce65e545
boto3==1.34.69 \
--hash=sha256:2e25ef6bd325217c2da329829478be063155897d8d3b29f31f7f23ab548519b1 \
--hash=sha256:898a5fed26b1351352703421d1a8b886ef2a74be6c97d5ecc92432ae01fda203
# via
# -r requirements.in
# django-ses
botocore==1.34.64 \
--hash=sha256:084f8c45216d62dc1add2350e236a2d5283526aacd0681e9818b37a6a5e5438b \
--hash=sha256:0ab760908749fe82325698591c49755a5bb20307d85a419aca9cc74e783b9407
botocore==1.34.69 \
--hash=sha256:d1ab2bff3c2fd51719c2021d9fa2f30fbb9ed0a308f69e9a774ac92c8091380a \
--hash=sha256:d3802d076d4d507bf506f9845a6970ce43adc3d819dd57c2791f5c19ed6e5950
# via
# awscli
# boto3
Expand Down Expand Up @@ -261,9 +261,8 @@ django-countries==7.5.1 \
--hash=sha256:22915d9b9403932b731622619940a54894a3eb0da9a374e7249c8fc453c122d7 \
--hash=sha256:2df707aca7a5e677254bed116cf6021a136ebaccd5c2f46860abd6452bb45521
# via -r requirements.in
django-dbmi-client==1.0.7 \
--hash=sha256:1332527e263536a0958847b9d0cddbd276df507db3f4aede6180aeef375e5f9b \
--hash=sha256:f9e683724fddc16f965301927a1808dda59e53bcb0014410b051ea448538ba41
django-dbmi-client==1.0.8 \
--hash=sha256:34d71b69387b33afd2ae238b441dcc158e02f5c3bab43632002b789f8deb8030
# via -r requirements.in
django-health-check==3.18.1 \
--hash=sha256:2c89a326cd79830e2fc6808823a9e7e874ab23f7aef3ff2c4d1194c998e1dca1 \
Expand Down Expand Up @@ -301,9 +300,9 @@ django-storages==1.14.2 \
django-stronghold==0.4.0 \
--hash=sha256:4127d5f9c11f6582a1c03e7758256b1fe5c872f64f212980e5ad5c67f5eeaa3d
# via -r requirements.in
djangorestframework==3.15.0 \
--hash=sha256:3f4a263012e1b263bf49a4907eb4cfe14de840a09b1ba64596d01a9c54835919 \
--hash=sha256:5fa616048a7ec287fdaab3148aa5151efb73f7f8be1e23a9d18484e61e672695
djangorestframework==3.15.1 \
--hash=sha256:3ccc0475bce968608cf30d07fb17d8e52d1d7fc8bfe779c905463200750cbca6 \
--hash=sha256:f88fad74183dfc7144b2756d0d2ac716ea5b4c7c9840995ac3bfd8ec034333c1
# via
# -r requirements.in
# django-dbmi-client
Expand Down Expand Up @@ -453,7 +452,9 @@ python-magic==0.4.27 \
pytz==2024.1 \
--hash=sha256:2a29735ea9c18baf14b448846bde5a48030ed267578472d8955cd0e7443a9812 \
--hash=sha256:328171f4e3623139da4983451950b28e95ac706e13f3f2630a879749e7a8b319
# via django-ses
# via
# django-dbmi-client
# django-ses
pyyaml==6.0.1 \
--hash=sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5 \
--hash=sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc \
Expand Down

0 comments on commit 63a2d12

Please sign in to comment.