Rework problem statements

dodona-edu · Aug 8, 2023 · ea74d48 · ea74d48
1 parent f5d4272
commit ea74d48
Show file tree

Hide file tree

Showing 40 changed files with 1,144 additions and 2,484 deletions.
diff --git a/Pipfile b/Pipfile
@@ -18,9 +18,12 @@ pylint = "==2.17.1"
 pytest = ""
 pytest-mock = ""
 pytest-cov = ""
-# Still needed for instantiating exercise descriptions.
+
+# Needed for exercise instantiation
+# You'll need to install these if you want to use it.
 # TODO: should we get rid of this?
-mako = "==1.1.6"
+mako = ""
+marko = ""
 
 [requires]
 python_version = "3.11"

diff --git a/flake.nix b/flake.nix
@@ -61,15 +61,39 @@
                maintainers = [ ];
              };
            };
+        marko = python.pkgs.buildPythonPackage rec {
+            pname = "marko";
+            version = "2.0.0";
+            format = "pyproject";
+
+            src = pkgs.fetchPypi {
+                inherit pname version;
+                hash = "sha256-78JkYIkyUME3UQJa6SAuuxOJiHA2/A35AJxquHVGcDA=";
+            };
+
+            nativeBuildInputs = [
+                python.pkgs.pdm-pep517 python.pkgs.pdm-backend
+            ];
+
+            doCheck = false;
+
+            meta = with pkgs.lib; {
+                homepage = "https://github.com/frostming/marko";
+                license = licenses.mit;
+                maintainers = [ ];
+            };
+        };
         core-packages = ps: with ps; [
             psutil
-            mako
             my-pydantic
             jsonschema
             typing-inspect
             pyyaml
             pygments
-            python-i18n 
+            python-i18n
+            # For scripts, not judge itself.
+            mako
+            marko
         ];
         python-env = python.withPackages(ps: (core-packages ps) ++ [
             ps.pylint

diff --git a/tested/description_instance.py b/tested/description_instance.py