Skip to content

fixed flake8 errors for desktop-mobile-mau-2020 #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kik-kik merged 2 commits into from
Aug 8, 2022
Merged

fixed flake8 errors for desktop-mobile-mau-2020 #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62e2592
fixed flake8 errors for desktop-mobile-mau-2020
kik-kik Aug 8, 2022
59b7086
updated requirements to get flake8 pytest plugin working
kik-kik Aug 8, 2022
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
9 changes: 5 additions & 4 deletions jobs/desktop-mobile-mau-2020/desktop_mau/desktop_mau_dau.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
DESKTOP_QUERY = (ROOT_DIR / "mau_dau.sql").read_text()

DESKTOP_USER_STATE_QUERY = """
SELECT
SELECT
*
FROM
`moz-fx-data-derived-datasets.analysis.xluo_kpi_plot_country_new_or_rescurrected_dau`
FROM
`moz-fx-data-derived-datasets.analysis.xluo_kpi_plot_country_new_or_rescurrected_dau`
"""


Expand Down Expand Up @@ -454,7 +454,8 @@ def plot_dau_mau_ratio(desktop_data):
fontdict={"fontsize": 18, "color": "black"},
)

# axs[1].plot.area([ind_dat["country_x"].isin(country_list)]["date", "country_x", "pcnt"], subplots=True)
# axs[1].plot.area([ind_dat["country_x"]\
# .isin(country_list)]["date", "country_x", "pcnt"], subplots=True)
dat2 = ind_dat[ind_dat["country_x"].isin(country_list)][
["date", "country_x", "pcnt_MAU"]
].pivot(index="date", columns="country_x", values="pcnt_MAU")
Expand Down
11 changes: 7 additions & 4 deletions jobs/desktop-mobile-mau-2020/mobile_mau/mobile_mau.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def create_table(template, platform, actual, forecast):
- 1
)

data_end_date = actual["date"].max().date()
# data_end_date = actual["date"].max().date()

return template.render(
platform=platform,
Expand All @@ -84,7 +84,8 @@ def create_table(template, platform, actual, forecast):

def create_plot(platform, y_min, y_max, actuals, forecast, plot_start_date, slice_name):
"""
Display a plot given a platform (each mobile product), data for actuals and forecast, and slice (Global or Tier 1).
Display a plot given a platform (each mobile product),
data for actuals and forecast, and slice (Global or Tier 1).
"""
main_metric_color = "#CA3524"
main_metric_color_ci = "#DDDDDD"
Expand Down Expand Up @@ -185,11 +186,13 @@ def create_plot(platform, y_min, y_max, actuals, forecast, plot_start_date, slic
# autosize=force_width is None,
# width=force_width,
# height=force_height,
title='<b>{} {} MAU</b> <span style="font-size: medium;">at end of day {}</span>'.format(
title="""\
<b>{} {} MAU</b> <span style="font-size: medium;">at end of day {}</span>\
""".format(
slice_name,
platform,
data_end_date,
),
).strip(),
titlefont={
"size": 24,
},
Expand Down
1 change: 1 addition & 0 deletions jobs/desktop-mobile-mau-2020/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ google-cloud-bigquery==1.27.2
google-cloud-bigquery-storage==1.0.0
google-cloud-storage==1.31.0
Jinja2==2.11.3
flake8==3.8.4
matplotlib==3.3.2
numpy==1.19.2
pandas==1.1.2
Expand Down