kerykeion 4.7.0__tar.gz → 4.8.0__tar.gz

{kerykeion-4.7.0 → kerykeion-4.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kerykeion
-Version: 4.7.0
+Version: 4.8.0
 Summary: A python library for astrology.
 Home-page: https://github.com/g-battaglia/kerykeion
 License: AGPL-3.0
@@ -30,6 +30,7 @@ Requires-Dist: pyswisseph (>=2.10.3.1,<3.0.0.0)
 Requires-Dist: pytz (>=2022.7,<2023.0)
 Requires-Dist: requests (>=2.28.1,<3.0.0)
 Requires-Dist: requests-cache (>=0.9.7,<0.10.0)
+Requires-Dist: scour (>=0.38.2,<0.39.0)
 Requires-Dist: terminaltables (>=3.1.10,<4.0.0)
 Project-URL: Repository, https://github.com/g-battaglia/kerykeion
 Description-Content-Type: text/markdown

{kerykeion-4.7.0 → kerykeion-4.8.0}/kerykeion/astrological_subject.py

@@ -170,7 +170,7 @@ class AstrologicalSubject:
 
         # This message is set to encourage the user to set a custom geonames username
         if geonames_username is None and online:
-            logging.info(
+            logging.warning(
                 "\n"
                 "********" +
                 "\n" +
@@ -191,19 +191,19 @@ class AstrologicalSubject:
 
         if not self.city:
             self.city = "London"
-            logging.warning("No city specified, using London as default")
+            logging.info("No city specified, using London as default")
 
         if not self.nation:
             self.nation = "GB"
-            logging.warning("No nation specified, using GB as default")
+            logging.info("No nation specified, using GB as default")
 
         if not self.lat:
             self.lat = 51.5074
-            logging.warning("No latitude specified, using London as default")
+            logging.info("No latitude specified, using London as default")
 
         if not self.lng:
             self.lng = 0
-            logging.warning("No longitude specified, using London as default")
+            logging.info("No longitude specified, using London as default")
 
         if (not self.online) and (not tz_str):
             raise KerykeionException(

{kerykeion-4.7.0 → kerykeion-4.8.0}/kerykeion/charts/kerykeion_chart_svg.py

@@ -28,10 +28,12 @@ from kerykeion.charts.charts_utils import (
     draw_transit_ring
 )
 from pathlib import Path
+from scour.scour import scourString
 from string import Template
 from typing import Union, List
 
 
+
 class KerykeionChartSVG:
     """
     Creates the instance that can generate the chart with the
@@ -250,8 +252,7 @@ class KerykeionChartSVG:
             {"name": "pisces", "element": "water"},
         )
 
-        # Immediately generate template.
-        self.template = self.makeTemplate()
+        self.template = None
 
     def set_output_directory(self, dir_path: Path) -> None:
         """
@@ -1379,7 +1380,7 @@ class KerykeionChartSVG:
 
         return td
 
-    def makeTemplate(self):
+    def makeTemplate(self, minify: bool = False) -> str:
         """Creates the template for the SVG file"""
         td = self._createTemplateDictionary()
 
@@ -1392,13 +1393,20 @@ class KerykeionChartSVG:
         logging.debug(f"Template dictionary keys: {td.keys()}")
 
         self._createTemplateDictionary()
-        return template.replace('"', "'")
 
-    def makeSVG(self) -> None:
+        if minify:
+            template = scourString(template).replace('"', "'").replace("\n", "").replace("\t","").replace("    ", "").replace("  ", "")
+
+        else:
+            template = template.replace('"', "'")
+
+        return template
+
+    def makeSVG(self, minify: bool = False):
         """Prints out the SVG file in the specifide folder"""
 
         if not (self.template):
-            self.template = self.makeTemplate()
+            self.template = self.makeTemplate(minify)
 
         self.chartname = self.output_directory / f"{self.user.name}{self.chart_type}Chart.svg"
 
@@ -1425,8 +1433,9 @@ if __name__ == "__main__":
 
     # Synastry Chart
     synastry_chart = KerykeionChartSVG(first, "Synastry", second)
-    synastry_chart.makeSVG()
+    synastry_chart.makeSVG(minify=True)
 
     # Transits Chart
     transits_chart = KerykeionChartSVG(first, "Transit", second)
-    transits_chart.makeSVG()
+    transits_chart.makeSVG(minify=True)
+

{kerykeion-4.7.0 → kerykeion-4.8.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "kerykeion"
-version = "4.7.0"
+version = "4.8.0"
 authors = ["Giacomo Battaglia <battaglia.giacomo@yahoo.it>"]
 description = "A python library for astrology."
 license = "AGPL-3.0"
@@ -48,6 +48,7 @@ requests = "^2.28.1"
 requests-cache = "^0.9.7"
 pydantic = "^2.5"
 terminaltables = "^3.1.10"
+scour = "^0.38.2"
 
 [tool.poetry.scripts]
 create-docs = "scripts.docs:main"