diff --git a/.travis.yml b/.travis.yml index 894e74b..7551292 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,9 @@ python: - "3.6" - "3.6-dev" - "3.7-dev" +before_install: + - pip install -U pip + - pip install -U setuptools install: - pip install -r requirements.txt - pip install pylint diff --git a/LICENSE b/LICENSE index d64b530..55bd0da 100644 --- a/LICENSE +++ b/LICENSE @@ -629,7 +629,7 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - docker-judge - A Docker Based Online Judge Engine + dockerjudge - A Docker Based Online Judge Engine Copyright (C) 2019 汪心禾 This program is free software: you can redistribute it and/or modify diff --git a/README.md b/README.md index 3b6b336..186eb3f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# docker-judge -[![Build Status](https://www.travis-ci.org/wangxinhe2006/docker-judge.svg)](https://www.travis-ci.org/wangxinhe2006/docker-judge) -[![License](https://img.shields.io/github/license/wangxinhe2006/docker-judge.svg)](https://img.shields.io/github/license/wangxinhe2006/docker-judge.svg) +# dockerjudge +[![Build Status](https://www.travis-ci.org/wangxinhe2006/dockerjudge.svg)](https://www.travis-ci.org/wangxinhe2006/dockerjudge) +[![License](https://img.shields.io/github/license/wangxinhe2006/dockerjudge.svg)](https://img.shields.io/github/license/wangxinhe2006/dockerjudge.svg) A Docker Based Online Judge Engine diff --git a/dockerjudge/__init__.py b/dockerjudge/__init__.py index bbac9dd..84ab1d0 100644 --- a/dockerjudge/__init__.py +++ b/dockerjudge/__init__.py @@ -59,7 +59,7 @@ def judge(settings, source='', tests=(), timeout=1, client=docker.from_env()): thread.join() result.append(thread.return_value) return [result, (compiler.output[1] or b'').decode()] - return [['CE'] * len(tests), compiler.output[1].decode()] + return [['CE' for test in tests], compiler.output[1].decode()] finally: container.remove(force=True) diff --git a/requirements.txt b/requirements.txt index 4a9e16c..911a8d3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -docker[tls] +docker[tls]>=3.7 ruamel.yaml diff --git a/setup.py b/setup.py index e240789..d4016f7 100644 --- a/setup.py +++ b/setup.py @@ -5,14 +5,18 @@ setuptools.setup( name="dockerjudge", - version="0.2", + version="0.3", author="汪心禾", author_email="wangxinhe06@gmail.com", description="A Docker Based Online Judge Engine", long_description=long_description, long_description_content_type="text/markdown", - url="https://github.com/wangxinhe2006/docker-judge", + url="https://github.com/wangxinhe2006/dockerjudge", packages=setuptools.find_packages(), + install_requires = [ + 'docker[tls]>=3.7', + 'ruamel.yaml' + ], classifiers=[ "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6",