Merge branch 'release/1.20191126-rev1'

Author: austrin

admin/docker/Dockerfile.build

@@ -25,6 +25,10 @@ RUN apt update && \
         libgmp-dev \
         libgmp10 \
         libgmpxx4ldbl \
+        python3 \
+        python3-pytest \
+        python3-setuptools \
+        python3-yaml \
         python \
         python-pytest \
         python-setuptools \

admin/docker/Dockerfile.minimal

@@ -24,6 +24,8 @@ RUN apt update && \
         python-pkg-resources \
         python-plastex \
         python-yaml \
+        python3-minimal \
+        python3-yaml \
         texlive-fonts-recommended \
         texlive-generic-recommended \
         texlive-lang-cyrillic \

debian/changelog

@@ -1,3 +1,10 @@
+kattis-problemtools (1.20191126-rev1) bionic; urgency=medium
+
+  * fixes to packaging and Docker images for Python 3
+  * various fixes to packaging after py3 was added
+
+ -- Per Austrin <austrin@kattis.com>  Tue, 26 Nov 2019 23:39:08 +0100
+
 kattis-problemtools (1.20191126) bionic; urgency=medium
 
   [ Per Austrin ]

debian/control

@@ -2,10 +2,9 @@ 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~), python3 (>=3.7), python-setuptools, python-pytest, python-yaml, libboost-regex-dev, libgmp-dev, automake, autoconf
+Build-Depends: debhelper (>= 8.0.0), g++ (>= 4.8), dh-python, python3, python3-setuptools, python3-pytest, python3-yaml, python (>= 2.6.6-3~), 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

debian/rules

@@ -11,5 +11,12 @@ export PYBUILD_AFTER_CLEAN=make -C support distclean
 export PYBUILD_TEST_PYTEST=1
 export no_proxy=github.com
 
+# FIXME: while we're building for both py2 and py3, we get a clash
+# with the CLI scripts.  The following Workaround puts the py3 CLI
+# scripts somewhere else where they don't do any harm, so that the
+# main CLI scripts are the py2 ones for now.  Once we drop py2 support
+# we also drop this line.
+export PYBUILD_INSTALL_ARGS_python3=--install-scripts=/usr/lib/problemtools/bin/
+
 %:
-	dh $@ --with python2,python3 --buildsystem=pybuild
+	dh $@ --with python3,python2 --buildsystem=pybuild

problemtools/_version.py

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

problemtools/languages.py

@@ -5,7 +5,6 @@
 import fnmatch
 import re
 import string
-from six import string_types
 
 from . import config
 
@@ -80,7 +79,7 @@ def update(self, values):
                         'Language %s: priority must be integer but is %s.'
                         % (self.lang_id, type(value)))
             else:
-                if not isinstance(value, string_types):
+                if not isinstance(value, str):
                     raise LanguageConfigError(
                         'Language %s: %s must be string but is %s.'
                         % (self.lang_id, key, type(value)))
@@ -213,7 +212,7 @@ def update(self, data):
                 % (type(data)))
 
         for (lang_id, lang_spec) in data.items():
-            if not isinstance(lang_id, string_types):
+            if not isinstance(lang_id, str):
                 raise LanguageConfigError(
                     'Config file error: language IDs must be strings, but %s is %s.'
                     % (lang_id, type(lang_id)))

setup.py

@@ -81,7 +81,7 @@ def get_version():
       include_package_data=True,
       install_requires=[
           'PyYAML',
-          'plasTeX==1.0;python_version<"3"',
+          'plasTeX<=1.0;python_version<"3"',
           'plasTeX>=2.0;python_version>="3"'
       ],
 #      Temporarily disabled, see setup.cfg