From 0c7befca2daad98cd2a1442fae3cf538dcdb5e80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pehr=20S=C3=B6derman?= Date: Sun, 2 Jun 2019 14:19:48 +0200 Subject: [PATCH] Fixup --- bin/problem2html.sh | 2 +- bin/problem2pdf.sh | 2 +- bin/verifyproblem.sh | 2 +- debian/rules | 2 +- examples/hello/input_format_validators/validate.py | 2 +- problemtools/problem2html.py | 2 +- problemtools/problem2pdf.py | 2 +- problemtools/tests/test_languages.py | 2 +- problemtools/verifyproblem.py | 2 +- setup.py | 2 +- support/default_grader/default_grader | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bin/problem2html.sh b/bin/problem2html.sh index 437b7044..625b639f 100755 --- a/bin/problem2html.sh +++ b/bin/problem2html.sh @@ -7,4 +7,4 @@ export PYTHONPATH PYTHONPATH="$(dirname "$(dirname "$(readlink -f "$0")")"):$PYTHONPATH" -exec python2 -m problemtools.problem2html "$@" +exec python3 -m problemtools.problem2html "$@" diff --git a/bin/problem2pdf.sh b/bin/problem2pdf.sh index 6c14df11..672bcfb6 100755 --- a/bin/problem2pdf.sh +++ b/bin/problem2pdf.sh @@ -7,4 +7,4 @@ export PYTHONPATH PYTHONPATH="$(dirname "$(dirname "$(readlink -f "$0")")"):$PYTHONPATH" -exec python2 -m problemtools.problem2pdf "$@" +exec python3 -m problemtools.problem2pdf "$@" diff --git a/bin/verifyproblem.sh b/bin/verifyproblem.sh index f11ed892..353dcfac 100755 --- a/bin/verifyproblem.sh +++ b/bin/verifyproblem.sh @@ -7,4 +7,4 @@ export PYTHONPATH PYTHONPATH="$(dirname "$(dirname "$(readlink -f "$0")")"):$PYTHONPATH" -exec python2 -m problemtools.verifyproblem "$@" +exec python3 -m problemtools.verifyproblem "$@" diff --git a/debian/rules b/debian/rules index c0948503..76a72e36 100755 --- a/debian/rules +++ b/debian/rules @@ -12,4 +12,4 @@ export PYBUILD_TEST_PYTEST=1 export no_proxy=github.com %: - dh $@ --with python2 --buildsystem=pybuild + dh $@ --with python3 --buildsystem=pybuild diff --git a/examples/hello/input_format_validators/validate.py b/examples/hello/input_format_validators/validate.py index f6083403..2f71d601 100755 --- a/examples/hello/input_format_validators/validate.py +++ b/examples/hello/input_format_validators/validate.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 from sys import stdin import sys diff --git a/problemtools/problem2html.py b/problemtools/problem2html.py index 0017f332..e4564ef1 100644 --- a/problemtools/problem2html.py +++ b/problemtools/problem2html.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python2 +#! /usr/bin/env python3 # -*- coding: utf-8 -*- import re diff --git a/problemtools/problem2pdf.py b/problemtools/problem2pdf.py index 9590d727..38957eee 100644 --- a/problemtools/problem2pdf.py +++ b/problemtools/problem2pdf.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python2 +#! /usr/bin/env python3 # -*- coding: utf-8 -*- import re import os.path diff --git a/problemtools/tests/test_languages.py b/problemtools/tests/test_languages.py index ce9a79da..ee249adc 100644 --- a/problemtools/tests/test_languages.py +++ b/problemtools/tests/test_languages.py @@ -146,7 +146,7 @@ def test_missing_run(self): def test_invalid_run(self): vals = self.__language_dict() - vals['run'] = ['python2', '{mainfile}'] + vals['run'] = ['python3', '{mainfile}'] with pytest.raises(languages.LanguageConfigError): languages.Language('id', vals) vals['run'] = 'echo {nonexistent}' diff --git a/problemtools/verifyproblem.py b/problemtools/verifyproblem.py index 2f3c8b09..0e71a904 100644 --- a/problemtools/verifyproblem.py +++ b/problemtools/verifyproblem.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python2 +#! /usr/bin/env python3 # -*- coding: utf-8 -*- import glob diff --git a/setup.py b/setup.py index 2370113b..655a1322 100755 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 from setuptools import setup, find_packages from setuptools.command.bdist_egg import bdist_egg as _bdist_egg diff --git a/support/default_grader/default_grader b/support/default_grader/default_grader index 09547eff..f8eb6d0d 100755 --- a/support/default_grader/default_grader +++ b/support/default_grader/default_grader @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 import sys