Merge branch 'aiohttp3' into cgroup2

vijos · Mar 17, 2024 · 85899c4 · 85899c4
2 parents a36454d + 9fef504
commit 85899c4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:stretch
+FROM debian:bookworm
 COPY . /tmp/jd4
 RUN apt-get update && \
     apt-get install -y \
@@ -8,11 +8,11 @@ RUN apt-get update && \
             python3-dev \
             g++ \
             fp-compiler \
-            openjdk-8-jdk-headless \
-            python \
-            php7.0-cli \
+            openjdk-17-jdk-headless \
+            python-is-python3 \
+            php8.2-cli \
             rustc \
-            haskell-platform \
+            ghc \
             libjavascriptcoregtk-4.0-bin \
             golang \
             ruby \

diff --git a/jd4/integration_test.py b/jd4/integration_test.py
@@ -80,7 +80,7 @@ def test_php(self):
 """)
 
     def test_py(self):
-        self.do_lang('py', b'print sum(map(int, raw_input().split()))')
+        self.do_lang('py', b'print(sum(map(int, input().split())))')
 
     def test_py3(self):
         self.do_lang('py3', b'print(sum(map(int, input().split())))')