Skip to content
This repository has been archived by the owner on Aug 4, 2023. It is now read-only.

Adjust year ranges for Science Museum #946

Merged
merged 2 commits into from
Jan 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,18 @@ def _get_year_ranges(final_year: int) -> list[tuple[int, int]]:
"""
# Start with some very large ranges for old data
year_ranges = [
(0, 1500),
(0, 200),
(200, 1500),
(1500, 1750),
]
# Add a range for every 25 years between 1750 and 1875
year_ranges.extend([(x, x + 25) for x in range(1750, 1875, 25)])
# Add a range for every 10 years between 1875 and 'next year'
# Add a range for every 25 years between 1750 and 1825
year_ranges.extend([(x, x + 25) for x in range(1750, 1825, 25)])
# Add a range for every 10 years between 1825 and 1925
year_ranges.extend([(x, x + 10) for x in range(1825, 1925, 10)])
# Add a range for every 5 years between 1925 and 'next year'
# relative to when the DAG is being run.
year_ranges.extend(
[(x, min(x + 10, final_year)) for x in range(1875, final_year, 10)]
[(x, min(x + 5, final_year)) for x in range(1925, final_year, 5)]
)
return year_ranges

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,22 +68,28 @@ def single_image_data():


def test_get_year_ranges():
# Expected list when using 1923 as the final year
# Expected list when using 1933 as the final year
expected_list = [
(0, 1500),
(0, 200),
(200, 1500),
(1500, 1750),
(1750, 1775),
(1775, 1800),
(1800, 1825),
(1825, 1850),
(1850, 1875),
(1825, 1835),
(1835, 1845),
(1845, 1855),
(1855, 1865),
(1865, 1875),
(1875, 1885),
(1885, 1895),
(1895, 1905),
(1905, 1915),
(1915, 1923),
(1915, 1925),
(1925, 1930),
(1930, 1933),
]
actual_list = sm._get_year_ranges(1923)
actual_list = sm._get_year_ranges(1933)
assert actual_list == expected_list


Expand Down