From d3b49c68ef4eb8754c143048130a46565bb43f0b Mon Sep 17 00:00:00 2001 From: Rose Williams Date: Wed, 8 May 2024 13:44:28 -0400 Subject: [PATCH 01/10] Mtp: Add Armenia WTD group info --- docs/_data/meetups/armenia.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 docs/_data/meetups/armenia.yaml diff --git a/docs/_data/meetups/armenia.yaml b/docs/_data/meetups/armenia.yaml new file mode 100644 index 0000000000..6eaade9c1a --- /dev/null +++ b/docs/_data/meetups/armenia.yaml @@ -0,0 +1,7 @@ +region: Asia +country: Armenia +website: https://t.me/technicalwritersEVN +organizers: + - name: Ani Asatryan + link: https://www.linkedin.com/in/ani-asatryan-85565b196/ + - name: Note, the Armenia Write the Docs group uses Telegram for their events and community. From 8190f737e196051486c5a321bb3c7e67a678fdbd Mon Sep 17 00:00:00 2001 From: Sam Wright Date: Mon, 20 May 2024 09:46:57 +0100 Subject: [PATCH 02/10] Support meetups without a meetup URL --- docs/_ext/meetups.py | 3 ++- docs/_templates/include/meetups/listing.jinja | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/_ext/meetups.py b/docs/_ext/meetups.py index 8b1f3025f4..bcbd034942 100644 --- a/docs/_ext/meetups.py +++ b/docs/_ext/meetups.py @@ -43,8 +43,9 @@ def load_meetups_by_region(): 'organizers', 'website', 'twitter', + 'meetup_alt', ]]) - if 'meetup' not in meetup: + if 'meetup' not in meetup and 'meetup_alt' not in meetup: raise ExtensionError('Meetup missing `meetup` key: file={0}'.format( yaml_file )) diff --git a/docs/_templates/include/meetups/listing.jinja b/docs/_templates/include/meetups/listing.jinja index c21e7b8d09..d1dc0fa8f6 100644 --- a/docs/_templates/include/meetups/listing.jinja +++ b/docs/_templates/include/meetups/listing.jinja @@ -2,8 +2,9 @@
{% for meetup in meetups %}
- - + {% if meetup['city'] %}{{ meetup['city'] }}, {% endif -%} {% if meetup['state'] %}{{ meetup|state_abbr }}, {% endif -%} {{ meetup['country'] -}} From 8fe4c0d04280ed557f1b4686ba8b7422efd50a0d Mon Sep 17 00:00:00 2001 From: Sam Wright Date: Mon, 20 May 2024 09:48:35 +0100 Subject: [PATCH 03/10] Tweak key name --- docs/_data/meetups/armenia.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_data/meetups/armenia.yaml b/docs/_data/meetups/armenia.yaml index 6eaade9c1a..ec71a123dc 100644 --- a/docs/_data/meetups/armenia.yaml +++ b/docs/_data/meetups/armenia.yaml @@ -1,6 +1,6 @@ region: Asia country: Armenia -website: https://t.me/technicalwritersEVN +meetup_alt: https://t.me/technicalwritersEVN organizers: - name: Ani Asatryan link: https://www.linkedin.com/in/ani-asatryan-85565b196/ From ef77065e202971fa70af8cb68c42a26b66946ede Mon Sep 17 00:00:00 2001 From: Sam Wright Date: Wed, 16 Oct 2024 13:51:27 +0200 Subject: [PATCH 04/10] Add some basic meetup validation --- docs/_data/schema-meetups.yaml | 15 +++++++++++++++ docs/_scripts/validate-yaml.sh | 6 ++++++ 2 files changed, 21 insertions(+) create mode 100644 docs/_data/schema-meetups.yaml diff --git a/docs/_data/schema-meetups.yaml b/docs/_data/schema-meetups.yaml new file mode 100644 index 0000000000..04fff6cb6b --- /dev/null +++ b/docs/_data/schema-meetups.yaml @@ -0,0 +1,15 @@ +region: str(required=True) +country: str(required=True) +state: str(required=False) +city: str(required=False) +website: str(required=False) +twitter: str(required=False) +meetup: str(required=False) # I can't figure out how to validate must contain either meetup or meetup_alt +meetup_alt: str(required=False) +organizers: list(include('organizer-detail'), min=1, max=9) + +--- + +organizer-detail: + name: str(required=True) + link: str(required=False) diff --git a/docs/_scripts/validate-yaml.sh b/docs/_scripts/validate-yaml.sh index 1bfe0a851f..31946cc29b 100755 --- a/docs/_scripts/validate-yaml.sh +++ b/docs/_scripts/validate-yaml.sh @@ -22,4 +22,10 @@ do yamale -s docs/_data/schema-sessions.yaml $y -p ruamel done +for y in ../_data/meetups/*.yaml +do + [[ $y == *"schema"* ]] && continue + yamale -s docs/_data/schema-meetups.yaml $y -p ruamel +done + cd - From c2dfb6ea541738fd2949795167f0a00bef6fbf95 Mon Sep 17 00:00:00 2001 From: Sam Wright Date: Wed, 16 Oct 2024 13:51:57 +0200 Subject: [PATCH 05/10] Fix up a few meetups --- docs/_data/meetups/ger-hamburg.yaml | 4 ++-- docs/_data/meetups/irl-dublin.yaml | 2 +- docs/_data/meetups/qrm-usEast.yaml | 1 - docs/_data/meetups/usa-sanfrancisco.yaml | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/_data/meetups/ger-hamburg.yaml b/docs/_data/meetups/ger-hamburg.yaml index cb5020dad0..136d7b9c01 100644 --- a/docs/_data/meetups/ger-hamburg.yaml +++ b/docs/_data/meetups/ger-hamburg.yaml @@ -3,6 +3,6 @@ country: Germany city: Hamburg website: https://www.meetup.com/write-the-docs-hamburg/events/ meetup: Write-the-Docs-Hamburg -organizer: +organizers: - name: Frank Ralf - link: \ No newline at end of file + link: diff --git a/docs/_data/meetups/irl-dublin.yaml b/docs/_data/meetups/irl-dublin.yaml index aba38749eb..b6668f7756 100644 --- a/docs/_data/meetups/irl-dublin.yaml +++ b/docs/_data/meetups/irl-dublin.yaml @@ -5,4 +5,4 @@ website: https://www.meetup.com/write-the-docs-ireland/events/ meetup: Write-The-Docs-Ireland organizers: - name: Artem Konev - - link: https://www.linkedin.com/in/artemkonev \ No newline at end of file + link: https://www.linkedin.com/in/artemkonev diff --git a/docs/_data/meetups/qrm-usEast.yaml b/docs/_data/meetups/qrm-usEast.yaml index 35df27bed3..d8a0f7fcf5 100644 --- a/docs/_data/meetups/qrm-usEast.yaml +++ b/docs/_data/meetups/qrm-usEast.yaml @@ -4,7 +4,6 @@ state: East Coast city: website: https://www.meetup.com/virtual-write-the-docs-east-coast-quorum/events/ meetup: Virtual-Write-The-Docs-East-Coast-Quorum -twitter: organizers: - name: Rose Williams link: https://twitter.com/ZelWms diff --git a/docs/_data/meetups/usa-sanfrancisco.yaml b/docs/_data/meetups/usa-sanfrancisco.yaml index afb2f967f1..8256d2677d 100644 --- a/docs/_data/meetups/usa-sanfrancisco.yaml +++ b/docs/_data/meetups/usa-sanfrancisco.yaml @@ -4,6 +4,6 @@ state: California city: San Francisco website: https://www.meetup.com/write-the-docs-bay-area/events/ meetup: Write-the-Docs -organizer: +organizers: - name: Ilona Koren-Deutsch link: https://twitter.com/nitsekees From 5863eccdc8cbe16ef946b3e6e18f0a82a8b8a442 Mon Sep 17 00:00:00 2001 From: Sam Wright Date: Wed, 16 Oct 2024 14:13:19 +0200 Subject: [PATCH 06/10] Check for empty link entries --- docs/_data/meetups/ger-hamburg.yaml | 1 - docs/_data/schema-meetups.yaml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/_data/meetups/ger-hamburg.yaml b/docs/_data/meetups/ger-hamburg.yaml index 136d7b9c01..3dfe4d9b1e 100644 --- a/docs/_data/meetups/ger-hamburg.yaml +++ b/docs/_data/meetups/ger-hamburg.yaml @@ -5,4 +5,3 @@ website: https://www.meetup.com/write-the-docs-hamburg/events/ meetup: Write-the-Docs-Hamburg organizers: - name: Frank Ralf - link: diff --git a/docs/_data/schema-meetups.yaml b/docs/_data/schema-meetups.yaml index 04fff6cb6b..4fe7696def 100644 --- a/docs/_data/schema-meetups.yaml +++ b/docs/_data/schema-meetups.yaml @@ -12,4 +12,4 @@ organizers: list(include('organizer-detail'), min=1, max=9) organizer-detail: name: str(required=True) - link: str(required=False) + link: str(required=False, none=False) From 9de234c0c56377d8963ae3e9f2fcf69743f2e40a Mon Sep 17 00:00:00 2001 From: Sam Wright Date: Wed, 16 Oct 2024 14:24:51 +0200 Subject: [PATCH 07/10] Simplify --- docs/_scripts/validate-yaml.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/_scripts/validate-yaml.sh b/docs/_scripts/validate-yaml.sh index 31946cc29b..decfe1adc6 100755 --- a/docs/_scripts/validate-yaml.sh +++ b/docs/_scripts/validate-yaml.sh @@ -22,9 +22,10 @@ do yamale -s docs/_data/schema-sessions.yaml $y -p ruamel done +# Meetups + for y in ../_data/meetups/*.yaml do - [[ $y == *"schema"* ]] && continue yamale -s docs/_data/schema-meetups.yaml $y -p ruamel done From 418ac37e54775ebf1a7313f63277d32b736015fb Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 16 Oct 2024 17:15:47 +0300 Subject: [PATCH 08/10] Apply suggestions from code review Co-authored-by: Sasha Romijn --- docs/_ext/meetups.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_ext/meetups.py b/docs/_ext/meetups.py index bcbd034942..7290305171 100644 --- a/docs/_ext/meetups.py +++ b/docs/_ext/meetups.py @@ -46,7 +46,7 @@ def load_meetups_by_region(): 'meetup_alt', ]]) if 'meetup' not in meetup and 'meetup_alt' not in meetup: - raise ExtensionError('Meetup missing `meetup` key: file={0}'.format( + raise ExtensionError('Meetup missing `meetup`/`meetup_alt` key: file={0}'.format( yaml_file )) result[meetup['region']].append(meetup) From 9e1058d895b07b939290eac62c552fc748f63742 Mon Sep 17 00:00:00 2001 From: Sam Wright Date: Wed, 16 Oct 2024 16:43:49 +0200 Subject: [PATCH 09/10] Tweak YAML format --- docs/_data/meetups/armenia.yaml | 3 ++- docs/_data/meetups/aus.yaml | 3 ++- docs/_data/meetups/can-calgary.yaml | 3 ++- docs/_data/meetups/can-ottawa.yaml | 3 ++- docs/_data/meetups/can-toronto.yaml | 5 +++-- docs/_data/meetups/esp-barcelona.yaml | 3 ++- docs/_data/meetups/fra-paris.yaml | 3 ++- docs/_data/meetups/gbr-london.yaml | 3 ++- docs/_data/meetups/ger-berlin.yaml | 3 ++- docs/_data/meetups/ger-hamburg.yaml | 3 ++- docs/_data/meetups/ind-bangalore.yaml | 3 ++- docs/_data/meetups/irl-dublin.yaml | 3 ++- docs/_data/meetups/isr-herzliya.yaml | 3 ++- docs/_data/meetups/kenya-nairobi.yaml | 5 +++-- docs/_data/meetups/ned-amsterdam.yaml | 3 ++- docs/_data/meetups/ng-portharcourt.yaml | 3 ++- docs/_data/meetups/qrm-usEast.yaml | 3 ++- docs/_data/meetups/swe-stockholm.yaml | 3 ++- docs/_data/meetups/tn-tunis.yaml | 5 +++-- docs/_data/meetups/usa-austin.yaml | 3 ++- docs/_data/meetups/usa-boise.yaml | 3 ++- docs/_data/meetups/usa-boulder.yaml | 3 ++- docs/_data/meetups/usa-florida.yaml | 5 +++-- docs/_data/meetups/usa-losAngeles.yaml | 3 ++- docs/_data/meetups/usa-michigan.yaml | 5 +++-- docs/_data/meetups/usa-nashville.yaml | 5 +++-- docs/_data/meetups/usa-new-england.yaml | 3 ++- docs/_data/meetups/usa-nyc.yaml | 3 ++- docs/_data/meetups/usa-pittsburgh.yaml | 3 ++- docs/_data/meetups/usa-portland.yaml | 3 ++- docs/_data/meetups/usa-sanfrancisco.yaml | 3 ++- docs/_data/meetups/usa-seattle.yaml | 3 ++- docs/_data/meetups/usa-washingtondc.yaml | 3 ++- docs/_data/schema-meetups.yaml | 10 ++++++++-- 34 files changed, 80 insertions(+), 41 deletions(-) diff --git a/docs/_data/meetups/armenia.yaml b/docs/_data/meetups/armenia.yaml index ec71a123dc..234fee5a7f 100644 --- a/docs/_data/meetups/armenia.yaml +++ b/docs/_data/meetups/armenia.yaml @@ -1,6 +1,7 @@ region: Asia country: Armenia -meetup_alt: https://t.me/technicalwritersEVN +source: + other: https://t.me/technicalwritersEVN organizers: - name: Ani Asatryan link: https://www.linkedin.com/in/ani-asatryan-85565b196/ diff --git a/docs/_data/meetups/aus.yaml b/docs/_data/meetups/aus.yaml index c917eccfb4..7bf484c57e 100644 --- a/docs/_data/meetups/aus.yaml +++ b/docs/_data/meetups/aus.yaml @@ -1,7 +1,8 @@ region: Oceania country: Australia website: https://www.meetup.com/write-the-docs-australia/events/ -meetup: Write-the-Docs-Australia +source: + meetup: Write-the-Docs-Australia organizers: - name: Swapnil Ogale link: http://twitter.com/swapnilogale/ diff --git a/docs/_data/meetups/can-calgary.yaml b/docs/_data/meetups/can-calgary.yaml index f1b0d7bb02..9979724330 100644 --- a/docs/_data/meetups/can-calgary.yaml +++ b/docs/_data/meetups/can-calgary.yaml @@ -3,7 +3,8 @@ country: Canada state: Alberta city: Calgary website: https://www.meetup.com/wtd-calgary/events/ -meetup: WTD-Calgary +source: + meetup: WTD-Calgary organizers: - name: Ken Schatzke link: https://www.linkedin.com/in/kenschatzke diff --git a/docs/_data/meetups/can-ottawa.yaml b/docs/_data/meetups/can-ottawa.yaml index 7ee268f352..0bc9b0dd9a 100644 --- a/docs/_data/meetups/can-ottawa.yaml +++ b/docs/_data/meetups/can-ottawa.yaml @@ -3,7 +3,8 @@ country: Canada state: Ontario city: Ottawa website: https://www.meetup.com/write-the-docs-yow-ottawa/events/ -meetup: Write-The-Docs-YOW-Ottawa +source: + meetup: Write-The-Docs-YOW-Ottawa organizers: - name: Andrew Johnston link: https://www.meetup.com/Write-The-Docs-YOW-Ottawa/members/186359361/ diff --git a/docs/_data/meetups/can-toronto.yaml b/docs/_data/meetups/can-toronto.yaml index 73a197d2c7..59fa811cdf 100644 --- a/docs/_data/meetups/can-toronto.yaml +++ b/docs/_data/meetups/can-toronto.yaml @@ -3,7 +3,8 @@ country: Canada state: Ontario city: Toronto website: https://www.meetup.com/write-the-docs-toronto/events/ -meetup: Write-The-Docs-Toronto +source: + meetup: Write-The-Docs-Toronto organizers: - name: Dan Kellett - link: https://www.meetup.com/Write-the-Docs-Toronto/members/258278938/ \ No newline at end of file + link: https://www.meetup.com/Write-the-Docs-Toronto/members/258278938/ diff --git a/docs/_data/meetups/esp-barcelona.yaml b/docs/_data/meetups/esp-barcelona.yaml index ced59cf661..7b240dde90 100644 --- a/docs/_data/meetups/esp-barcelona.yaml +++ b/docs/_data/meetups/esp-barcelona.yaml @@ -2,7 +2,8 @@ region: Europe country: Spain city: Barcelona website: https://www.meetup.com/write-the-docs-barcelona/events/ -meetup: Write-the-Docs-Barcelona +source: + meetup: Write-the-Docs-Barcelona organizers: - name: Fabrizio Ferri-Benedetti link: https://www.meetup.com/Write-the-Docs-Barcelona/members/87132972/profile diff --git a/docs/_data/meetups/fra-paris.yaml b/docs/_data/meetups/fra-paris.yaml index d02fb91452..664cc61acb 100644 --- a/docs/_data/meetups/fra-paris.yaml +++ b/docs/_data/meetups/fra-paris.yaml @@ -2,7 +2,8 @@ region: Europe country: France city: Paris website: https://www.meetup.com/write-the-docs-paris/events/ -meetup: Write-the-Docs-Paris +source: + meetup: Write-the-Docs-Paris organizers: - name: François Violette link: https://www.meetup.com/fr-FR/Write-the-Docs-Paris/members/239691808/profile diff --git a/docs/_data/meetups/gbr-london.yaml b/docs/_data/meetups/gbr-london.yaml index d3e0cd8361..a4bd2e05c6 100644 --- a/docs/_data/meetups/gbr-london.yaml +++ b/docs/_data/meetups/gbr-london.yaml @@ -2,7 +2,8 @@ region: Europe country: United Kingdom city: London website: https://www.meetup.com/write-the-docs-london/events/ -meetup: Write-The-Docs-London +source: + meetup: Write-The-Docs-London organizers: - name: Kristof Van Tomme link: http://twitter.com/kvantomme/ diff --git a/docs/_data/meetups/ger-berlin.yaml b/docs/_data/meetups/ger-berlin.yaml index 29ee371a43..91db962271 100644 --- a/docs/_data/meetups/ger-berlin.yaml +++ b/docs/_data/meetups/ger-berlin.yaml @@ -2,7 +2,8 @@ region: Europe country: Germany city: Berlin website: https://www.meetup.com/write-the-docs-berlin/events/ -meetup: Write-The-Docs-Berlin +source: + meetup: Write-The-Docs-Berlin organizers: - name: Sam Wright link: https://twitter.com/plaindocs diff --git a/docs/_data/meetups/ger-hamburg.yaml b/docs/_data/meetups/ger-hamburg.yaml index 3dfe4d9b1e..7c9c554c37 100644 --- a/docs/_data/meetups/ger-hamburg.yaml +++ b/docs/_data/meetups/ger-hamburg.yaml @@ -2,6 +2,7 @@ region: Europe country: Germany city: Hamburg website: https://www.meetup.com/write-the-docs-hamburg/events/ -meetup: Write-the-Docs-Hamburg +source: + meetup: Write-the-Docs-Hamburg organizers: - name: Frank Ralf diff --git a/docs/_data/meetups/ind-bangalore.yaml b/docs/_data/meetups/ind-bangalore.yaml index f0164ca22d..f656464296 100644 --- a/docs/_data/meetups/ind-bangalore.yaml +++ b/docs/_data/meetups/ind-bangalore.yaml @@ -2,7 +2,8 @@ region: Asia country: India city: Bangalore website: https://www.meetup.com/write-the-docs-india/events/ -meetup: Write-the-Docs-India +source: + meetup: Write-the-Docs-India organizers: - name: Rajakavitha Kodhandapani link: https://www.meetup.com/Write-the-Docs-India/members/11352773/ diff --git a/docs/_data/meetups/irl-dublin.yaml b/docs/_data/meetups/irl-dublin.yaml index b6668f7756..f07759e0cf 100644 --- a/docs/_data/meetups/irl-dublin.yaml +++ b/docs/_data/meetups/irl-dublin.yaml @@ -2,7 +2,8 @@ region: Europe country: Ireland city: Dublin website: https://www.meetup.com/write-the-docs-ireland/events/ -meetup: Write-The-Docs-Ireland +source: + meetup: Write-The-Docs-Ireland organizers: - name: Artem Konev link: https://www.linkedin.com/in/artemkonev diff --git a/docs/_data/meetups/isr-herzliya.yaml b/docs/_data/meetups/isr-herzliya.yaml index 6c31f117d7..cdd28bfabb 100644 --- a/docs/_data/meetups/isr-herzliya.yaml +++ b/docs/_data/meetups/isr-herzliya.yaml @@ -2,7 +2,8 @@ region: Asia country: Israel city: Tel Aviv+ website: https://www.meetup.com/write-the-docs-taplus/events/ -meetup: Write-The-Docs-TAplus +source: + meetup: Write-The-Docs-TAplus organizers: - name: Laura Novich link: https://www.linkedin.com/in/lauranovich/ diff --git a/docs/_data/meetups/kenya-nairobi.yaml b/docs/_data/meetups/kenya-nairobi.yaml index cc53dcb7b1..b3fed1a150 100644 --- a/docs/_data/meetups/kenya-nairobi.yaml +++ b/docs/_data/meetups/kenya-nairobi.yaml @@ -2,7 +2,8 @@ region: Africa country: Kenya city: Nairobi website: https://www.meetup.com/wtd-kenya/events/ -meetup: Write-the-Docs-Kenya +source: + meetup: Write-the-Docs-Kenya organizers: - name: Hillary Nyakundi - link: https://www.linkedin.com/in/hillary-nyakundi/ \ No newline at end of file + link: https://www.linkedin.com/in/hillary-nyakundi/ diff --git a/docs/_data/meetups/ned-amsterdam.yaml b/docs/_data/meetups/ned-amsterdam.yaml index 36fa98d1e1..b19770f856 100644 --- a/docs/_data/meetups/ned-amsterdam.yaml +++ b/docs/_data/meetups/ned-amsterdam.yaml @@ -2,7 +2,8 @@ region: Europe country: Netherlands city: Amsterdam website: https://www.meetup.com/write-the-docs-amsterdam/events/ -meetup: Write-The-Docs-Amsterdam +source: + meetup: Write-The-Docs-Amsterdam organizers: - name: Laura Vass link: https://www.meetup.com/Write-The-Docs-Amsterdam/members/183302865/ diff --git a/docs/_data/meetups/ng-portharcourt.yaml b/docs/_data/meetups/ng-portharcourt.yaml index 7db9c64e39..63e8ac80ed 100644 --- a/docs/_data/meetups/ng-portharcourt.yaml +++ b/docs/_data/meetups/ng-portharcourt.yaml @@ -2,7 +2,8 @@ region: Africa country: Nigeria city: Port Harcourt & Lagos website: https://www.meetup.com/write-the-docs-nigeria/events/ -meetup: Write-the-Docs-Nigeria +source: + meetup: Write-the-Docs-Nigeria organizers: - name: Tabah Baridule Martins link: https://www.linkedin.com/in/tabah-baridule/ diff --git a/docs/_data/meetups/qrm-usEast.yaml b/docs/_data/meetups/qrm-usEast.yaml index d8a0f7fcf5..2835c9dacf 100644 --- a/docs/_data/meetups/qrm-usEast.yaml +++ b/docs/_data/meetups/qrm-usEast.yaml @@ -3,7 +3,8 @@ country: USA state: East Coast city: website: https://www.meetup.com/virtual-write-the-docs-east-coast-quorum/events/ -meetup: Virtual-Write-The-Docs-East-Coast-Quorum +source: + meetup: Virtual-Write-The-Docs-East-Coast-Quorum organizers: - name: Rose Williams link: https://twitter.com/ZelWms diff --git a/docs/_data/meetups/swe-stockholm.yaml b/docs/_data/meetups/swe-stockholm.yaml index 482915f809..d8d637a6e9 100644 --- a/docs/_data/meetups/swe-stockholm.yaml +++ b/docs/_data/meetups/swe-stockholm.yaml @@ -2,7 +2,8 @@ region: Europe country: Sweden city: Stockholm website: https://www.meetup.com/write-the-docs-stockholm/events/ -meetup: write-the-docs-stockholm +source: + meetup: write-the-docs-stockholm organizers: - name: Gunilla Svanfeldt link: https://www.linkedin.com/in/gunillasvanfeldt/ diff --git a/docs/_data/meetups/tn-tunis.yaml b/docs/_data/meetups/tn-tunis.yaml index 248c355053..350671c6d4 100644 --- a/docs/_data/meetups/tn-tunis.yaml +++ b/docs/_data/meetups/tn-tunis.yaml @@ -2,7 +2,8 @@ region: Africa country: Tunisia city: Tunis website: https://www.meetup.com/tunis-write-the-docs/ -meetup: tunis-write-the-docs +source: + meetup: tunis-write-the-docs organizers: - name: AbdelKarim BenAbdallah - link: https://www.linkedin.com/in/karim2k/ \ No newline at end of file + link: https://www.linkedin.com/in/karim2k/ diff --git a/docs/_data/meetups/usa-austin.yaml b/docs/_data/meetups/usa-austin.yaml index 14b3b46dd6..8315439301 100644 --- a/docs/_data/meetups/usa-austin.yaml +++ b/docs/_data/meetups/usa-austin.yaml @@ -3,7 +3,8 @@ country: USA state: Texas city: Austin website: https://www.meetup.com/writethedocs-atx-meetup/events/ -meetup: WriteTheDocs-ATX-Meetup +source: + meetup: WriteTheDocs-ATX-Meetup organizers: - name: Caley Burton link: https://www.linkedin.com/in/caley-burton/ diff --git a/docs/_data/meetups/usa-boise.yaml b/docs/_data/meetups/usa-boise.yaml index 9a2f0930e8..9084e165a7 100644 --- a/docs/_data/meetups/usa-boise.yaml +++ b/docs/_data/meetups/usa-boise.yaml @@ -3,7 +3,8 @@ country: USA state: Idaho city: Boise website: https://www.meetup.com/write-the-docs-boise/events/ -meetup: Write-the-Docs-Boise +source: + meetup: Write-the-Docs-Boise organizers: - name: Mike Taylor link: https://www.linkedin.com/in/miketaylor86/ diff --git a/docs/_data/meetups/usa-boulder.yaml b/docs/_data/meetups/usa-boulder.yaml index 7ff2e7df1f..77c8b0d744 100644 --- a/docs/_data/meetups/usa-boulder.yaml +++ b/docs/_data/meetups/usa-boulder.yaml @@ -3,7 +3,8 @@ country: USA state: Colorado city: Boulder/Denver website: https://www.meetup.com/write-the-docs-boulder-denver/events/ -meetup: Write-the-Docs-Boulder-Denver +source: + meetup: Write-the-Docs-Boulder-Denver organizers: - name: Kaylyn Sigler link: https://www.linkedin.com/in/kaylyn-cheatham-sigler/ diff --git a/docs/_data/meetups/usa-florida.yaml b/docs/_data/meetups/usa-florida.yaml index 12de6132f3..e7b4cdf2d1 100644 --- a/docs/_data/meetups/usa-florida.yaml +++ b/docs/_data/meetups/usa-florida.yaml @@ -2,7 +2,8 @@ region: North America country: USA state: Florida website: https://www.meetup.com/write-the-docs-florida/events/ -meetup: Write-the-Docs-Florida +source: + meetup: Write-the-Docs-Florida organizers: - name: Barrie Byron link: https://www.linkedin.com/in/barriebyron/ @@ -10,4 +11,4 @@ organizers: link: https://twitter.com/MrContentDesign - name: Rose Williams (founder, former organizer) link: https://www.linkedin.com/in/williamsrose/ - + diff --git a/docs/_data/meetups/usa-losAngeles.yaml b/docs/_data/meetups/usa-losAngeles.yaml index 99ccb70304..30456f4149 100644 --- a/docs/_data/meetups/usa-losAngeles.yaml +++ b/docs/_data/meetups/usa-losAngeles.yaml @@ -3,7 +3,8 @@ country: USA state: California city: Los Angeles website: https://www.meetup.com/write-the-docs-la/events/ -meetup: Write-the-Docs-Los-Angeles +source: + meetup: Write-the-Docs-Los-Angeles organizers: - name: Andrea Kao link: https://www.meetup.com/Write-the-Docs-LA/members/59612492/ diff --git a/docs/_data/meetups/usa-michigan.yaml b/docs/_data/meetups/usa-michigan.yaml index ef9d91ce8a..6575f87682 100644 --- a/docs/_data/meetups/usa-michigan.yaml +++ b/docs/_data/meetups/usa-michigan.yaml @@ -3,8 +3,9 @@ country: USA state: Michigan city: Detroit-Windsor website: https://www.meetup.com/write-the-docs-detroit-windsor/events/ -meetup: write-the-docs-detroit-windsor +source: + meetup: write-the-docs-detroit-windsor organizers: - name: Ryan Macklin - name: Glendon Hodges - - name: Cory Williamson-Cardneau \ No newline at end of file + - name: Cory Williamson-Cardneau diff --git a/docs/_data/meetups/usa-nashville.yaml b/docs/_data/meetups/usa-nashville.yaml index 954c4d9d77..67bab87153 100644 --- a/docs/_data/meetups/usa-nashville.yaml +++ b/docs/_data/meetups/usa-nashville.yaml @@ -3,7 +3,8 @@ country: USA state: Tennessee city: Nashville website: https://www.meetup.com/write-the-docs-nashville/events/ -meetup: Write-the-Docs-Nashville +source: + meetup: Write-the-Docs-Nashville organizers: - name: Pratishtha Singh - link: https://www.meetup.com/Write-the-Docs-Nashville/members/257049966/ \ No newline at end of file + link: https://www.meetup.com/Write-the-Docs-Nashville/members/257049966/ diff --git a/docs/_data/meetups/usa-new-england.yaml b/docs/_data/meetups/usa-new-england.yaml index 330b7afc66..40beffef97 100644 --- a/docs/_data/meetups/usa-new-england.yaml +++ b/docs/_data/meetups/usa-new-england.yaml @@ -3,7 +3,8 @@ country: USA state: New England (formerly Boston) city: Boston, MA website: https://www.meetup.com/ne-write-the-docs/events/ -meetup: Boston-Write-the-Docs +source: + meetup: Boston-Write-the-Docs organizers: - name: Lisa Gay link: https://www.linkedin.com/in/lisa-gay/ diff --git a/docs/_data/meetups/usa-nyc.yaml b/docs/_data/meetups/usa-nyc.yaml index 109212fbbe..55083e3282 100644 --- a/docs/_data/meetups/usa-nyc.yaml +++ b/docs/_data/meetups/usa-nyc.yaml @@ -3,7 +3,8 @@ country: USA state: New York city: New York City website: https://www.meetup.com/writethedocsnyc/events/ -meetup: WriteTheDocsNYC +source: + meetup: WriteTheDocsNYC twitter: WriteTheDocsNYC organizers: - name: Ricardo Feliciano diff --git a/docs/_data/meetups/usa-pittsburgh.yaml b/docs/_data/meetups/usa-pittsburgh.yaml index c62e9eb2f1..025bfa5dec 100644 --- a/docs/_data/meetups/usa-pittsburgh.yaml +++ b/docs/_data/meetups/usa-pittsburgh.yaml @@ -3,7 +3,8 @@ country: USA state: Pennsylvania city: Pittsburgh website: https://www.meetup.com/write-the-docs-pittsburgh/events/ -meetup: write-the-docs-pittsburgh +source: + meetup: write-the-docs-pittsburgh organizers: - name: Rachael Stavchansky link: https://twitter.com/RMStav diff --git a/docs/_data/meetups/usa-portland.yaml b/docs/_data/meetups/usa-portland.yaml index 487392e9e1..1bf510d02f 100644 --- a/docs/_data/meetups/usa-portland.yaml +++ b/docs/_data/meetups/usa-portland.yaml @@ -3,7 +3,8 @@ country: USA state: Oregon city: Portland website: https://www.meetup.com/write-the-docs-pdx/events/ -meetup: Write-The-Docs-PDX +source: + meetup: Write-The-Docs-PDX twitter: WriteTheDocsPDX organizers: - name: Rose Williams diff --git a/docs/_data/meetups/usa-sanfrancisco.yaml b/docs/_data/meetups/usa-sanfrancisco.yaml index 8256d2677d..eecaf1508f 100644 --- a/docs/_data/meetups/usa-sanfrancisco.yaml +++ b/docs/_data/meetups/usa-sanfrancisco.yaml @@ -3,7 +3,8 @@ country: USA state: California city: San Francisco website: https://www.meetup.com/write-the-docs-bay-area/events/ -meetup: Write-the-Docs +source: + meetup: Write-the-Docs organizers: - name: Ilona Koren-Deutsch link: https://twitter.com/nitsekees diff --git a/docs/_data/meetups/usa-seattle.yaml b/docs/_data/meetups/usa-seattle.yaml index 832070d700..62d2c74009 100644 --- a/docs/_data/meetups/usa-seattle.yaml +++ b/docs/_data/meetups/usa-seattle.yaml @@ -3,7 +3,8 @@ country: USA state: Washington city: Seattle website: https://www.meetup.com/write-the-docs-seattle/events/ -meetup: Write-The-Docs-Seattle +source: + meetup: Write-The-Docs-Seattle organizers: - name: Jerome Villegas link: http://twitter.com/__jfv__/ diff --git a/docs/_data/meetups/usa-washingtondc.yaml b/docs/_data/meetups/usa-washingtondc.yaml index a3140d86bc..d4ad204ed1 100644 --- a/docs/_data/meetups/usa-washingtondc.yaml +++ b/docs/_data/meetups/usa-washingtondc.yaml @@ -3,7 +3,8 @@ country: USA state: DC city: Washington website: https://www.meetup.com/write-the-docs-dc/events/ -meetup: Write-the-Docs-DC +source: + meetup: Write-the-Docs-DC organizers: - name: Allison Gisinger link: https://www.linkedin.com/in/allisongisinger diff --git a/docs/_data/schema-meetups.yaml b/docs/_data/schema-meetups.yaml index 4fe7696def..86c2d77bca 100644 --- a/docs/_data/schema-meetups.yaml +++ b/docs/_data/schema-meetups.yaml @@ -4,12 +4,18 @@ state: str(required=False) city: str(required=False) website: str(required=False) twitter: str(required=False) -meetup: str(required=False) # I can't figure out how to validate must contain either meetup or meetup_alt -meetup_alt: str(required=False) organizers: list(include('organizer-detail'), min=1, max=9) +source: any(include('source_meetup'), include('source_other'), required=True) + --- organizer-detail: name: str(required=True) link: str(required=False, none=False) + +source_meetup: + meetup: str(required=True, none=False) + +source_other: + other: str(required=True, none=False) From 1b84bee5abfe06d7d19009548c5f78e346f53aba Mon Sep 17 00:00:00 2001 From: Sam Wright Date: Wed, 16 Oct 2024 16:47:54 +0200 Subject: [PATCH 10/10] This is covered in the YAMl validation now --- docs/_ext/meetups.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docs/_ext/meetups.py b/docs/_ext/meetups.py index 7290305171..5992a7497e 100644 --- a/docs/_ext/meetups.py +++ b/docs/_ext/meetups.py @@ -45,10 +45,6 @@ def load_meetups_by_region(): 'twitter', 'meetup_alt', ]]) - if 'meetup' not in meetup and 'meetup_alt' not in meetup: - raise ExtensionError('Meetup missing `meetup`/`meetup_alt` key: file={0}'.format( - yaml_file - )) result[meetup['region']].append(meetup) for _, meetups in list(result.items()): meetups.sort(key=lambda m: m.get('city', m['country']))