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
import luigi.s3
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
import logging
......@@ -190,8 +190,7 @@ class BaseCourseEnrollmentTask(luigi.hadoop.JobTask):
# is used for parsing events and date conversion.
import boto
import cjson
import edx.analytics.util
return [boto, edx.analytics.util, cjson]
return [boto, cjson]
class CourseEnrollmentEventsPerDay(CourseEnrollmentEventsPerDayMixin, BaseCourseEnrollmentTask):
......
......@@ -10,8 +10,8 @@ from mock import MagicMock
from numpy import isnan
import pandas
from edx.analytics.reports.enrollments import EnrollmentsByWeek
from edx.analytics.reports.enrollments import ExternalURL
from edx.analytics.tasks.reports.enrollments import EnrollmentsByWeek
from edx.analytics.tasks.reports.enrollments import ExternalURL
class FakeTarget(object):
......
......@@ -5,7 +5,7 @@ Tests for utilities that parse event logs.
import unittest
import edx.analytics.util.eventlog as eventlog
import edx.analytics.tasks.util.eventlog as eventlog
class CourseIdTest(unittest.TestCase):
......
......@@ -17,12 +17,12 @@ data_files =
[entry_points]
console_scripts =
launch-task = edx.analytics.tasks.main:main
remote-task = edx.analytics.tasks.remote:main
launch-task = edx.analytics.tasks.launchers.main:main
remote-task = edx.analytics.tasks.launchers.remote:main
edx.analytics.tasks =
s3-copy = edx.analytics.tasks.s3:S3Copy
s3-sync = edx.analytics.tasks.s3:S3Sync
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
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