Skip to content

Commit 2080bae

Browse files
committed
Add PyPy3 tests + documentation, some cleanup
1 parent 165bd69 commit 2080bae

File tree

5 files changed

+11
-9
lines changed

5 files changed

+11
-9
lines changed

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
1717
openjdk-8-jdk-headless \
1818
php-cli \
1919
postgresql-client \
20+
pypy3 \
2021
python3-pip \
2122
python3.12 \
2223
python3.12-dev \
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
from cms.grading import CompiledLanguage
2424

2525

26-
__all__ = ["Python3PyPy3"]
26+
__all__ = ["Python3PyPy"]
2727

2828

29-
class Python3PyPy3(CompiledLanguage):
29+
class Python3PyPy(CompiledLanguage):
3030
"""This defines the Python programming language, version 3 (more
3131
precisely, the subversion of Python 3 available on the system)
32-
using the default interpeter in the system.
32+
using the default PyPy interpeter in the system.
3333
3434
"""
3535

@@ -38,7 +38,7 @@ class Python3PyPy3(CompiledLanguage):
3838
@property
3939
def name(self):
4040
"""See Language.name."""
41-
return "Python 3 / PyPy3"
41+
return "Python 3 / PyPy"
4242

4343
@property
4444
def source_extensions(self):

cmstestsuite/Tests.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,19 @@
4949
LANG_PASCAL = "Pascal / fpc"
5050
LANG_PHP = "PHP"
5151
LANG_PYTHON3 = "Python 3 / CPython"
52+
LANG_PYPY3 = "Python 3 / PyPy"
5253
LANG_RUST = "Rust"
5354
LANG_C_SHARP = "C# / Mono"
5455
ALL_LANGUAGES = (
5556
LANG_CPP, LANG_CPP14, LANG_CPP17, LANG_C, LANG_HS, LANG_JAVA, LANG_PASCAL,
56-
LANG_PHP, LANG_PYTHON3, LANG_RUST, LANG_C_SHARP
57+
LANG_PHP, LANG_PYTHON3, LANG_PYPY3, LANG_RUST, LANG_C_SHARP
5758
)
5859
NON_INTERPRETED_LANGUAGES = (
5960
LANG_C, LANG_CPP, LANG_CPP14, LANG_CPP17, LANG_PASCAL
6061
)
6162
COMPILED_LANGUAGES = (
6263
LANG_C, LANG_CPP, LANG_CPP14, LANG_CPP17, LANG_PASCAL, LANG_JAVA,
63-
LANG_PYTHON3, LANG_HS, LANG_RUST, LANG_C_SHARP
64+
LANG_PYTHON3, LANG_PYPY3, LANG_HS, LANG_RUST, LANG_C_SHARP
6465
)
6566

6667
ALL_TESTS = [

docs/Installation.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ On Ubuntu 24.04, one will need to run the following script to satisfy all depend
6464

6565
# Optional
6666
sudo apt-get install nginx-full php-cli texlive-latex-base \
67-
a2ps ghc rustc mono-mcs
67+
a2ps ghc rustc mono-mcs pypy3
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`.
7070

@@ -87,7 +87,7 @@ On Arch Linux, unofficial AUR packages can be found: `cms <http://aur.archlinux.
8787

8888
# Optional
8989
sudo pacman -S --needed nginx php php-fpm phppgadmin texlive-core \
90-
a2ps ghc rust mono
90+
a2ps ghc rust mono pypy3
9191

9292
Preparation steps
9393
=================

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ def run(self):
192192
"Pascal / fpc=cms.grading.languages.pascal_fpc:PascalFpc",
193193
"PHP=cms.grading.languages.php:Php",
194194
"Python 3 / CPython=cms.grading.languages.python3_cpython:Python3CPython",
195-
"Python 3 / PyPy3=cms.grading.languages.python3_pypy3:Python3PyPy3",
195+
"Python 3 / PyPy=cms.grading.languages.python3_pypy:Python3PyPy",
196196
"Rust=cms.grading.languages.rust:Rust",
197197
],
198198
},

0 commit comments

Comments
 (0)