Merge branch 'DMOJ:master' into fix_mypy_error

DMOJ · Sep 21, 2024 · 419ca9a · 419ca9a
2 parents 91f34a2 + 367abcc
commit 419ca9a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.docker/tier1/Dockerfile b/.docker/tier1/Dockerfile
@@ -4,7 +4,7 @@ ARG TAG=master
 RUN mkdir /judge /problems && cd /judge && \
 	curl -L https://github.com/DMOJ/judge-server/archive/"${TAG}".tar.gz | tar -xz --strip-components=1 && \
     python3 -m venv --prompt=DMOJ /env && \
-	/env/bin/pip3 install cython && \
+	/env/bin/pip3 install cython setuptools && \
 	/env/bin/pip3 install -e . && \
 	/env/bin/python3 setup.py develop && \
 	HOME=~judge . ~judge/.profile && \

diff --git a/.docker/tier2/Dockerfile b/.docker/tier2/Dockerfile
@@ -4,7 +4,7 @@ ARG TAG=master
 RUN mkdir /judge /problems && cd /judge && \
 	curl -L https://github.com/DMOJ/judge-server/archive/"${TAG}".tar.gz | tar -xz --strip-components=1 && \
     python3 -m venv --prompt=DMOJ /env && \
-	/env/bin/pip3 install cython && \
+	/env/bin/pip3 install cython setuptools && \
 	/env/bin/pip3 install -e . && \
 	/env/bin/python3 setup.py develop && \
 	HOME=~judge . ~judge/.profile && \

diff --git a/.docker/tier3/Dockerfile b/.docker/tier3/Dockerfile
@@ -4,7 +4,7 @@ ARG TAG=master
 RUN mkdir /judge /problems && cd /judge && \
 	curl -L https://github.com/DMOJ/judge-server/archive/"${TAG}".tar.gz | tar -xz --strip-components=1 && \
     python3 -m venv --prompt=DMOJ /env && \
-	/env/bin/pip3 install cython && \
+	/env/bin/pip3 install cython setuptools && \
 	/env/bin/pip3 install -e . && \
 	/env/bin/python3 setup.py develop && \
 	HOME=~judge . ~judge/.profile && \

diff --git a/setup.py b/setup.py
@@ -3,11 +3,11 @@
 import os
 import sys
 import traceback
-from distutils.ccompiler import CCompiler
-from distutils.errors import DistutilsPlatformError
 from multiprocessing.pool import ThreadPool
 
 from setuptools import Extension, find_packages, setup
+from setuptools._distutils.ccompiler import CCompiler
+from setuptools._distutils.errors import DistutilsPlatformError
 from setuptools.command.build_ext import build_ext
 
 if os.name == 'nt':