From b7c25f2062c7ffb276b9d438cf3e6b2bbd62ec0e Mon Sep 17 00:00:00 2001
From: corei8 <38426287+corei8@users.noreply.github.com>
Date: Tue, 21 May 2024 14:56:37 -0400
Subject: [PATCH] bump to next version

---
 ordotools/sanctoral/diocese/roman.py |  5 ++---
 ordotools/tools/algorithm.py         | 22 +++++++++++++++-------
 ordotools/tools/feast.py             |  2 +-
 setup.cfg                            |  2 +-
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/ordotools/sanctoral/diocese/roman.py b/ordotools/sanctoral/diocese/roman.py
index b47635a..f601ad7 100644
--- a/ordotools/sanctoral/diocese/roman.py
+++ b/ordotools/sanctoral/diocese/roman.py
@@ -1,9 +1,6 @@
 from ordotools.tools.helpers import day
 
 
-# NOTE: We are getting rid of the "feast" name eventually
-
-
 class Sanctoral:
     """
     The Roman Sanctoral Cycle, which is called at every compilation.
@@ -17,6 +14,8 @@ def __init__(self, year):
 
             # what is the best way to determine if the third lessons are proper?
 
+            # TODO: We need to have a method for events on any day. Greater Litanies, for example.
+
             # January
             day(year=self.year, month=1, day=14): {
                 # S Hilarii Episcopi ECD
diff --git a/ordotools/tools/algorithm.py b/ordotools/tools/algorithm.py
index 1ae33be..3958687 100644
--- a/ordotools/tools/algorithm.py
+++ b/ordotools/tools/algorithm.py
@@ -122,6 +122,7 @@ def rank_by_nobility(self, feast_1: Feast, feast_2: Feast) -> dict:
         return {'higher': feast_1, 'lower': feast_2}
 
     def rank(self, dynamic: Feast, static: Feast) -> Feast:
+        print(f"self.transfers = {self.transfers}")
         if dynamic.rank_n == static.rank_n:
             return self.rank_by_nobility(dynamic, static)['higher']
         else:
@@ -138,14 +139,22 @@ def rank(self, dynamic: Feast, static: Feast) -> Feast:
                     return lower
                 if lower.rank_n <= 10:
                     # The Queenship of Our Lady is not transferring...
-                    if lower.fasting is True:
-                        higher.fasting = True
-                    if lower != self.transfers:
-                        self.transfers = lower
+
+                    # just forget this for now:
+                    # if lower.fasting is True:
+                    #     higher.fasting = True
+
+                    # if lower != self.transfers:
+                    self.transfers = lower
                     return higher
                 else:
-                    if lower.fasting is True:
-                        higher.fasting = True
+                    # if lower.fasting is True:
+                    #     higher.fasting = True
+                    return higher
+            # this should fix BMV Reginae...
+            elif higher.rank_n <= 9:
+                if lower.rank_n <= 10:
+                    self.transfers = lower
                     return higher
             elif 14 <= lower.rank_n <= 16:
                 return self.commemorate(feast=higher, com=lower)
@@ -193,7 +202,6 @@ def add_feasts(self, master: tuple, addition: tuple) -> dict:
             else:
                 feast = master_expanded[date]
             if self.transfers is not None:
-                print(self.transfers)
                 result = self.transfer_feast(
                     feast
                 )
diff --git a/ordotools/tools/feast.py b/ordotools/tools/feast.py
index 3ee9153..f96b868 100644
--- a/ordotools/tools/feast.py
+++ b/ordotools/tools/feast.py
@@ -1,5 +1,5 @@
 from datetime import datetime
-from ordotools.tools.helpers import days
+# from ordotools.tools.helpers import days
 from ordotools.tools.translations import Translations
 
 
diff --git a/setup.cfg b/setup.cfg
index 2d4cb83..9cf512c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = ordotools
-version = 0.0.34
+version = 0.0.35
 description = A set of tools for producing a traditional Catholic Ordo, given a year and diocese
 long_description = file: README.rst
 long_desciption_content_type = text/rst