Skip to content

Commit 2100d15

Browse files
committed
Remove all references to Python2
1 parent ef4070d commit 2100d15

File tree

5 files changed

+6
-7
lines changed

5 files changed

+6
-7
lines changed

Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
1717
openjdk-8-jdk-headless \
1818
php7.4-cli \
1919
postgresql-client \
20-
python2 \
2120
python3-pip \
2221
python3.8 \
2322
python3.8-dev \

cms/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ def __init__(self):
167167
# the prefix (or real_prefix to accommodate virtualenvs).
168168
bin_path = os.path.join(os.getcwd(), sys.argv[0])
169169
bin_name = os.path.basename(bin_path)
170-
bin_is_python = bin_name in ["ipython", "python", "python2", "python3"]
170+
bin_is_python = bin_name in ["ipython", "python", "python3"]
171171
bin_in_installed_path = bin_path.startswith(sys.prefix) or (
172172
hasattr(sys, 'real_prefix')
173173
and bin_path.startswith(sys.real_prefix))

cmsranking/Config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def __init__(self):
6161
# TODO: move to cmscommon as it is used both here and in cms/conf.py
6262
bin_path = os.path.join(os.getcwd(), sys.argv[0])
6363
bin_name = os.path.basename(bin_path)
64-
bin_is_python = bin_name in ["ipython", "python", "python2", "python3"]
64+
bin_is_python = bin_name in ["ipython", "python", "python3"]
6565
bin_in_installed_path = bin_path.startswith(sys.prefix) or (
6666
hasattr(sys, 'real_prefix')
6767
and bin_path.startswith(sys.real_prefix))

docs/Configuring a contest.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ Language details
225225

226226
* Pascal support is provided by ``fpc``, and submissions are optimized with ``-O2``.
227227

228-
* Python submissions are executed using the system Python interpreter (you need to have ``/usr/bin/python2`` or ``/usr/bin/python3``, respectively).
228+
* Python submissions are executed using the system Python interpreter (you need to have ``/usr/bin/python3``).
229229

230230
* PHP submissions are interpreted by ``/usr/bin/php``.
231231

docs/Installation.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Then you require the compilation and execution environments for the languages yo
3434

3535
* `Free Pascal <http://www.freepascal.org/>`_ (for Pascal, with executable ``fpc``);
3636

37-
* `Python <http://www.python.org/>`_ >= 2.7 (for Python, with executable ``python2`` or ``python3``; in addition you will need ``zip``);
37+
* `Python <http://www.python.org/>`_ >= 3.8 (for Python, with executable ``python3``; in addition you will need ``zip``);
3838

3939
* `PHP <http://www.php.net>`_ >= 5 (for PHP, with executable ``php``);
4040

@@ -63,7 +63,7 @@ On Ubuntu 20.04, one will need to run the following script to satisfy all depend
6363
libffi-dev python3-pip
6464

6565
# Optional
66-
sudo apt-get install nginx-full python2.7 php7.4-cli php7.4-fpm \
66+
sudo apt-get install nginx-full python3.8 php7.4-cli php7.4-fpm \
6767
phppgadmin texlive-latex-base a2ps haskell-platform rustc mono-mcs
6868

6969
The above commands provide a very essential Pascal environment. Consider installing the following packages for additional units: `fp-units-base`, `fp-units-fcl`, `fp-units-misc`, `fp-units-math` and `fp-units-rtl`.
@@ -86,7 +86,7 @@ On Arch Linux, unofficial AUR packages can be found: `cms <http://aur.archlinux.
8686
sudo pacman -S --needed postgresql-libs libcups libyaml python-pip
8787

8888
# Optional
89-
sudo pacman -S --needed nginx python2 php php-fpm phppgadmin texlive-core \
89+
sudo pacman -S --needed nginx python3 php php-fpm phppgadmin texlive-core \
9090
a2ps ghc rust mono
9191

9292
Preparation steps

0 commit comments

Comments
 (0)