Skip to content

Commit

Permalink
bump to next version
Browse files Browse the repository at this point in the history
  • Loading branch information
corei8 committed May 21, 2024
1 parent 21cc082 commit b7c25f2
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 12 deletions.
5 changes: 2 additions & 3 deletions ordotools/sanctoral/diocese/roman.py
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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
Expand Down
22 changes: 15 additions & 7 deletions ordotools/tools/algorithm.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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)
Expand Down Expand Up @@ -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
)
Expand Down
2 changes: 1 addition & 1 deletion ordotools/tools/feast.py
Original file line number Diff line number Diff line change
@@ -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


Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit b7c25f2

Please sign in to comment.