kerykeion 4.13.2__tar.gz → 4.13.3__tar.gz

{kerykeion-4.13.2 → kerykeion-4.13.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kerykeion
-Version: 4.13.2
+Version: 4.13.3
 Summary: A python library for astrology.
 Home-page: https://www.kerykeion.net/
 License: AGPL-3.0

{kerykeion-4.13.2 → kerykeion-4.13.3}/kerykeion/aspects/aspects_utils.py

@@ -131,17 +131,18 @@ def get_aspect_from_two_points(aspects_settings: dict, point_one: Union[float, i
         name = None
         distance = 0
         aspect_degrees = 0
-        color = None
         aid = None
 
-    return (
-        verdict,
-        name,
-        distance - aspect_degrees,
-        aspect_degrees,
-        aid,
-        diff,
-    )
+
+    return {
+        "verdict": verdict, 
+        "name": name,
+        "orbit": distance - aspect_degrees,
+        "distance": distance - aspect_degrees,
+        "aspect_degrees": aspect_degrees,
+        "aid": aid,
+        "diff": diff
+    }
 
 
 def planet_id_decoder(planets_settings: dict, name: str):

{kerykeion-4.13.2 → kerykeion-4.13.3}/kerykeion/aspects/natal_aspects.py

@@ -52,10 +52,18 @@ class NatalAspects:
         for first in range(len(active_points_list)):
             # Generates the aspects list without repetitions
             for second in range(first + 1, len(active_points_list)):
-                verdict, name, orbit, aspect_degrees, aid, diff = get_aspect_from_two_points(
+                aspect = get_aspect_from_two_points(
                     self.aspects_settings, active_points_list[first]["abs_pos"], active_points_list[second]["abs_pos"]
                 )
 
+                verdict = aspect["verdict"]
+                name = aspect["name"]
+                orbit = aspect["orbit"]
+                aspect_degrees = aspect["aspect_degrees"]
+                aid = aspect["aid"]
+                diff = aspect["diff"]
+                
+
                 if verdict == True:
                     d_asp = {
                         "p1_name": active_points_list[first]["name"],

{kerykeion-4.13.2 → kerykeion-4.13.3}/kerykeion/aspects/synastry_aspects.py

@@ -60,12 +60,20 @@ class SynastryAspects(NatalAspects):
         for first in range(len(first_active_points_list)):
             # Generates the aspects list whitout repetitions
             for second in range(len(second_active_points_list)):
-                verdict, name, orbit, aspect_degrees, aid, diff = get_aspect_from_two_points(
+                aspect = get_aspect_from_two_points(
                     self.aspects_settings,
                     first_active_points_list[first]["abs_pos"],
                     second_active_points_list[second]["abs_pos"],
                 )
 
+                verdict = aspect["verdict"]
+                name = aspect["name"]
+                orbit = aspect["orbit"]
+                aspect_degrees = aspect["aspect_degrees"]
+                aid = aspect["aid"]
+                diff = aspect["diff"]
+
+
                 if verdict == True:
                     d_asp = {
                         "p1_name": first_active_points_list[first]["name"],
@@ -96,7 +104,7 @@ if __name__ == "__main__":
     setup_logging(level="debug")
 
     john = AstrologicalSubject("John", 1940, 10, 9, 18, 30, "Liverpool")
-    yoko = AstrologicalSubject("Yoko", 1933, 2, 18, 18, 30, "Tokyo")
+    yoko = AstrologicalSubject("Yoko", 1933, 2, 18, 18, 30, "Tokyo", "JP")
 
     synastry_aspects = SynastryAspects(john, yoko)
 

{kerykeion-4.13.2 → kerykeion-4.13.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "kerykeion"
-version = "4.13.2"
+version = "4.13.3"
 authors = ["Giacomo Battaglia <battaglia.giacomo@yahoo.it>"]
 description = "A python library for astrology."
 license = "AGPL-3.0"