This is an automated email from the git hooks/post-receive script.
bex pushed a commit to branch master
in repository fedora-budget.
commit 28492582e14f6a1114c83a15b7492bdfc9a2a96f
Author: Brian (bex) Exelbierd <bex(a)pobox.com>
AuthorDate: Thu Mar 14 13:55:52 2019 +0100
adding FY20 base files
---
FY20/README.adoc | 31 +++++++++++++++++++++++++++++++
FY20/council.adoc | 15 +++++++++++++++
FY20/d-i.adoc | 16 ++++++++++++++++
FY20/events.adoc | 15 +++++++++++++++
FY20/fads.adoc | 15 +++++++++++++++
FY20/gen_reports | 37 +++++++++++++++++++++++++++++++++++++
FY20/ledger/council.ldg | 29 +++++++++++++++++++++++++++++
FY20/ledger/diversity.ldg | 4 ++++
FY20/ledger/fad.ldg | 4 ++++
FY20/ledger/fedora.ledger | 1 +
FY20/ledger/flock.ldg | 27 +++++++++++++++++++++++++++
FY20/ledger/mentored-projects.ldg | 5 +++++
FY20/ledger/mindshare.ldg | 5 +++++
FY20/mentored-projects.adoc | 15 +++++++++++++++
FY20/mindshare.adoc | 14 ++++++++++++++
FY20/overall.adoc | 26 ++++++++++++++++++++++++++
FY20/people.adoc | 32 ++++++++++++++++++++++++++++++++
README.md | 2 +-
_builder/jenkins_builder | 9 ++++++---
_topic_map.yml | 30 +++++++++++++++++++++++++-----
20 files changed, 323 insertions(+), 9 deletions(-)
diff --git a/FY20/README.adoc b/FY20/README.adoc
new file mode 100644
index 0000000..9606977
--- /dev/null
+++ b/FY20/README.adoc
@@ -0,0 +1,31 @@
+= FY20 Budget Data
+
+The 2018/2019 Fiscal Year runs from 1 March 2018 to 28 February 2018.
+
+== Personnel
+
+include::FY20/people.adoc[]
+
+During FY20, the following people are working on the budget team.
+
+=== APAC Region
+
+- Treasurer: mailto:{apac_treasurer_email}[{apac_treasurer_name}]
+- Card Holder: mailto:{apac_cc_email}[{apac_cc_name}]
+
+=== EMEA Region
+
+- Treasurer: mailto:{emea_treasurer_email}[{emea_treasurer_name}]
+- Card Holder: mailto:{emea_cc_email}[{emea_cc_name}]
+
+=== LATAM Region
+
+- Treasurer: mailto:{latam_treasurer_email}[{latam_treasurer_name}]
+- Card Holder: mailto:{latam_cc_email}[{latam_cc_name}]
+
+=== NA Region
+
+- Treasurer: mailto:{na_treasurer_email}[{na_treasurer_name}]
+- Card Holder: mailto:{na_cc_email}[{na_cc_name}]
+
+Built on: {localdatetime}
diff --git a/FY20/council.adoc b/FY20/council.adoc
new file mode 100644
index 0000000..ae0c906
--- /dev/null
+++ b/FY20/council.adoc
@@ -0,0 +1,15 @@
+Fedora Council and Other Expenses
+=================================
+
+Budget Report
+-------------
+
+[caption="", format="csv", separator=" ",
cols="4*>,1", options="header, footer"]
+.All amounts are in US Dollars
+|===
+Budget Category Budget Spent So Far Remaining Budget Percent Spent
+include::FY20/council.csv[]
+|===
+
+
+Built on: {localdatetime}
diff --git a/FY20/d-i.adoc b/FY20/d-i.adoc
new file mode 100644
index 0000000..4fc9c62
--- /dev/null
+++ b/FY20/d-i.adoc
@@ -0,0 +1,16 @@
+Fedora Diversity & Inclusion Budget Report
+==========================================
+
+Budget Report
+-------------
+
+[caption="", format="csv", separator=" ",
cols="4*>,1", options="header, footer"]
+.All amounts are in US Dollars
+|===
+Budget Category Budget Spent So Far Remaining Budget Percent Spent
+include::FY20/d-i.csv[]
+|===
+
+
+
+Built on: {localdatetime}
diff --git a/FY20/events.adoc b/FY20/events.adoc
new file mode 100644
index 0000000..4f9cb10
--- /dev/null
+++ b/FY20/events.adoc
@@ -0,0 +1,15 @@
+Fedora Events Budget Report
+===========================
+
+Flock Budget Report
+-------------------
+
+[caption="", format="csv", separator=" ",
cols="4*>,1", options="header, footer"]
+.All amounts are in US Dollars
+|===
+Budget Category Budget Spent So Far Remaining Budget Percent Spent
+include::FY20/flock.csv[]
+|===
+
+
+Built on: {localdatetime}
diff --git a/FY20/fads.adoc b/FY20/fads.adoc
new file mode 100644
index 0000000..5b210ce
--- /dev/null
+++ b/FY20/fads.adoc
@@ -0,0 +1,15 @@
+Fedora FADs Budget Report
+=========================
+
+FADs Budget Report
+------------------
+
+[caption="", format="csv", separator=" ",
cols="4*>,1", options="header, footer"]
+.All amounts are in US Dollars
+|===
+Budget Category Budget Spent So Far Remaining Budget Percent Spent
+include::FY20/fads.csv[]
+|===
+
+
+Built on: {localdatetime}
diff --git a/FY20/gen_reports b/FY20/gen_reports
new file mode 100755
index 0000000..2cb54d5
--- /dev/null
+++ b/FY20/gen_reports
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+# Clean up reports
+rm *.csv
+
+# Overall Report for Fedora
+ledger -f ledger/fedora.ledger budget --depth 1 not '^Budget'|
../_builder/budget2tsv > overall.csv
+if [ ! -s overall.csv ]; then
+ ledger -f ledger/fedora.ledger budget --depth 1 | ../_builder/budget2tsv >
overall.csv
+fi
+
+# Source of funds
+ledger -f ledger/fedora.ledger budget '^Budget' --flat | ../_builder/budget2tsv |
cut -f1-2 > source.csv
+
+# Flock - doesn't do second levels so we need to just do the first level list and cut
the first line
+ledger -f ledger/fedora.ledger budget '^Flock' --flat | tail -n +2 |
../_builder/budget2tsv > flock.csv
+
+# Mentored Projects
+ledger -f ledger/fedora.ledger budget '^Mentored Projects' --flat | tail -n +1 |
../_builder/budget2tsv > mentored-projects.csv
+
+# FADs
+ledger -f ledger/fedora.ledger budget '^FADs' and not '^FADs$' --depth 2
--flat | ../_builder/budget2tsv > fads.csv
+if [ ! -s fads.csv ]; then
+ ledger -f ledger/fedora.ledger budget '^FADs' --flat | ../_builder/budget2tsv
> fads.csv
+fi
+
+# Diversity & Inclusion - doesn't do second levels so we need to just do the
first level list and cut the first line
+ledger -f ledger/fedora.ledger budget '^Diversity-Inclusion' --flat | tail -n +1
| ../_builder/budget2tsv > d-i.csv
+
+# Mindshare - doesn't do second levels so we need to just do the first level list and
cut the first line
+ledger -f ledger/fedora.ledger budget '^Mindshare' --flat | tail -n +1 |
../_builder/budget2tsv > mindshare.csv
+
+# Council and Other Expenses
+ledger -f ledger/fedora.ledger budget '^Council' and not '^Council$'
--flat | ../_builder/budget2tsv > council.csv
+if [ ! -s council.csv ]; then
+ ledger -f ledger/fedora.ledger budget '^Council' --flat |
../_builder/budget2tsv > council.csv
+fi
diff --git a/FY20/ledger/council.ldg b/FY20/ledger/council.ldg
new file mode 100644
index 0000000..909a79a
--- /dev/null
+++ b/FY20/ledger/council.ldg
@@ -0,0 +1,29 @@
+;----------------------------------------------------------------------------------
+; Budgets and Movements
+;----------------------------------------------------------------------------------
+~ every 2 years
+ Budget:Red Hat:Public $0 ; Budget for FY20 is not yet set
+ Flock -$0 ; 95000
+ Mindshare:Unallocated -$0 ; 27637 ; Q2-4 + RP from Ambassadors
+ Diversity-Inclusion:Unallocated -$0 ; 15500
+ FADs:Unallocated -$0 ;
+ Council:Unallocated
+; ; Flock External Funds
+; Budget:Flock Registration and Travel $2874.25
+; Flock -$2874.25
+; Budget:ARM Sponsorship $5000 ; Billed on 10 Jan 2019
+; Flock -$5000
+; ; GSoC External Funds
+; ;Travel Stipend $500
+; ;Mentor Summit $2200 ; 2 * $1100
+; ;Other Funding $2500 ; 5 * $500
+; Budget:GSoC $5700
+; Mentored Projects:Unallocated -$5700 ; received on 11 Sept 2018
+
+;~ every 2 years
+; Council:Other:Podcast -$1400 ;
https://pagure.io/Fedora-Council/tickets/issue/195
+; Council:Other:Podcast -$183 ;
https://pagure.io/Fedora-Council/tickets/issue/192
+; Council:Discourse -$3600 ; discussions instance
+; Council:Discourse -$3600 ; ask instance
+; Council:Unallocated
+
diff --git a/FY20/ledger/diversity.ldg b/FY20/ledger/diversity.ldg
new file mode 100644
index 0000000..d101003
--- /dev/null
+++ b/FY20/ledger/diversity.ldg
@@ -0,0 +1,4 @@
+~ every 2 years
+ ; Budget
+ Diversity-Inclusion:Unallocated $0; 15500
+ Diversity-Inclusion:Unallocated
diff --git a/FY20/ledger/fad.ldg b/FY20/ledger/fad.ldg
new file mode 100644
index 0000000..eccf588
--- /dev/null
+++ b/FY20/ledger/fad.ldg
@@ -0,0 +1,4 @@
+~ every 2 years
+ ; FAD Budgets
+ FADs:Unallocated $0 ;
+ FADs:Unallocated
diff --git a/FY20/ledger/fedora.ledger b/FY20/ledger/fedora.ledger
new file mode 100644
index 0000000..edfe786
--- /dev/null
+++ b/FY20/ledger/fedora.ledger
@@ -0,0 +1 @@
+include *.ldg
diff --git a/FY20/ledger/flock.ldg b/FY20/ledger/flock.ldg
new file mode 100644
index 0000000..5f32b9c
--- /dev/null
+++ b/FY20/ledger/flock.ldg
@@ -0,0 +1,27 @@
+~ every 2 years
+ ; Budget
+ Flock $0 ; 95000 ; allocated by council
+ Flock:Unallocated
+; Flock $2874.25 ; EventBrite Funds ; received on 17 Aug 2018
+; Flock $5000
+; ; Expenses
+; Flock:AV -$16250 ; split from coffee breaks
+; Flock:AV -$3500 ; sound equipment - assumes no VAT
+; Flock:Activities:Activity -$2100 ; scavenger hunt
+; Flock:Activities:Transportion -$2875 ; bus transport
+; Flock:Activities:Food -$4750 ; Evening meal food 150 @ 27 EUR
+; Flock:Activities:Food -$4220 ; Evening meal beverages and VIP package 150 @
24 EUR
+; Flock:Badges -$500
+; Flock:Food -$16250 ; Lunch and coffee breaks with some AV - 140 @
59 EUR/day * 4 days ; split with - without VAT
+; Flock:Food -$2500 ; Extended coffee service - 140 @ 4 EUR/day * 4
days ; with VAT
+; Flock:Meeting Room -$4000 ; 4 rooms @ 250 EUR/day * 4 days - without VAT
+; Flock:Meeting Room -$350 ; round tables for round-tables
+; Flock:Schedule -$500 ;
sched.org - big price increase since last year
+; Flock:Supplies -$500
+; Flock:Supplies -$100 ; drink tickets
+; Flock:T-shirt -$2000
+; ; Copays
+; Flock:Funding:Lodging -$10375 ; initial commit of 22 rooms (22 * 100 EUR * 4
Night- includes VAT
+; Flock:Funding:Transportation -$39200 ; equal to last year with room block
+; Flock:Copaid Travel -$0
+; ; Balance
diff --git a/FY20/ledger/mentored-projects.ldg b/FY20/ledger/mentored-projects.ldg
new file mode 100644
index 0000000..cd135e6
--- /dev/null
+++ b/FY20/ledger/mentored-projects.ldg
@@ -0,0 +1,5 @@
+~ every 2 years
+ Mentored Projects:Unallocated $0 ; 5700 ; GSoC
+ Mentored Projects:Unallocated
+; Mentored Projects:Unallocated $0 ; 4700 ; GCI
+; Mentored Projects:Mentor Summit $0 ; 2200 ; GSoC
diff --git a/FY20/ledger/mindshare.ldg b/FY20/ledger/mindshare.ldg
new file mode 100644
index 0000000..06ea888
--- /dev/null
+++ b/FY20/ledger/mindshare.ldg
@@ -0,0 +1,5 @@
+~ every 2 years
+ ; Budget
+ Mindshare:Unallocated -$0 ; 27637 ; Q2-4 + RP from Ambassadors
+ Mindshare:Release Parties $0 ; 3500
+ Mindshare:Unallocated
diff --git a/FY20/mentored-projects.adoc b/FY20/mentored-projects.adoc
new file mode 100644
index 0000000..30f28be
--- /dev/null
+++ b/FY20/mentored-projects.adoc
@@ -0,0 +1,15 @@
+Mentored Projects
+=============
+
+Mentored Projects Budget Report
+---------------------------
+
+[caption="", format="csv", separator=" ",
cols="4*>,1", options="header, footer"]
+.All amounts are in US Dollars
+|===
+Budget Category Budget Spent So Far Remaining Budget Percent Spent
+include::FY20/mentored-projects.csv[]
+|===
+
+
+Built on: {localdatetime}
diff --git a/FY20/mindshare.adoc b/FY20/mindshare.adoc
new file mode 100644
index 0000000..177951f
--- /dev/null
+++ b/FY20/mindshare.adoc
@@ -0,0 +1,14 @@
+= Fedora Mindshare Budget Report
+
+== Budget Report
+
+[caption="", format="csv", separator=" ",
cols="4*>,1", options="header, footer"]
+.All amounts are in US Dollars
+|===
+Budget Category Budget Spent So Far Remaining Budget Percent Spent
+include::FY20/mindshare.csv[]
+|===
+
+
+
+Built on: {localdatetime}
diff --git a/FY20/overall.adoc b/FY20/overall.adoc
new file mode 100644
index 0000000..02fea1e
--- /dev/null
+++ b/FY20/overall.adoc
@@ -0,0 +1,26 @@
+Fedora Overall Budget Report
+============================
+
+Budget Report
+-------------
+
+[caption="", format="csv", separator=" ",
cols="4*>,1", options="header, footer"]
+.All amounts are in US Dollars
+|===
+Budget Category Budget Spent So Far Remaining Budget Percent Spent
+include::FY20/overall.csv[]
+|===
+
+
+Source of Budget Report
+-----------------------
+
+[caption="", format="csv", separator=" ",
cols="1*>,1", options="header, footer"]
+.All amounts are in US Dollars
+|===
+Source Amount
+include::FY20/source.csv[]
+|===
+
+
+Built on: {localdatetime}
diff --git a/FY20/people.adoc b/FY20/people.adoc
new file mode 100644
index 0000000..d03c19a
--- /dev/null
+++ b/FY20/people.adoc
@@ -0,0 +1,32 @@
+// This file defines attributes (entities) for the various people involved in the budget
+
+// APAC
+//:apac_treasurer_name: PJ Pandit (Pjp)
+//:apac_treasurer_email: pj.pandit(a)yahoo.co.in
+//:apac_cc_name: Woo Huiren (woohuiren)
+//:apac_cc_email: woohuiren(a)fedoraproject.org
+
+// EMEA
+:emea_treasurer_name: Zacharias Mitzelos (mitzie)
+:emea_treasurer_email: mitzie(a)mitzelos.com
+:emea_cc_name: Joerg Simon
+:emea_cc_email: jsimon(a)fedoraproject.org
+
+
+// LATAM
+:latam_treasurer_name: Abdel G. Martínez L.
+:latam_treasurer_email: abdel.g.martinez.l(a)gmail.com
+//:latam_cc_name: Neville Cross
+//:latam_cc_email: neville(a)taygon.com
+
+// NA
+:na_treasurer_name: Andrew Ward
+:na_treasurer_email: award3535(a)tds.net
+:na_cc_name: Andrew Ward
+:na_cc_email: award3535(a)tds.net
+
+// Other
+:FCAIC_name: Brian Exelbierd
+:FCAIC_email: bex(a)pobox.com
+
+Built on: {localdatetime}
diff --git a/README.md b/README.md
index 8e2af14..d15213c 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ This repository is where budget data and information is shared publicly
The Fedora Fiscal Year is from March 1 to February 28. Fiscal years are numbered by the
year in which they **end**. For example, the fiscal year from March 1, 2016 to February
28, 2017 is FY17.
-Ledger data files are stored in `FYXX/ledger/`
+Ledger data files are stored in `FYXX/ledger/` for the current year and in `fyXX/ledger`
for previous years.
FY16 and FY15 are historical data from before the adoption of ledger. FY17 contains an
archive file from before the adoption of ledger.
diff --git a/_builder/jenkins_builder b/_builder/jenkins_builder
index c6c879a..b898e16 100755
--- a/_builder/jenkins_builder
+++ b/_builder/jenkins_builder
@@ -8,13 +8,16 @@ git config --global user.email
"budget-devel(a)lists.fedoraproject.org"
git config --global user.name "Budget Builder"
# Generate reports for each FY
-cd FY17
+cd fy17
./gen_reports
cd ..
-cd FY18
+cd fy18
./gen_reports
cd ..
-cd FY19
+cd fy19
+./gen_reports
+cd ..
+cd FY20
./gen_reports
cd ..
diff --git a/_topic_map.yml b/_topic_map.yml
index e548bc8..05163e8 100644
--- a/_topic_map.yml
+++ b/_topic_map.yml
@@ -37,8 +37,28 @@ Topics:
- Name: Understanding Budgets
File: faq_budgeting
---
+Name: FY 20 Budget Reports
+Dir: FY20
+Topics:
+ - Name: Introduction
+ File: README
+ - Name: Overall Budget
+ File: overall
+ - Name: Diversity & Inclusion Budget
+ File: d-i
+ - Name: Mindshare Budget
+ File: mindshare
+ - Name: Events Budget
+ File: events
+ - Name: FADs Budget
+ File: fads
+ - Name: Mentored Projects Budget
+ File: mentored-projects
+ - Name: Council and Other Expenses
+ File: council
+---
Name: FY 19 Budget Reports
-Dir: FY19
+Dir: fy19
Topics:
- Name: Introduction
File: README
@@ -66,7 +86,7 @@ Topics:
File: council
---
Name: FY 18 Budget Reports
-Dir: FY18
+Dir: fy18
Topics:
- Name: Introduction
File: README
@@ -94,7 +114,7 @@ Topics:
File: council
---
Name: FY 17 Budget Reports
-Dir: FY17
+Dir: fy17
Topics:
- Name: Introduction
File: README
@@ -116,13 +136,13 @@ Topics:
File: fads
---
Name: FY 16 Budget Reports
-Dir: FY16
+Dir: fy16
Topics:
- Name: Introduction
File: README
---
Name: FY 15 Budget Reports
-Dir: FY15
+Dir: fy15
Topics:
- Name: Introduction
File: README
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.