feat: bump python to 3.7

This commit is contained in:
helsonxiao 2020-10-12 12:22:02 +08:00
parent d35d7333fe
commit 6b7d440f35
5 changed files with 15 additions and 15 deletions

View File

@ -1,17 +1,17 @@
FROM ubuntu:18.04
COPY build/java_policy /etc
RUN buildDeps='software-properties-common git libtool cmake python-dev python3-pip python-pip libseccomp-dev' && \
apt-get update && apt-get install -y python python3 python-pkg-resources python3-pkg-resources gcc g++ $buildDeps && \
RUN buildDeps='software-properties-common git libtool cmake python3.7-dev python-dev python3-pip python-pip libseccomp-dev' && \
apt-get update && apt-get install -y python python3.7 python-pkg-resources python3-pkg-resources gcc g++ $buildDeps && \
add-apt-repository ppa:openjdk-r/ppa && add-apt-repository ppa:longsleep/golang-backports && apt-get update && apt-get install -y golang-go openjdk-8-jdk && \
pip3 install -I --no-cache-dir psutil gunicorn flask requests idna && \
python3.7 -m pip install -I --no-cache-dir psutil gunicorn flask requests idna && \
cd /tmp && git clone -b newnew --depth 1 https://github.com/QingdaoU/Judger && cd Judger && \
mkdir build && cd build && cmake .. && make && make install && cd ../bindings/Python && python3 setup.py install && \
mkdir build && cd build && cmake .. && make && make install && cd ../bindings/Python && python3.7 setup.py install && \
apt-get purge -y --auto-remove $buildDeps && \
apt-get clean && rm -rf /var/lib/apt/lists/* && \
mkdir -p /code && \
useradd -u 12001 compiler && useradd -u 12002 code && useradd -u 12003 spj && usermod -a -G code spj
HEALTHCHECK --interval=5s --retries=3 CMD python3 /code/service.py
HEALTHCHECK --interval=5s --retries=3 CMD python3.7 /code/service.py
ADD server /code
WORKDIR /code
RUN gcc -shared -fPIC -o unbuffer.so unbuffer.c

View File

@ -82,14 +82,14 @@ return [
'py3_lang_config' => [
'compile' => [
'src_name' => 'solution.py',
'exe_name' => '__pycache__/solution.cpython-35.pyc',
'exe_name' => '__pycache__/solution.cpython-37.pyc',
'max_cpu_time' => 3000,
'max_real_time' => 5000,
'max_memory' => 128 * 1024 * 1024,
'compile_command' => '/usr/bin/python3 -m py_compile {src_path}',
'compile_command' => '/usr/bin/python3.7 -m py_compile {src_path}',
],
'run' => [
'command' => '/usr/bin/python3 {exe_path}',
'command' => '/usr/bin/python3.7 {exe_path}',
'seccomp_rule' => 'general',
'env' => array_merge(['MALLOC_ARENA_MAX=1'], $default_env)
]

View File

@ -89,14 +89,14 @@ py2_lang_config = {
py3_lang_config = {
"compile": {
"src_name": "solution.py",
"exe_name": "__pycache__/solution.cpython-36.pyc",
"exe_name": "__pycache__/solution.cpython-37.pyc",
"max_cpu_time": 3000,
"max_real_time": 5000,
"max_memory": 128 * 1024 * 1024,
"compile_command": "/usr/bin/python3 -m py_compile {src_path}",
"compile_command": "/usr/bin/python3.7 -m py_compile {src_path}",
},
"run": {
"command": "/usr/bin/python3 {exe_path}",
"command": "/usr/bin/python3.7 {exe_path}",
"seccomp_rule": "general",
"env": ["PYTHONIOENCODING=UTF-8"] + default_env
}

View File

@ -112,14 +112,14 @@ var PY2LangConfig = &LangConfig{
var PY3LangConfig = &LangConfig{
CompileConfig: CompileConfig{
SrcName: "solution.py",
ExeName: "__pycache__/solution.cpython-35.pyc",
ExeName: "__pycache__/solution.cpython-37.pyc",
MaxCpuTime: 3000,
MaxRealTime: 5000,
MaxMemory: 128 * 1024 * 1024,
CompileCommand: "/usr/bin/python3 -m py_compile {src_path}",
CompileCommand: "/usr/bin/python3.7 -m py_compile {src_path}",
},
RunConfig: RunConfig{
Command: "/usr/bin/python3 {exe_path}",
Command: "/usr/bin/python3.7 {exe_path}",
SeccompRule: "general",
Env: append(DefaultEnv, "PYTHONIOENCODING=UTF-8"),
},

View File

@ -1 +1 @@
3.6.2
3.7.5