Commit b82bf1c4 by Gabe Mulley

keep all task related artifacts in edx.analytics.tasks

We want to put other stuff in edx.analytics, so we move all of our batch job related logic in to a subpackage.

Change-Id: I5dc93e5e183e61e01c4dc910f391ddd39203d987
Fixes: AN-508
parent 770e7c30
[gerrit]
host=review.edx.org
port=29418
project=edx/analytics-tasks.git
defaultbranch=master
...@@ -6,7 +6,7 @@ import luigi.hadoop ...@@ -6,7 +6,7 @@ import luigi.hadoop
import luigi.s3 import luigi.s3
import luigi.hdfs import luigi.hdfs
import edx.analytics.util.eventlog as eventlog import edx.analytics.tasks.util.eventlog as eventlog
from edx.analytics.tasks.pathutil import get_target_for_url, PathSetTask from edx.analytics.tasks.pathutil import get_target_for_url, PathSetTask
import logging import logging
...@@ -190,8 +190,7 @@ class BaseCourseEnrollmentTask(luigi.hadoop.JobTask): ...@@ -190,8 +190,7 @@ class BaseCourseEnrollmentTask(luigi.hadoop.JobTask):
# is used for parsing events and date conversion. # is used for parsing events and date conversion.
import boto import boto
import cjson import cjson
import edx.analytics.util return [boto, cjson]
return [boto, edx.analytics.util, cjson]
class CourseEnrollmentEventsPerDay(CourseEnrollmentEventsPerDayMixin, BaseCourseEnrollmentTask): class CourseEnrollmentEventsPerDay(CourseEnrollmentEventsPerDayMixin, BaseCourseEnrollmentTask):
......
...@@ -10,8 +10,8 @@ from mock import MagicMock ...@@ -10,8 +10,8 @@ from mock import MagicMock
from numpy import isnan from numpy import isnan
import pandas import pandas
from edx.analytics.reports.enrollments import EnrollmentsByWeek from edx.analytics.tasks.reports.enrollments import EnrollmentsByWeek
from edx.analytics.reports.enrollments import ExternalURL from edx.analytics.tasks.reports.enrollments import ExternalURL
class FakeTarget(object): class FakeTarget(object):
......
...@@ -5,7 +5,7 @@ Tests for utilities that parse event logs. ...@@ -5,7 +5,7 @@ Tests for utilities that parse event logs.
import unittest import unittest
import edx.analytics.util.eventlog as eventlog import edx.analytics.tasks.util.eventlog as eventlog
class CourseIdTest(unittest.TestCase): class CourseIdTest(unittest.TestCase):
......
...@@ -17,12 +17,12 @@ data_files = ...@@ -17,12 +17,12 @@ data_files =
[entry_points] [entry_points]
console_scripts = console_scripts =
launch-task = edx.analytics.tasks.main:main launch-task = edx.analytics.tasks.launchers.main:main
remote-task = edx.analytics.tasks.remote:main remote-task = edx.analytics.tasks.launchers.remote:main
edx.analytics.tasks = edx.analytics.tasks =
s3-copy = edx.analytics.tasks.s3:S3Copy s3-copy = edx.analytics.tasks.s3:S3Copy
s3-sync = edx.analytics.tasks.s3:S3Sync s3-sync = edx.analytics.tasks.s3:S3Sync
sync-events = edx.analytics.tasks.eventlogs:SyncEventLogs sync-events = edx.analytics.tasks.eventlogs:SyncEventLogs
enrollments-report = edx.analytics.reports.enrollments:EnrollmentsByWeek enrollments-report = edx.analytics.tasks.reports.enrollments:EnrollmentsByWeek
course-enroll = edx.analytics.tasks.course_enroll:CourseEnrollmentChangesPerDay course-enroll = edx.analytics.tasks.course_enroll:CourseEnrollmentChangesPerDay
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment