kivy 2.0.0 + cleanup

INSTALL.md

@@ -44,7 +44,7 @@ Simply download and run, everything is included.
 ### <a name="WindowsSources"></a>Installation from sources
 
 * Download the repository by clicking the green *Clone or download* on this page and *Download zip*. Extract the contents.
-* Make sure you have a python installation, I will assume Anaconda (Python 3.7), available [here](https://www.anaconda.com/products/individual#download-section).
+* Make sure you have a python installation, I will assume Anaconda (Python 3.7/3.8), available [here](https://www.anaconda.com/products/individual#download-section).
 * Open 'Anaconda prompt' from the start menu and navigate to where you extracted the zip file using the `cd <folder>` command.
 * Execute the command `pip3 install .`
 * Start the app by running `katrain` in the command prompt. 
@@ -53,7 +53,7 @@ Simply download and run, everything is included.
 
 ### <a name="LinuxQuick"></a>Quick install guide
 
-If you have a working Python 3.6/3.7/3.8 available, you should be able to simply:
+If you have a working Python 3.6-3.8 available, you should be able to simply:
 
 * Run `pip3 install -U katrain`
 * Run the program by executing `katrain` in a terminal.
@@ -94,10 +94,10 @@ Then, try installing python package dependencies using:
 pip3 install -r requirements.txt
 pip3 install screeninfo # Skip on MacOS, not working
 ```
-In case the sound is not working, or there is no available wheel for your OS or Python version, try:
+In case the sound is not working, or there is no available wheel for your OS or Python version, try building kivy locally using:
 ```bash
 pip3 uninstall kivy
-pip3 install kivy --extra-index-url https://kivy.org/downloads/simple/
+pip3 install kivy --no-binary kivy
 ```
 
 You can now start KaTrain by running `python3 -m katrain`

README.md

@@ -205,6 +205,8 @@ In addition to shortcuts mentioned above and those shown in the main menu:
   * Try using a lower number for `nnMaxBatchSize` in `KataGo/analysis_config.cfg`, and avoid using versions compiled with large board sizes.
   * If still encountering problems, please start KataGo by itself to check for any errors it gives.
   * Note that if you don't have a GPU, or your GPU does not support OpenCL, you should use the 'eigen' binaries which run on CPU only.
+* The font size is too small
+  * On some ultra-high resolution monitors, font scale is not set correctly. Please see [these](https://github.com/sanderland/katrain/issues/250) instructions to adjust them.
 
 ## <a name="support"></a> Support / Contribute
 

katrain/__main__.py

@@ -272,7 +272,6 @@ class KaTrainGui(Screen, KaTrainBase):
                 player_info.calculated_rank = None
                 self.update_player(bw)
         self.controls.graph.initialize_from_game(self.game.root)
-        # self.controls.rank_graph.initialize_from_game(self.game.root)
         self.update_state(redraw_board=True)
 
     def _do_insert_mode(self, mode="toggle"):

katrain/core/engine.py

@@ -6,7 +6,7 @@ import subprocess
 import threading
 import time
 import traceback
-from typing import Callable, Dict, Optional, List
+from typing import Callable, Dict, List, Optional
 
 from kivy.utils import platform
 

katrain/core/game.py

@@ -15,11 +15,11 @@ from katrain.core.constants import (
     PLAYER_AI,
     PLAYER_HUMAN,
     PROGRAM_NAME,
+    SGF_INTERNAL_COMMENTS_MARKER,
     STATUS_ANALYSIS,
     STATUS_ERROR,
     STATUS_INFO,
     STATUS_TEACHING,
-    SGF_INTERNAL_COMMENTS_MARKER,
 )
 from katrain.core.engine import KataGoEngine
 from katrain.core.game_node import GameNode

katrain/gui/badukpan.py

@@ -496,9 +496,7 @@ class BadukPanWidget(Widget):
                 size = min(self.width, self.height) * 0.227
                 Ellipse(pos=(center[0] - size / 2, center[1] - size / 2), size=(size, size))
                 Color(0.85, 0.85, 0.85)
-                draw_text(
-                    pos=center, text=text, font_size=size * 0.25, halign="center"
-                )
+                draw_text(pos=center, text=text, font_size=size * 0.25, halign="center")
 
         self.redraw_hover_contents_trigger()
 

katrain/gui/controlspanel.py

@@ -152,7 +152,6 @@ class ControlsPanel(BoxLayout):
             self.stats.player = ""
 
         self.graph.update_value(current_node)
-        # self.rank_graph.update_value(current_node)
         self.note.text = current_node.note
         self.info.text = info
 

katrain/gui/widgets/movetree.py

@@ -11,16 +11,7 @@ from kivy.uix.widget import Widget
 from kivymd.app import MDApp
 
 from katrain.gui.kivyutils import BackgroundMixin, draw_circle, draw_text
-from katrain.gui.style import (
-    GREEN,
-    LIGHT_ORANGE,
-    LIGHTGREY,
-    ORANGE,
-    RED,
-    STONE_COLORS,
-    STONE_TEXT_COLORS,
-    YELLOW,
-)
+from katrain.gui.style import GREEN, LIGHT_ORANGE, LIGHTGREY, ORANGE, RED, STONE_COLORS, STONE_TEXT_COLORS, YELLOW
 
 
 class MoveTreeDropdown(DropDown):

requirements.txt

@@ -1,14 +1,12 @@
-certifi==2020.6.20
+certifi==2020.12.5
 chardet==3.0.4
-Cython==0.29.14
-dataclasses==0.6
 docutils==0.16
+ffpyplayer==4.3.2
 idna==2.10
-Kivy==2.0.0rc2
+Kivy==2.0.0
 Kivy-Garden==0.1.4
 kivymd==0.104.1
-Pillow==7.2.0
-pygame==1.9.6
-Pygments==2.6.1
-requests==2.24.0
-urllib3==1.25.9
+Pillow==8.0.1
+Pygments==2.7.3
+requests==2.25.0
+urllib3==1.26.2

setup.py

@@ -41,16 +41,11 @@ setup(
     install_requires=[
         "wheel",
         "setuptools",
-        "urllib3",
-        "importlib_resources ;python_version<'3.7'",
-        "cython>=0.24,<=0.29.14,!=0.27,!=0.27.2",  # kivy wants this
-        "kivy==2.0.0rc2;platform_system=='Darwin'",  # rc3 failing on mac
-        "kivy>=2.0.0rc2;platform_system!='Darwin'",  # just use the latest on linux?
-        "pygame;platform_system=='Darwin'",  # some mac versions need this for kivy
-        "kivy_deps.glew;platform_system=='Windows'",
-        "kivy_deps.sdl2;platform_system=='Windows'",
-        "kivy_deps.gstreamer;platform_system=='Windows'",
+        "kivy[full]>=2.0.0",
         "kivymd>=0.104.1",
+        "importlib_resources ;python_version<'3.7'",
+        "urllib3",
+        "pygame;platform_system=='Darwin'",  # some mac versions need this for kivy
         "screeninfo;platform_system!='Darwin'",  # for screen resolution, has problems on macos
     ],
     dependency_links=["https://kivy.org/downloads/simple/"],