Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-analytics-data-api
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-analytics-data-api
Commits
30be9af3
Commit
30be9af3
authored
Feb 19, 2014
by
Brian Wilson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Disable pylint E1103 in configuration.
Change-Id: Id11f469b3fd8372c6b85280e9a8882595e62b76b
parent
68abaf6e
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
17 additions
and
18 deletions
+17
-18
edx/analytics/tasks/reports/enrollments.py
+3
-3
edx/analytics/tasks/reports/incremental_enrollments.py
+1
-1
edx/analytics/tasks/reports/tests/test_incremental_enrollments.py
+0
-1
edx/analytics/tasks/reports/tests/test_total_enrollments.py
+7
-7
edx/analytics/tasks/reports/total_enrollments.py
+5
-5
pylintrc
+1
-1
No files found.
edx/analytics/tasks/reports/enrollments.py
View file @
30be9af3
...
@@ -23,7 +23,7 @@ class CourseEnrollmentCountMixin(object):
...
@@ -23,7 +23,7 @@ class CourseEnrollmentCountMixin(object):
# Not assuming any encoding, course_id will be read as plain string
# Not assuming any encoding, course_id will be read as plain string
data
=
read_tsv
(
input_file
,
names
)
data
=
read_tsv
(
input_file
,
names
)
data
.
date
=
pandas
.
to_datetime
(
data
.
date
)
# pylint: disable=maybe-no-member
data
.
date
=
pandas
.
to_datetime
(
data
.
date
)
return
data
return
data
def
initialize_daily_count
(
self
,
course_date_count_data
):
def
initialize_daily_count
(
self
,
course_date_count_data
):
...
@@ -75,7 +75,7 @@ class CourseEnrollmentCountMixin(object):
...
@@ -75,7 +75,7 @@ class CourseEnrollmentCountMixin(object):
# Flag values before the offset day with NaN,
# Flag values before the offset day with NaN,
# since they are not "available".
# since they are not "available".
not_available
=
count_by_day
.
index
<
date
not_available
=
count_by_day
.
index
<
date
count_by_day
.
loc
[
not_available
,
course_id
]
=
numpy
.
NaN
# pylint: disable=maybe-no-member
count_by_day
.
loc
[
not_available
,
course_id
]
=
numpy
.
NaN
def
calculate_total_enrollment
(
self
,
count_by_day
,
offsets
=
None
):
def
calculate_total_enrollment
(
self
,
count_by_day
,
offsets
=
None
):
"""
"""
...
@@ -174,7 +174,7 @@ class EnrollmentsByWeek(luigi.Task, CourseEnrollmentCountMixin):
...
@@ -174,7 +174,7 @@ class EnrollmentsByWeek(luigi.Task, CourseEnrollmentCountMixin):
statuses
=
self
.
read_statuses
()
statuses
=
self
.
read_statuses
()
with
self
.
output
()
.
open
(
'w'
)
as
output_file
:
# pylint: disable=maybe-no-member
with
self
.
output
()
.
open
(
'w'
)
as
output_file
:
self
.
save_output
(
weekly_enrollment_totals
,
statuses
,
output_file
)
self
.
save_output
(
weekly_enrollment_totals
,
statuses
,
output_file
)
def
read_source
(
self
):
def
read_source
(
self
):
...
...
edx/analytics/tasks/reports/incremental_enrollments.py
View file @
30be9af3
...
@@ -97,7 +97,7 @@ class WeeklyIncrementalUsersAndEnrollments(luigi.Task, AllCourseEnrollmentCountM
...
@@ -97,7 +97,7 @@ class WeeklyIncrementalUsersAndEnrollments(luigi.Task, AllCourseEnrollmentCountM
weekly_registration_changes
,
weekly_overall_enrollment
weekly_registration_changes
,
weekly_overall_enrollment
)
)
with
self
.
output
()
.
open
(
'w'
)
as
output_file
:
# pylint: disable=maybe-no-member
with
self
.
output
()
.
open
(
'w'
)
as
output_file
:
self
.
save_output
(
weekly_report
,
output_file
)
self
.
save_output
(
weekly_report
,
output_file
)
def
read_enrollments
(
self
):
def
read_enrollments
(
self
):
...
...
edx/analytics/tasks/reports/tests/test_incremental_enrollments.py
View file @
30be9af3
...
@@ -14,7 +14,6 @@ from edx.analytics.tasks.reports.incremental_enrollments import WeeklyIncrementa
...
@@ -14,7 +14,6 @@ from edx.analytics.tasks.reports.incremental_enrollments import WeeklyIncrementa
class
TestWeeklyIncrementalUsersAndEnrollments
(
unittest
.
TestCase
):
class
TestWeeklyIncrementalUsersAndEnrollments
(
unittest
.
TestCase
):
"""Tests for WeeklyIncrementalUsersAndEnrollments class."""
"""Tests for WeeklyIncrementalUsersAndEnrollments class."""
# pylint: disable=maybe-no-member
@staticmethod
@staticmethod
def
row_label
(
row_name
):
def
row_label
(
row_name
):
...
...
edx/analytics/tasks/reports/tests/test_total_enrollments.py
View file @
30be9af3
...
@@ -111,8 +111,8 @@ class TestWeeklyAllUsersAndEnrollments(unittest.TestCase):
...
@@ -111,8 +111,8 @@ class TestWeeklyAllUsersAndEnrollments(unittest.TestCase):
"""
"""
res
=
self
.
run_task
(
source
,
'2013-01-21'
,
4
)
res
=
self
.
run_task
(
source
,
'2013-01-21'
,
4
)
weeks
=
set
([
'2012-12-31'
,
'2013-01-07'
,
'2013-01-14'
,
'2013-01-21'
])
weeks
=
set
([
'2012-12-31'
,
'2013-01-07'
,
'2013-01-14'
,
'2013-01-21'
])
self
.
assertEqual
(
weeks
,
set
(
str
(
w
)
for
w
in
res
.
columns
))
# pylint: disable=maybe-no-member
self
.
assertEqual
(
weeks
,
set
(
str
(
w
)
for
w
in
res
.
columns
))
total_enrollment
=
res
.
loc
[
TOTAL_ENROLLMENT_ROWNAME
]
# pylint: disable=maybe-no-member
total_enrollment
=
res
.
loc
[
TOTAL_ENROLLMENT_ROWNAME
]
self
.
assertTrue
(
isnan
(
total_enrollment
[
'2012-12-31'
]))
# no data
self
.
assertTrue
(
isnan
(
total_enrollment
[
'2012-12-31'
]))
# no data
self
.
assertEqual
(
total_enrollment
[
'2013-01-07'
],
10
)
self
.
assertEqual
(
total_enrollment
[
'2013-01-07'
],
10
)
self
.
assertEqual
(
total_enrollment
[
'2013-01-14'
],
20
)
self
.
assertEqual
(
total_enrollment
[
'2013-01-14'
],
20
)
...
@@ -131,7 +131,7 @@ class TestWeeklyAllUsersAndEnrollments(unittest.TestCase):
...
@@ -131,7 +131,7 @@ class TestWeeklyAllUsersAndEnrollments(unittest.TestCase):
course_2 2013-02-15 -2
course_2 2013-02-15 -2
"""
"""
res
=
self
.
run_task
(
source
,
'2013-02-18'
,
2
)
res
=
self
.
run_task
(
source
,
'2013-02-18'
,
2
)
total_enrollment
=
res
.
loc
[
TOTAL_ENROLLMENT_ROWNAME
]
# pylint: disable=maybe-no-member
total_enrollment
=
res
.
loc
[
TOTAL_ENROLLMENT_ROWNAME
]
self
.
assertEqual
(
total_enrollment
[
'2013-02-11'
],
13
)
self
.
assertEqual
(
total_enrollment
[
'2013-02-11'
],
13
)
self
.
assertEqual
(
total_enrollment
[
'2013-02-18'
],
24
)
self
.
assertEqual
(
total_enrollment
[
'2013-02-18'
],
24
)
...
@@ -141,7 +141,7 @@ class TestWeeklyAllUsersAndEnrollments(unittest.TestCase):
...
@@ -141,7 +141,7 @@ class TestWeeklyAllUsersAndEnrollments(unittest.TestCase):
course_3 2013-03-15 6
course_3 2013-03-15 6
"""
"""
res
=
self
.
run_task
(
None
,
'2013-03-28'
,
6
,
offset
=
offset
)
res
=
self
.
run_task
(
None
,
'2013-03-28'
,
6
,
offset
=
offset
)
total_enrollment
=
res
.
loc
[
TOTAL_ENROLLMENT_ROWNAME
]
# pylint: disable=maybe-no-member
total_enrollment
=
res
.
loc
[
TOTAL_ENROLLMENT_ROWNAME
]
self
.
assertTrue
(
isnan
(
total_enrollment
[
'2013-02-21'
]))
# no data
self
.
assertTrue
(
isnan
(
total_enrollment
[
'2013-02-21'
]))
# no data
self
.
assertTrue
(
isnan
(
total_enrollment
[
'2013-02-28'
]))
# no data
self
.
assertTrue
(
isnan
(
total_enrollment
[
'2013-02-28'
]))
# no data
self
.
assertEqual
(
total_enrollment
[
'2013-03-07'
],
10
)
self
.
assertEqual
(
total_enrollment
[
'2013-03-07'
],
10
)
...
@@ -161,7 +161,7 @@ class TestWeeklyAllUsersAndEnrollments(unittest.TestCase):
...
@@ -161,7 +161,7 @@ class TestWeeklyAllUsersAndEnrollments(unittest.TestCase):
2013-02-28 10
2013-02-28 10
"""
"""
res
=
self
.
run_task
(
None
,
'2013-03-28'
,
6
,
offset
=
offset
,
history
=
history
)
res
=
self
.
run_task
(
None
,
'2013-03-28'
,
6
,
offset
=
offset
,
history
=
history
)
total_enrollment
=
res
.
loc
[
TOTAL_ENROLLMENT_ROWNAME
]
# pylint: disable=maybe-no-member
total_enrollment
=
res
.
loc
[
TOTAL_ENROLLMENT_ROWNAME
]
self
.
assertEqual
(
total_enrollment
[
'2013-02-21'
],
4
)
self
.
assertEqual
(
total_enrollment
[
'2013-02-21'
],
4
)
self
.
assertEqual
(
total_enrollment
[
'2013-02-28'
],
10
)
self
.
assertEqual
(
total_enrollment
[
'2013-02-28'
],
10
)
self
.
assertEqual
(
total_enrollment
[
'2013-03-07'
],
10
)
self
.
assertEqual
(
total_enrollment
[
'2013-03-07'
],
10
)
...
@@ -181,7 +181,7 @@ class TestWeeklyAllUsersAndEnrollments(unittest.TestCase):
...
@@ -181,7 +181,7 @@ class TestWeeklyAllUsersAndEnrollments(unittest.TestCase):
2013-03-21 22
2013-03-21 22
"""
"""
res
=
self
.
run_task
(
None
,
'2013-03-28'
,
6
,
offset
=
offset
,
history
=
history
)
res
=
self
.
run_task
(
None
,
'2013-03-28'
,
6
,
offset
=
offset
,
history
=
history
)
total_enrollment
=
res
.
loc
[
TOTAL_ENROLLMENT_ROWNAME
]
# pylint: disable=maybe-no-member
total_enrollment
=
res
.
loc
[
TOTAL_ENROLLMENT_ROWNAME
]
print
total_enrollment
print
total_enrollment
self
.
assertEqual
(
total_enrollment
[
'2013-02-21'
],
5
)
self
.
assertEqual
(
total_enrollment
[
'2013-02-21'
],
5
)
self
.
assertEqual
(
total_enrollment
[
'2013-02-28'
],
9
)
self
.
assertEqual
(
total_enrollment
[
'2013-02-28'
],
9
)
...
@@ -200,7 +200,7 @@ class TestWeeklyAllUsersAndEnrollments(unittest.TestCase):
...
@@ -200,7 +200,7 @@ class TestWeeklyAllUsersAndEnrollments(unittest.TestCase):
res
=
self
.
run_task
(
source
.
encode
(
'utf-8'
),
'2013-04-02'
,
1
)
res
=
self
.
run_task
(
source
.
encode
(
'utf-8'
),
'2013-04-02'
,
1
)
self
.
assertEqual
(
res
.
loc
[
TOTAL_ENROLLMENT_ROWNAME
][
'2013-04-02'
],
2
)
# pylint: disable=maybe-no-member
self
.
assertEqual
(
res
.
loc
[
TOTAL_ENROLLMENT_ROWNAME
][
'2013-04-02'
],
2
)
def
test_task_urls
(
self
):
def
test_task_urls
(
self
):
date
=
datetime
.
date
(
2013
,
01
,
20
)
date
=
datetime
.
date
(
2013
,
01
,
20
)
...
...
edx/analytics/tasks/reports/total_enrollments.py
View file @
30be9af3
...
@@ -30,8 +30,8 @@ class AllCourseEnrollmentCountMixin(CourseEnrollmentCountMixin):
...
@@ -30,8 +30,8 @@ class AllCourseEnrollmentCountMixin(CourseEnrollmentCountMixin):
names
=
[
'date'
,
'count'
]
names
=
[
'date'
,
'count'
]
data
=
read_tsv
(
input_file
,
names
)
data
=
read_tsv
(
input_file
,
names
)
data
.
date
=
pandas
.
to_datetime
(
data
.
date
)
# pylint: disable=maybe-no-member
data
.
date
=
pandas
.
to_datetime
(
data
.
date
)
data
=
data
.
set_index
(
'date'
)
# pylint: disable=maybe-no-member
data
=
data
.
set_index
(
'date'
)
date_range
=
pandas
.
date_range
(
min
(
data
.
index
),
max
(
data
.
index
))
date_range
=
pandas
.
date_range
(
min
(
data
.
index
),
max
(
data
.
index
))
data
=
data
.
reindex
(
date_range
)
data
=
data
.
reindex
(
date_range
)
...
@@ -192,7 +192,7 @@ class WeeklyAllUsersAndEnrollments(luigi.Task, AllCourseEnrollmentCountMixin):
...
@@ -192,7 +192,7 @@ class WeeklyAllUsersAndEnrollments(luigi.Task, AllCourseEnrollmentCountMixin):
self
.
weeks
,
self
.
weeks
,
)
)
with
self
.
output
()
.
open
(
'w'
)
as
output_file
:
# pylint: disable=maybe-no-member
with
self
.
output
()
.
open
(
'w'
)
as
output_file
:
self
.
save_output
(
total_counts_by_week
,
output_file
)
self
.
save_output
(
total_counts_by_week
,
output_file
)
def
read_source
(
self
):
def
read_source
(
self
):
...
@@ -222,7 +222,7 @@ class WeeklyAllUsersAndEnrollments(luigi.Task, AllCourseEnrollmentCountMixin):
...
@@ -222,7 +222,7 @@ class WeeklyAllUsersAndEnrollments(luigi.Task, AllCourseEnrollmentCountMixin):
"""
"""
data
=
None
data
=
None
if
self
.
input
()
.
get
(
'offsets'
):
if
self
.
input
()
.
get
(
'offsets'
):
with
self
.
input
()[
'offsets'
]
.
open
(
'r'
)
as
offset_file
:
# pylint: disable=maybe-no-member
with
self
.
input
()[
'offsets'
]
.
open
(
'r'
)
as
offset_file
:
data
=
self
.
read_course_date_count_tsv
(
offset_file
)
data
=
self
.
read_course_date_count_tsv
(
offset_file
)
return
data
return
data
...
@@ -239,7 +239,7 @@ class WeeklyAllUsersAndEnrollments(luigi.Task, AllCourseEnrollmentCountMixin):
...
@@ -239,7 +239,7 @@ class WeeklyAllUsersAndEnrollments(luigi.Task, AllCourseEnrollmentCountMixin):
"""
"""
data
=
None
data
=
None
if
self
.
input
()
.
get
(
'history'
):
if
self
.
input
()
.
get
(
'history'
):
with
self
.
input
()[
'history'
]
.
open
(
'r'
)
as
history_file
:
# pylint: disable=maybe-no-member
with
self
.
input
()[
'history'
]
.
open
(
'r'
)
as
history_file
:
data
=
self
.
read_total_count_tsv
(
history_file
)
data
=
self
.
read_total_count_tsv
(
history_file
)
return
data
return
data
...
...
pylintrc
View file @
30be9af3
...
@@ -57,7 +57,7 @@ disable=
...
@@ -57,7 +57,7 @@ disable=
# R0912: Too many branches
# R0912: Too many branches
# R0913: Too many arguments
# R0913: Too many arguments
# R0914: Too many local variables
# R0914: Too many local variables
C0302,R0201,R0901,R0902,R0903,R0904,R0911,R0912,R0913,R0914
C0302,R0201,R0901,R0902,R0903,R0904,R0911,R0912,R0913,R0914
,E1103
[REPORTS]
[REPORTS]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment