Skip to content

armgit / manim

Public Imported from GitHub
0

A community-maintained Python framework for creating mathematical animations.

Move from submodule to logger.py

Syrus Darke69a43383d0b
diff --git a/manim/logger/__main__.py b/manim/cfgwriter/__main__.py
similarity index 99%
rename from manim/logger/__main__.py
rename to manim/cfgwriter/__main__.py
index 593357ce2..6eeb24d20 100644
--- a/manim/logger/__main__.py
+++ b/manim/cfgwriter/__main__.py
@@ -1,7 +1,8 @@
+import configparser
+
from rich.console import Console
from rich.progress import track
from rich.color import Color
-import configparser
def check_valid_colour(color):
diff --git a/manim/logger.py b/manim/logger.py
new file mode 100644
index 000000000..fe04f7286
--- /dev/null
+++ b/manim/logger.py
@@ -0,0 +1,31 @@
+import logging
+import configparser
+
+from rich.logging import RichHandler
+from rich.console import Console
+from rich.theme import Theme
+#from .config import config
+
+#print(config)
+def parseTheme(fp):
+ config = configparser.ConfigParser()
+ config.read(fp)
+ theme=dict(config['log.color'])
+ customTheme=Theme(theme)
+ return customTheme
+try:
+ customTheme = parseTheme("manim.cfg")
+ console = Console(theme=customTheme)
+except KeyError:
+ console = Console()
+
+RichHandler.KEYWORDS = ['Played', 'animations', 'scene', 'Reading', 'Writing', 'script', 'arguments', 'Invalid', 'Aborting', 'module', 'File', 'Rendering']
+logging.basicConfig(
+ level="NOTSET",
+ format="%(message)s",
+ datefmt="[%X]",
+ handlers=[RichHandler(console=console)]
+)
+
+logger = logging.getLogger("rich")
+
\ No newline at end of file
diff --git a/manim/logger/__init__.py b/manim/logger/__init__.py
deleted file mode 100644
index 36891721b..000000000
--- a/manim/logger/__init__.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import logging
-from rich.logging import RichHandler
-from .console import console
-
-RichHandler.KEYWORDS = ['Played', 'animations', 'scene', 'Reading', 'Writing', 'script', 'arguments', 'Invalid', 'Aborting', 'module', 'File', 'Rendering']
-logging.basicConfig(
- level="NOTSET",
- format="%(message)s",
- datefmt="[%X]",
- handlers=[RichHandler(console=console)]
-)
-
-logger = logging.getLogger("rich")
-
\ No newline at end of file
diff --git a/manim/logger/console.py b/manim/logger/console.py
deleted file mode 100644
index 7dc20d9a9..000000000
--- a/manim/logger/console.py
+++ /dev/null
@@ -1,16 +0,0 @@
-import configparser
-from rich.console import Console
-from rich.theme import Theme
-
-def parseTheme(fp):
- config = configparser.ConfigParser()
- config.read(fp)
- theme=dict(config['log.color'])
- customTheme=Theme(theme)
- return customTheme
-try:
- customTheme = parseTheme("manim.cfg")
- console = Console(theme=customTheme)
-except KeyError:
- console = Console()
-
diff --git a/setup.py b/setup.py
index bed3131e6..751fefbfa 100755
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ setup(
"console_scripts": [
"manim=manim.__main__:main",
"manimcm=manim.__main__:main",
- "manim-logsetup=manim.logger.__main__:main",
+ "cfg-manim=manim.cfgwriter.__main__:main",
]
},
install_requires=[