|
- {%- if item.start_date == item.end_date -%}
- {{ item.start_date.strftime("%a %-d %b %Y") }}
- {%- elif item.start_date.year == item.end_date.year and item.start_date.month == item.end_date.month -%}
- {{ item.start_date.strftime("%a %-d") }}–{{ item.end_date.strftime("%-d %b %Y") }}
- {%- else -%}
- {{ item.start_date.strftime("%a %-d %b") }}–{{ item.end_date.strftime("%-d %b %Y") }}
- {%- endif -%}
+ {{ item.display_date }}
+ {% if item.date_status == "tentative" %}
+ tentative
+ {% elif item.date_status == "approximate" %}
+ approximate
+ {% endif %}
|
{% if item.url %}{{ item.name }}
diff --git a/tests/test_add_new_conference.py b/tests/test_add_new_conference.py
index 6a7117b..21338d9 100644
--- a/tests/test_add_new_conference.py
+++ b/tests/test_add_new_conference.py
@@ -47,6 +47,33 @@ def test_insert_sorted_allows_same_url_different_year_without_year_component() -
assert updated[1]["name"] == "NewConf"
+def test_insert_sorted_supports_nested_dates() -> None:
+ """Nested dates should be used for sorting."""
+ conferences: list[dict[str, typing.Any]] = [
+ {
+ "name": "PyCascades",
+ "dates": {
+ "status": "approximate",
+ "label": "March 2027",
+ "earliest": date(2027, 3, 1),
+ "latest": date(2027, 3, 31),
+ },
+ }
+ ]
+ new_conf: dict[str, typing.Any] = {
+ "name": "FOSDEM",
+ "dates": {
+ "status": "tentative",
+ "start": date(2027, 1, 30),
+ "end": date(2027, 1, 31),
+ },
+ }
+
+ updated = add_new_conference.insert_sorted(conferences, new_conf)
+
+ assert [conf["name"] for conf in updated] == ["FOSDEM", "PyCascades"]
+
+
def test_validate_country_normalises_name() -> None:
"""Country names should be normalised to alpha-2 codes."""
conf: dict[str, typing.Any] = {"country": "United Kingdom"}
@@ -68,6 +95,21 @@ def test_normalise_end_field_defaults_single_day_date() -> None:
assert conf["end"] == date(2026, 4, 10)
+def test_normalise_end_field_defaults_nested_exact_date() -> None:
+ """Nested exact dates should get a default end date."""
+ conf: dict[str, typing.Any] = {
+ "name": "PyCon",
+ "dates": {
+ "status": "exact",
+ "start": date(2026, 4, 10),
+ },
+ }
+
+ add_new_conference.normalise_end_field(conf, "plain text")
+
+ assert conf["dates"]["end"] == date(2026, 4, 10)
+
+
def test_normalise_end_field_sets_geomob_end_time() -> None:
"""Geomob conferences should default to a 22:00 end time."""
conf: dict[str, typing.Any] = {
diff --git a/tests/test_conference.py b/tests/test_conference.py
index 811bdb9..d056527 100644
--- a/tests/test_conference.py
+++ b/tests/test_conference.py
@@ -8,7 +8,7 @@ from typing import Any
import pytest
import yaml
-from agenda.conference import Conference, get_list
+from agenda.conference import Conference, conference_date_fields, get_list
from agenda.event import Event
@@ -298,6 +298,104 @@ class TestGetList:
assert event.date == datetime(2024, 5, 15, 9, 0)
assert event.end_date == datetime(2024, 5, 17, 17, 0)
+ def test_get_list_nested_exact_dates(self) -> None:
+ """Test reading conference with nested exact dates."""
+ yaml_data = [
+ {
+ "name": "PyCon",
+ "topic": "Python",
+ "location": "Portland",
+ "dates": {
+ "status": "exact",
+ "start": date(2024, 5, 15),
+ "end": date(2024, 5, 17),
+ },
+ }
+ ]
+
+ with tempfile.NamedTemporaryFile(mode="w", suffix=".yaml", delete=False) as f:
+ yaml.dump(yaml_data, f)
+ f.flush()
+
+ events = get_list(f.name)
+
+ assert len(events) == 1
+ assert events[0].date == date(2024, 5, 15)
+ assert events[0].end_date == date(2024, 5, 17)
+
+ def test_get_list_tentative_dates_do_not_create_conference_event(self) -> None:
+ """Test tentative conference dates are not emitted as calendar events."""
+ yaml_data = [
+ {
+ "name": "FOSDEM",
+ "topic": "FOSDEM",
+ "location": "Brussels",
+ "dates": {
+ "status": "tentative",
+ "start": date(2027, 1, 30),
+ "end": date(2027, 1, 31),
+ "label": "likely first weekend of February 2027",
+ },
+ }
+ ]
+
+ with tempfile.NamedTemporaryFile(mode="w", suffix=".yaml", delete=False) as f:
+ yaml.dump(yaml_data, f)
+ f.flush()
+
+ events = get_list(f.name)
+
+ assert events == []
+
+ def test_get_list_approximate_dates_keep_cfp_event(self) -> None:
+ """Test approximate dates do not block CFP reminders."""
+ yaml_data = [
+ {
+ "name": "PyCascades",
+ "topic": "Python",
+ "location": "TBC",
+ "dates": {
+ "status": "approximate",
+ "label": "March 2027",
+ "earliest": date(2027, 3, 1),
+ "latest": date(2027, 3, 31),
+ },
+ "cfp_end": date(2026, 11, 1),
+ }
+ ]
+
+ with tempfile.NamedTemporaryFile(mode="w", suffix=".yaml", delete=False) as f:
+ yaml.dump(yaml_data, f)
+ f.flush()
+
+ events = get_list(f.name)
+
+ assert len(events) == 1
+ assert events[0].name == "cfp_end"
+ assert events[0].date == date(2026, 11, 1)
+
+ def test_conference_date_fields_approximate(self) -> None:
+ """Test derived fields for approximate conference dates."""
+ fields = conference_date_fields(
+ {
+ "name": "PyCascades",
+ "topic": "Python",
+ "location": "TBC",
+ "dates": {
+ "status": "approximate",
+ "label": "March 2027",
+ "earliest": date(2027, 3, 1),
+ "latest": date(2027, 3, 31),
+ },
+ }
+ )
+
+ assert fields["date_status"] == "approximate"
+ assert fields["sort_date"] == date(2027, 3, 1)
+ assert fields["latest_date"] == date(2027, 3, 31)
+ assert fields["display_date"] == "March 2027"
+ assert fields["has_exact_dates"] is False
+
def test_get_list_invalid_date_order(self) -> None:
"""Test that conferences with end before start raise assertion error."""
yaml_data = [
diff --git a/tests/test_conference_list.py b/tests/test_conference_list.py
new file mode 100644
index 0000000..7a09802
--- /dev/null
+++ b/tests/test_conference_list.py
@@ -0,0 +1,55 @@
+"""Tests for conference list date handling."""
+
+from datetime import date
+import typing
+
+import yaml
+
+import agenda.trip
+import web_view
+
+
+def test_build_conference_list_supports_inexact_dates(
+ tmp_path: typing.Any, monkeypatch: typing.Any
+) -> None:
+ """Conference list should include tentative and approximate dates."""
+ conferences = [
+ {
+ "name": "PyCascades 2027",
+ "topic": "Python",
+ "location": "TBC",
+ "dates": {
+ "status": "approximate",
+ "label": "March 2027",
+ "earliest": date(2027, 3, 1),
+ "latest": date(2027, 3, 31),
+ },
+ },
+ {
+ "name": "FOSDEM 2027",
+ "topic": "FOSDEM",
+ "location": "Brussels",
+ "dates": {
+ "status": "tentative",
+ "start": date(2027, 1, 30),
+ "end": date(2027, 1, 31),
+ "label": "likely first weekend of February 2027",
+ },
+ },
+ ]
+ (tmp_path / "conferences.yaml").write_text(
+ yaml.safe_dump(conferences), encoding="utf-8"
+ )
+
+ monkeypatch.setitem(web_view.app.config, "PERSONAL_DATA", str(tmp_path))
+ monkeypatch.setattr(agenda.trip, "build_trip_list", lambda: [])
+
+ items = web_view.build_conference_list()
+
+ assert [item["name"] for item in items] == ["FOSDEM 2027", "PyCascades 2027"]
+ assert items[0]["date_status"] == "tentative"
+ assert items[0]["display_date"] == "likely first weekend of February 2027"
+ assert items[0]["sort_date"] == date(2027, 1, 30)
+ assert items[1]["date_status"] == "approximate"
+ assert items[1]["display_date"] == "March 2027"
+ assert items[1]["latest_date"] == date(2027, 3, 31)
diff --git a/validate_yaml.py b/validate_yaml.py
index 0fc82ab..8baa314 100755
--- a/validate_yaml.py
+++ b/validate_yaml.py
@@ -17,6 +17,7 @@ import agenda.data
import agenda.travel
import agenda.trip
import agenda.types
+import agenda.utils
config = __import__("config.default", fromlist=[""])
data_dir = config.PERSONAL_DATA
@@ -36,6 +37,23 @@ def check_currency(item: agenda.types.StrDict) -> None:
sys.exit(-1)
+def check_country_code(
+ item: agenda.types.StrDict, source: str, required: bool = True
+) -> None:
+ """Throw error if country code is missing or invalid."""
+ country = item.get("country")
+ if country is None:
+ if not required:
+ return
+ pprint(item)
+ print(f"{source} missing country")
+ sys.exit(-1)
+ if not isinstance(country, str) or not agenda.get_country(country):
+ pprint(item)
+ print(f"{source} has invalid country {country!r}")
+ sys.exit(-1)
+
+
def get_coords(item: agenda.types.StrDict) -> LatLon | None:
"""Return latitude/longitude tuple when present."""
if "latitude" in item and "longitude" in item:
@@ -250,6 +268,16 @@ def check_trains() -> None:
print(len(trains), "trains")
+def check_conference_dates(conf_data: agenda.types.StrDict) -> None:
+ """Check conference start/end range."""
+ try:
+ agenda.conference.validate_conference_date_fields(conf_data)
+ except ValueError as exc:
+ pprint(conf_data)
+ print(f"conference {conf_data.get('name', '[unknown]')!r}: {exc}")
+ sys.exit(-1)
+
+
def check_conferences() -> None:
"""Check conferences and ensure they are in chronological order."""
filepath = os.path.join(data_dir, "conferences.yaml")
@@ -267,7 +295,11 @@ def check_conferences() -> None:
print(f"currency {conf.currency!r} not in {currencies!r}")
sys.exit(-1)
- current_start = normalize_datetime(conf_data["start"])
+ check_country_code(conf_data, "conference", required=False)
+ check_conference_dates(conf_data)
+
+ date_fields = agenda.conference.conference_date_fields(conf_data)
+ current_start = normalize_datetime(date_fields["sort_date"])
if prev_start and current_start < prev_start:
assert prev_conf_data is not None
print(f"Out of order conference found:")
@@ -290,6 +322,11 @@ def check_events() -> None:
last_year = today - timedelta(days=365)
next_year = today + timedelta(days=2 * 365)
+ filepath = os.path.join(data_dir, "events.yaml")
+ events_data = yaml.safe_load(open(filepath, "r"))
+ for event in events_data:
+ check_country_code(event, "event", required=False)
+
events = agenda.events_yaml.read(data_dir, last_year, next_year)
print(len(events), "events")
@@ -314,6 +351,7 @@ def check_accommodation() -> None:
for stay in accommodation_list:
try:
assert all(field in stay for field in required_fields)
+ check_country_code(stay, "accommodation")
check_coordinates(stay)
except AssertionError:
pprint(stay)
@@ -347,8 +385,7 @@ def check_airports() -> None:
)
print(len(airports), "airports")
for airport in airports.values():
- assert "country" in airport
- assert agenda.get_country(airport["country"])
+ check_country_code(airport, "airport")
def check_stations() -> None:
@@ -356,8 +393,31 @@ def check_stations() -> None:
stations = agenda.travel.parse_yaml("stations", data_dir)
print(len(stations), "stations")
for station in stations:
- assert "country" in station
- assert agenda.get_country(station["country"])
+ check_country_code(station, "station")
+
+
+def check_ferry_terminals() -> None:
+ """Check ferry terminals."""
+ terminals = agenda.travel.parse_yaml("ferry_terminals", data_dir)
+ print(len(terminals), "ferry terminals")
+ for terminal in terminals:
+ check_country_code(terminal, "ferry terminal")
+
+
+def check_bus_stops() -> None:
+ """Check bus stops."""
+ stops = agenda.travel.parse_yaml("bus_stops", data_dir)
+ print(len(stops), "bus stops")
+ for stop in stops:
+ check_country_code(stop, "bus stop")
+
+
+def check_coach_stations() -> None:
+ """Check coach stations."""
+ stations = agenda.travel.parse_yaml("coach_stations", data_dir)
+ print(len(stations), "coach stations")
+ for station in stations:
+ check_country_code(station, "coach station")
def check_ferries() -> None:
@@ -415,8 +475,8 @@ def check_buses() -> None:
def check_airlines() -> list[agenda.types.StrDict]:
"""Check airlines."""
- airlines = typing.cast(
- list[agenda.types.StrDict], agenda.travel.parse_yaml("airlines", data_dir)
+ airlines: list[agenda.types.StrDict] = agenda.travel.parse_yaml(
+ "airlines", data_dir
)
print(len(airlines), "airlines")
for airline in airlines:
@@ -450,6 +510,9 @@ def check() -> None:
check_accommodation()
check_airports()
check_stations()
+ check_ferry_terminals()
+ check_bus_stops()
+ check_coach_stations()
if __name__ == "__main__":
diff --git a/web_view.py b/web_view.py
index 41a4f32..e4981fa 100755
--- a/web_view.py
+++ b/web_view.py
@@ -7,7 +7,6 @@ import hashlib
import importlib
import inspect
import json
-import operator
import os.path
import sys
import time
@@ -26,6 +25,7 @@ from authlib.integrations.flask_client import OAuth
from werkzeug.middleware.proxy_fix import ProxyFix
import agenda.data
+import agenda.conference
import agenda.error_mail
import agenda.fx
import agenda.holidays
@@ -380,18 +380,18 @@ def build_conference_list() -> list[StrDict]:
conference_trip_lookup[key] = trip
for conf in items:
- conf["start_date"] = agenda.utils.as_date(conf["start"])
- conf["end_date"] = agenda.utils.as_date(conf["end"])
+ conf.update(agenda.conference.validate_conference_date_fields(conf))
price = conf.get("price")
if price:
conf["price"] = decimal.Decimal(price)
- key = (conf["start"], conf["name"])
- if this_trip := conference_trip_lookup.get(key):
- conf["linked_trip"] = this_trip
+ if "start" in conf:
+ key = (conf["start"], conf["name"])
+ if this_trip := conference_trip_lookup.get(key):
+ conf["linked_trip"] = this_trip
- items.sort(key=operator.itemgetter("start_date"))
+ items.sort(key=lambda item: item["sort_date"])
return items
@@ -442,7 +442,7 @@ def _conference_description(conf: StrDict) -> str:
def build_conference_timeline(
current: list[StrDict], future: list[StrDict], today: date, days: int = 90
-) -> dict | None:
+) -> dict[str, typing.Any] | None:
"""Build data for a Gantt-style timeline of upcoming conferences."""
timeline_start = today
timeline_end = today + timedelta(days=days)
@@ -450,7 +450,9 @@ def build_conference_timeline(
visible = [
c
for c in (current + future)
- if c["start_date"] <= timeline_end and c["end_date"] >= today
+ if c["has_exact_dates"]
+ and c["start_date"] <= timeline_end
+ and c["end_date"] >= today
]
if not visible:
return None
@@ -500,7 +502,9 @@ def build_conference_timeline(
d = today.replace(day=1)
while d <= timeline_end:
off = max((d - timeline_start).days, 0)
- months.append({"label": d.strftime("%b %Y"), "left_pct": round(off / days * 100, 2)})
+ months.append(
+ {"label": d.strftime("%b %Y"), "left_pct": round(off / days * 100, 2)}
+ )
# advance to next month
d = (d.replace(day=28) + timedelta(days=4)).replace(day=1)
@@ -525,6 +529,8 @@ def build_conference_ical(items: list[StrDict]) -> bytes:
generated = datetime.now(tz=timezone.utc)
for conf in items:
+ if not conf["has_exact_dates"]:
+ continue
start_date = agenda.utils.as_date(conf["start"])
end_date = agenda.utils.as_date(conf["end"])
end_exclusive = end_date + timedelta(days=1)
@@ -556,9 +562,13 @@ def conference_list() -> str:
current = [
conf
for conf in items
- if conf["start_date"] <= today and conf["end_date"] >= today
+ if conf["has_exact_dates"]
+ and conf["start_date"] <= today
+ and conf["end_date"] >= today
+ ]
+ future = [
+ conf for conf in items if conf not in current and conf["latest_date"] >= today
]
- future = [conf for conf in items if conf["start_date"] > today]
timeline = build_conference_timeline(current, future, today)
@@ -579,7 +589,7 @@ def past_conference_list() -> str:
today = date.today()
return flask.render_template(
"conference_list.html",
- past=[conf for conf in build_conference_list() if conf["end_date"] < today],
+ past=[conf for conf in build_conference_list() if conf["latest_date"] < today],
today=today,
get_country=agenda.get_country,
fx_rate=agenda.fx.get_rates(app.config),
|