Merge "Calculate number of users per country."

3963d379 · Brian Wilson · Gerrit Code Review · f0196c12 · e6e930c0 · 3963d379
Commit 3963d379 authored May 06, 2014 by Brian Wilson Committed by Gerrit Code Review May 06, 2014
Expand all Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

edx/analytics/tasks/tests/test_user_location.py
+0 -0

edx/analytics/tasks/user_location.py
+0 -0

requirements/default.txt
+1 -0

setup.cfg
+1 -0

No files found.
--- a/edx/analytics/tasks/tests/test_user_location.py
+++ b/edx/analytics/tasks/tests/test_user_location.py
--- a/edx/analytics/tasks/user_location.py
+++ b/edx/analytics/tasks/user_location.py
--- a/requirements/default.txt
+++ b/requirements/default.txt
@@ -7,6 +7,7 @@ numpy==1.8.0
 oursql==0.9.3.1
 pandas==0.13.0
 pbr==0.5.23
+pygeoip==0.3.1
 python-cjson==1.0.5
 stevedore==0.14.1
 tornado==3.1.1

--- a/setup.cfg
+++ b/setup.cfg
@@ -32,6 +32,7 @@ edx.analytics.tasks =
    sqoop-import = edx.analytics.tasks.sqoop:SqoopImportFromMysql
    dump-student-module = edx.analytics.tasks.database_exports:StudentModulePerCourseTask
    export-student-module = edx.analytics.tasks.database_exports:StudentModulePerCourseAfterImportWorkflow
+    last-country = edx.analytics.tasks.user_location:LastCountryForEachUser

 mapreduce.engine =
    hadoop = edx.analytics.tasks.mapreduce:MapReduceJobRunner