Merge branch 'release/1.20191126'

Author: austrin

.travis.yml

@@ -1,4 +1,6 @@
 language: python
-python: 2.7
+python:
+  - 2.7
+  - 3.7
 
 script: py.test

admin/update_docker.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-KOTLIN_VERSION=1.2.71
+KOTLIN_VERSION=1.3.50
 
 
 TAG=develop

debian/changelog

@@ -1,3 +1,44 @@
+kattis-problemtools (1.20191126) bionic; urgency=medium
+
+  [ Per Austrin ]
+  * Add Cobol to default language config
+
+  [ Greg Hamerly ]
+  * This would make problemtools consistent with Kattis.
+
+  [ Simon Lindholm ]
+  * Show input validator output on failure
+  * Require that graders exit with return code 0
+
+  [ Greg Hamerly ]
+  * require plasTeX version 1.0 for python2 compatibility
+
+  [ Simon Lindholm ]
+  * Reset signal dispositions before running exec
+
+  [ Thore Husfeldt ]
+  * Work around pipe2 on non-linux
+
+  [ Greg Hamerly ]
+  * verifyproblem.py: check for invalid characters in data (directories and filenames)
+
+  [ Per Austrin ]
+  * Reenable Python3 in the setup script
+
+  [ Pehr Söderman ]
+  * Build debian for python3
+  * Fixing type checks to use issinstance and be both python2 and python3 compatible.
+  * Removed a type check for long (it will fail on python3, where a separate  long does not exist). Added in a type check for string types instead.
+  * Require python 3.7
+  * Make travis run tests for python 3.7 as well.
+  * Add fsharp to languages.yaml
+
+  [ Per Austrin ]
+  * [latex document class] don't litter sample directory with .pstmp files (fixes #136)
+  * [docker] bump Kotlin version in images to the one currently used in ICPC
+
+ -- Per Austrin <austrin@kattis.com>  Tue, 26 Nov 2019 21:05:14 +0100
+
 kattis-problemtools (1.20190901) bionic; urgency=medium
 
   [ Greg Hamerly ]

debian/control

@@ -2,13 +2,14 @@ Source: kattis-problemtools
 Section: devel
 Priority: optional
 Maintainer: Per Austrin <austrin@kattis.com>
-Build-Depends: debhelper (>= 8.0.0), g++ (>= 4.8), dh-python, python (>= 2.6.6-3~), python-setuptools, python-pytest, python-yaml, libboost-regex-dev, libgmp-dev, automake, autoconf
+Build-Depends: debhelper (>= 8.0.0), g++ (>= 4.8), dh-python, python (>= 2.6.6-3~), python3 (>=3.7), python-setuptools, python-pytest, python-yaml, libboost-regex-dev, libgmp-dev, automake, autoconf
 Standards-Version: 3.9.4
 Homepage: https://github.com/Kattis/problemtools
+X-Python3-Version: 3.7
 
 Package: kattis-problemtools
 Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, python-yaml, python-plastex, python-pkg-resources, texlive-latex-recommended, texlive-fonts-recommended, texlive-latex-extra, texlive-generic-recommended, texlive-lang-cyrillic, tidy, ghostscript
+Depends: ${shlibs:Depends}, ${python:Depends}, ${python3:Depends}, ${misc:Depends}, python-yaml, python-plastex, python-pkg-resources, texlive-latex-recommended, texlive-fonts-recommended, texlive-latex-extra, texlive-generic-recommended, texlive-lang-cyrillic, tidy, ghostscript
 Recommends: gcc, g++
 Description: Kattis Problem Tools
  These are tools to manage and verify problem packages in the

debian/rules

@@ -12,4 +12,4 @@ export PYBUILD_TEST_PYTEST=1
 export no_proxy=github.com
 
 %:
-	dh $@ --with python2 --buildsystem=pybuild
+	dh $@ --with python2,python3 --buildsystem=pybuild

problemtools/_version.py

@@ -1,2 +1,2 @@
 # Auto-generated from git changelog, do not edit!
-__version__ = '1.20190901'
+__version__ = '1.20191126'

problemtools/config/languages.yaml

@@ -105,7 +105,7 @@ cpp:
     name: 'C++'
     priority: 1000
     files: '*.cc *.C *.cpp *.cxx *.c++'
-    compile: '/usr/bin/g++ -g -O2 -std=gnu++14 -static -o {binary} {files}'
+    compile: '/usr/bin/g++ -g -O2 -std=gnu++17 -static -o {binary} {files}'
     run: '{binary}'
 
 csharp:
@@ -115,6 +115,20 @@ csharp:
     compile: '/usr/bin/mcs -out:{binary}.exe -optimize+ -r:System.Numerics {files}'
     run: '/usr/bin/mono {binary}.exe'
 
+cobol:
+    name: 'Cobol'
+    priority: 50
+    files: '*.cob'
+    compile: '/usr/bin/cobc -o {binary} -g -O2 -std=default -free -x -static {files}'
+    run: '{binary}'
+
+fsharp:
+    name: 'F#'
+    priority: 675
+    files: '*.fs'
+    compile: '/usr/bin/fsharpc --out:{binary}.exe --optimize+ -r:System.Numerics {files}'
+    run: '/usr/bin/mono {binary}.exe'
+
 go:
     name: 'Go'
     priority: 400

problemtools/languages.py

@@ -4,10 +4,8 @@
 """
 import fnmatch
 import re
-import os
 import string
-import types
-import yaml.parser
+from six import string_types
 
 from . import config
 
@@ -77,12 +75,12 @@ def update(self, values):
         for (key, value) in values.items():
             # Check type
             if key == 'priority':
-                if type(value) != int:
+                if not isinstance(value, int):
                     raise LanguageConfigError(
                         'Language %s: priority must be integer but is %s.'
                         % (self.lang_id, type(value)))
             else:
-                if type(value) != bytes:
+                if not isinstance(value, string_types):
                     raise LanguageConfigError(
                         'Language %s: %s must be string but is %s.'
                         % (self.lang_id, key, type(value)))
@@ -209,18 +207,18 @@ def update(self, data):
                 for a language already in the set, the configuration
                 for that language will be overridden and updated.
         """
-        if type(data) is not dict:
+        if not isinstance(data, dict):
             raise LanguageConfigError(
                 'Config file error: content must be a dictionary, but is %s.'
                 % (type(data)))
 
         for (lang_id, lang_spec) in data.items():
-            if type(lang_id) is not bytes:
+            if not isinstance(lang_id, string_types):
                 raise LanguageConfigError(
                     'Config file error: language IDs must be strings, but %s is %s.'
                     % (lang_id, type(lang_id)))
 
-            if type(lang_spec) is not dict:
+            if not isinstance(lang_spec, dict):
                 raise LanguageConfigError(
                     'Config file error: language spec must be a dictionary, but spec of language %s is %s.'
                     % (lang_id, type(lang_spec)))

problemtools/run/program.py

@@ -76,17 +76,35 @@ def __run_wait(argv, infile, outfile, errfile, timelim, memlim):
         pid = os.fork()
         if pid == 0:  # child
             try:
+                # The Python interpreter internally sets some signal dispositions
+                # to SIG_IGN (notably SIGPIPE), and unless we reset them manually
+                # this leaks through to the program we exec. That can has some
+                # funny side effects, like programs not crashing as expected when
+                # trying to write to an interactive validator that has terminated
+                # and closed the read end of a pipe.
+                #
+                # This *shouldn't* cause any verdict changes given the setup for
+                # interactive problems, but reset them anyway, for sanity.
+                if hasattr(signal, "SIGPIPE"):
+                    signal.signal(signal.SIGPIPE, signal.SIG_DFL)
+                if hasattr(signal, "SIGXFZ"):
+                    signal.signal(signal.SIGXFZ, signal.SIG_DFL)
+                if hasattr(signal, "SIGXFSZ"):
+                    signal.signal(signal.SIGXFSZ, signal.SIG_DFL)
+
                 if timelim is not None:
                     limit.try_limit(resource.RLIMIT_CPU, timelim, timelim + 1)
                 if memlim is not None:
                     limit.try_limit(resource.RLIMIT_AS, memlim * (1024**2), resource.RLIM_INFINITY)
                 limit.try_limit(resource.RLIMIT_STACK,
                                 resource.RLIM_INFINITY, resource.RLIM_INFINITY)
+
                 Program.__setfd(0, infile, os.O_RDONLY)
                 Program.__setfd(1, outfile,
                                 os.O_WRONLY | os.O_CREAT | os.O_TRUNC)
                 Program.__setfd(2, errfile,
                                 os.O_WRONLY | os.O_CREAT | os.O_TRUNC)
+
                 os.execvp(argv[0], argv)
             except Exception as exc:
                 print("Oops. Fatal error in child process:")

problemtools/templates/latex/problemset.cls

@@ -354,7 +354,7 @@
         \hline
         \parbox[t]{0.55\textwidth}{
           \vspace{-0.49cm}
-          \lstinputlisting[inputencoding=utf8/latin1,basicstyle=\ttfamily]{#4.pstmp}
+          \lstinputlisting[inputencoding=utf8/latin1,basicstyle=\ttfamily]{\jobname.pstmp}
           \vspace{-0.21cm}
         }\\
         \hline
@@ -372,7 +372,7 @@
     \if x\mode\else
       \if \mode\curmode\else
         \showmessage
-        \immediate\openout\ps@sampleinteractionmsg=#4.pstmp
+        \immediate\openout\ps@sampleinteractionmsg=\jobname.pstmp
         \edef\curmode{\mode}
       \fi
       \StrGobbleLeft{\ps@interactionline}{1}[\ps@interactionline]