Add a workaround for the confliction

See #755 (comment) and online-judge-tools/api-client#26

onlinejudge_command/download_history.py

@@ -7,8 +7,7 @@
 
 import onlinejudge_command.logging as log
 import onlinejudge_command.utils as utils
-
-from onlinejudge.type import Problem
+from onlinejudge_workaround_for_conflict.type import Problem
 
 
 class DownloadHistory(object):

onlinejudge_command/main.py

@@ -10,6 +10,7 @@
 import onlinejudge_command.logging as log
 import onlinejudge_command.update_checking as update_checking
 import onlinejudge_command.utils as utils
+import onlinejudge_workaround_for_conflict.__about__ as api_version  # see https://github.com/online-judge-tools/oj/issues/755#issuecomment-623118672
 from onlinejudge_command.subcommand.download import download
 from onlinejudge_command.subcommand.generate_input import generate_input
 from onlinejudge_command.subcommand.generate_output import generate_output
@@ -18,8 +19,6 @@
 from onlinejudge_command.subcommand.test import test
 from onlinejudge_command.subcommand.test_reactive import test_reactive
 
-import onlinejudge.__about__ as api_version
-
 
 def get_parser() -> argparse.ArgumentParser:
     parser = argparse.ArgumentParser(description='Tools for online judge services')

onlinejudge_command/subcommand/download.py

@@ -8,11 +8,10 @@
 import onlinejudge_command.format_utils as format_utils
 import onlinejudge_command.logging as log
 import onlinejudge_command.utils as utils
+import onlinejudge_workaround_for_conflict.dispatch as dispatch  # see https://github.com/online-judge-tools/oj/issues/755#issuecomment-623118672
 import requests.exceptions
-
-import onlinejudge.dispatch as dispatch
-from onlinejudge.service.yukicoder import YukicoderProblem
-from onlinejudge.type import SampleParseError, TestCase
+from onlinejudge_workaround_for_conflict.service.yukicoder import YukicoderProblem  # see https://github.com/online-judge-tools/oj/issues/755#issuecomment-623118672
+from onlinejudge_workaround_for_conflict.type import SampleParseError, TestCase  # see https://github.com/online-judge-tools/oj/issues/755#issuecomment-623118672
 
 if TYPE_CHECKING:
     import argparse

onlinejudge_command/subcommand/login.py

@@ -8,10 +8,9 @@
 
 import onlinejudge_command.logging as log
 import onlinejudge_command.utils as utils
+import onlinejudge_workaround_for_conflict.dispatch as dispatch  # see https://github.com/online-judge-tools/oj/issues/755#issuecomment-623118672
 import requests
-
-import onlinejudge.dispatch as dispatch
-from onlinejudge.type import LoginError, Service
+from onlinejudge_workaround_for_conflict.type import LoginError, Service  # see https://github.com/online-judge-tools/oj/issues/755#issuecomment-623118672
 
 if TYPE_CHECKING:
     import argparse

onlinejudge_command/subcommand/submit.py

@@ -9,9 +9,8 @@
 import onlinejudge_command.download_history
 import onlinejudge_command.logging as log
 import onlinejudge_command.utils as utils
-
-import onlinejudge.dispatch as dispatch
-from onlinejudge.type import *
+import onlinejudge_workaround_for_conflict.dispatch as dispatch  # see https://github.com/online-judge-tools/oj/issues/755#issuecomment-623118672
+from onlinejudge_workaround_for_conflict.type import *  # see https://github.com/online-judge-tools/oj/issues/755#issuecomment-623118672
 
 if TYPE_CHECKING:
     import argparse

onlinejudge_command/update_checking.py

@@ -6,10 +6,9 @@
 
 import onlinejudge_command.__about__ as version
 import onlinejudge_command.logging as log
+import onlinejudge_workaround_for_conflict.__about__ as api_version
 import requests
-
-import onlinejudge.__about__ as api_version
-from onlinejudge.utils import user_cache_dir
+from onlinejudge_workaround_for_conflict.utils import user_cache_dir
 
 
 def describe_status_code(status_code: int) -> str:

onlinejudge_command/utils.py

@@ -16,10 +16,9 @@
 
 import onlinejudge_command.__about__ as version
 import onlinejudge_command.logging as log
+import onlinejudge_workaround_for_conflict.utils as utils
 import requests
-
-import onlinejudge.utils as utils
-from onlinejudge.type import *
+from onlinejudge_workaround_for_conflict.type import *
 
 user_data_dir = utils.user_data_dir
 user_cache_dir = utils.user_cache_dir

setup.py

@@ -12,7 +12,7 @@
     description=version.__description__,
     python_requires='>=3.5',
     install_requires=[
-        'online-judge-api-client >= 10, < 11',
+        'online-judge-api-client >= 10.0.3, < 11',
         'colorama >= 0.3',
         'diff-match-patch >= 20181111',
         'requests >= 2',

tests/command_download_atcoder.py

@@ -2,8 +2,7 @@
 
 import requests.exceptions
 import tests.command_download
-
-from onlinejudge.type import SampleParseError
+from onlinejudge_workaround_for_conflict.type import SampleParseError
 
 
 class DownloadAtCoderTest(unittest.TestCase):

tests/command_download_invalid.py

@@ -2,8 +2,7 @@
 
 import requests.exceptions
 import tests.command_download
-
-from onlinejudge.type import SampleParseError
+from onlinejudge_workaround_for_conflict.type import SampleParseError
 
 
 class DownloadInvalidTest(unittest.TestCase):

tests/command_download_yukicoder.py

@@ -1,8 +1,7 @@
 import unittest
 
 import tests.command_download
-
-from onlinejudge.service.yukicoder import YukicoderService
+from onlinejudge_workaround_for_conflict.service.yukicoder import YukicoderService
 
 
 class DownloadYukicoderTest(unittest.TestCase):

tests/command_login.py

@@ -1,12 +1,11 @@
 import unittest
 
 import tests.utils
-
-from onlinejudge.service.atcoder import AtCoderService
-from onlinejudge.service.codeforces import CodeforcesService
-from onlinejudge.service.hackerrank import HackerRankService
-from onlinejudge.service.toph import TophService
-from onlinejudge.service.yukicoder import YukicoderService
+from onlinejudge_workaround_for_conflict.service.atcoder import AtCoderService
+from onlinejudge_workaround_for_conflict.service.codeforces import CodeforcesService
+from onlinejudge_workaround_for_conflict.service.hackerrank import HackerRankService
+from onlinejudge_workaround_for_conflict.service.toph import TophService
+from onlinejudge_workaround_for_conflict.service.yukicoder import YukicoderService
 
 
 class LoginTest(unittest.TestCase):

tests/command_submit.py

@@ -6,12 +6,11 @@
 import tests.utils
 from onlinejudge_command.main import get_parser
 from onlinejudge_command.subcommand.submit import submit
-
-from onlinejudge.service.atcoder import AtCoderService
-from onlinejudge.service.codeforces import CodeforcesService
-from onlinejudge.service.hackerrank import HackerRankService
-from onlinejudge.service.toph import TophService
-from onlinejudge.service.yukicoder import YukicoderService
+from onlinejudge_workaround_for_conflict.service.atcoder import AtCoderService
+from onlinejudge_workaround_for_conflict.service.codeforces import CodeforcesService
+from onlinejudge_workaround_for_conflict.service.hackerrank import HackerRankService
+from onlinejudge_workaround_for_conflict.service.toph import TophService
+from onlinejudge_workaround_for_conflict.service.yukicoder import YukicoderService
 
 
 class SubmitArgumentsTest(unittest.TestCase):

tests/implementation_language_guessing.py

@@ -3,8 +3,7 @@
 import unittest
 
 import onlinejudge_command.subcommand.submit as submit
-
-from onlinejudge.type import Language, LanguageId
+from onlinejudge_workaround_for_conflict.type import Language, LanguageId
 
 # https://atcoder.jp/contests/language-test-ver1
 languages_atcoder_3 = [