Merge pull request #28 from fukatani/support-oj7.0.0

Support online-judge 7.0.0
fukatani · Sep 3, 2019 · 048e0a7 · 048e0a7
2 parents 7ac4eb9 + 03a397d
commit 048e0a7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/rujaion/custom_popup.py b/rujaion/custom_popup.py
@@ -29,8 +29,9 @@ def run(self):
             for i in range(40):
                 time.sleep(2)
                 submission = submission_from_url(self.url)
-                result = submission.get_status(session=sess)
-                self.updateRequest.emit((result, submission._problem_id))
+                result = submission.download_data(session=sess)
+                self.updateRequest.emit((result.status, result.problem_id))
+                result = result.status
                 failed = any([word in result for word in self.failed_words])
                 if result == "AC" or failed:
                     finished = True

diff --git a/setup.py b/setup.py
@@ -19,13 +19,13 @@ def load_module(module_path):
 
 setup(
     name="Rujaion",
-    version="0.5.3",
+    version="0.6.0",
     author="Ryosuke Fukatani",
     install_requires=[
         "PyQt5",
         "PyQtWebEngine",
         "pexpect",
-        "online-judge-tools",
+        "online-judge-tools >= 7.0.0",
         "pandas",
     ],
     packages=find_packages(exclude=("docker", "doc")),