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
bf4f5ba3
Commit
bf4f5ba3
authored
Nov 17, 2014
by
Clinton Blackburn
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #41 from edx/django-1.7
Upgraded to Django 1.7
parents
cd13fc88
af79e1d8
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
12 deletions
+10
-12
Makefile
+5
-5
README.rst
+2
-2
analyticsdataserver/router.py
+1
-1
analyticsdataserver/settings/base.py
+0
-1
requirements/base.txt
+1
-2
requirements/local.txt
+1
-1
No files found.
Makefile
View file @
bf4f5ba3
...
@@ -4,7 +4,7 @@ COVERAGE = $(ROOT)/build/coverage
...
@@ -4,7 +4,7 @@ COVERAGE = $(ROOT)/build/coverage
PACKAGES
=
analyticsdataserver analytics_data_api
PACKAGES
=
analyticsdataserver analytics_data_api
DATABASES
=
default analytics
DATABASES
=
default analytics
.PHONY
:
requirements develop clean diff.report view.diff.report quality
syncdb
.PHONY
:
requirements develop clean diff.report view.diff.report quality
requirements
:
requirements
:
pip install
-q
-r
requirements/base.txt
pip install
-q
-r
requirements/base.txt
...
@@ -46,17 +46,17 @@ quality:
...
@@ -46,17 +46,17 @@ quality:
validate
:
test.requirements test quality
validate
:
test.requirements test quality
syncdb
:
migrate
:
$
(
foreach db_name,
$(DATABASES)
,./manage.py
syncdb
--
migrate
--noinput
--database
=
$(db_name)
;
)
$
(
foreach db_name,
$(DATABASES)
,./manage.py migrate
--noinput
--database
=
$(db_name)
;
)
loaddata
:
syncdb
loaddata
:
migrate
python manage.py loaddata problem_response_answer_distribution
--database
=
analytics
python manage.py loaddata problem_response_answer_distribution
--database
=
analytics
python manage.py generate_fake_course_data
python manage.py generate_fake_course_data
demo
:
clean requirements loaddata
demo
:
clean requirements loaddata
python manage.py set_api_key edx edx
python manage.py set_api_key edx edx
travis
:
clean requirements
syncdb
travis
:
clean requirements
migrate
python manage.py set_api_key edx edx
python manage.py set_api_key edx edx
python manage.py loaddata problem_response_answer_distribution
--database
=
analytics
python manage.py loaddata problem_response_answer_distribution
--database
=
analytics
python manage.py generate_fake_course_data
--num-weeks
=
1
python manage.py generate_fake_course_data
--num-weeks
=
1
README.rst
View file @
bf4f5ba3
...
@@ -26,8 +26,8 @@ Getting Started
...
@@ -26,8 +26,8 @@ Getting Started
::
::
$ ./manage.py
syncdb --
migrate --noinput
$ ./manage.py migrate --noinput
$ ./manage.py
syncdb --
migrate --noinput --database=analytics
$ ./manage.py migrate --noinput --database=analytics
3. Create a user and authentication token. Note that the user will be
3. Create a user and authentication token. Note that the user will be
created if one does not exist.
created if one does not exist.
...
...
analyticsdataserver/router.py
View file @
bf4f5ba3
...
@@ -17,7 +17,7 @@ class AnalyticsApiRouter(object):
...
@@ -17,7 +17,7 @@ class AnalyticsApiRouter(object):
def
allow_relation
(
self
,
obj1
,
obj2
,
**
hints
):
# pylint: disable=unused-argument
def
allow_relation
(
self
,
obj1
,
obj2
,
**
hints
):
# pylint: disable=unused-argument
return
self
.
_get_database
(
obj1
)
==
self
.
_get_database
(
obj2
)
return
self
.
_get_database
(
obj1
)
==
self
.
_get_database
(
obj2
)
def
allow_
syncdb
(
self
,
database
,
model
):
def
allow_
migrate
(
self
,
database
,
model
):
dest_db
=
self
.
_get_database
(
model
)
dest_db
=
self
.
_get_database
(
model
)
if
dest_db
is
not
None
:
if
dest_db
is
not
None
:
return
database
==
dest_db
return
database
==
dest_db
...
...
analyticsdataserver/settings/base.py
View file @
bf4f5ba3
...
@@ -181,7 +181,6 @@ DJANGO_APPS = (
...
@@ -181,7 +181,6 @@ DJANGO_APPS = (
)
)
THIRD_PARTY_APPS
=
(
THIRD_PARTY_APPS
=
(
'south'
,
'rest_framework'
,
'rest_framework'
,
'rest_framework.authtoken'
,
'rest_framework.authtoken'
,
'rest_framework_swagger'
,
'rest_framework_swagger'
,
...
...
requirements/base.txt
View file @
bf4f5ba3
Django==1.
6.6
# BSD License
Django==1.
7.1
# BSD License
Markdown==2.4.1 # BSD
Markdown==2.4.1 # BSD
South==1.0 # Apache License
django-model-utils==1.4.0 # BSD
django-model-utils==1.4.0 # BSD
djangorestframework==2.4.4 # BSD
djangorestframework==2.4.4 # BSD
ipython==2.1.0 # BSD
ipython==2.1.0 # BSD
...
...
requirements/local.txt
View file @
bf4f5ba3
# Local development dependencies go here
# Local development dependencies go here
-r base.txt
-r base.txt
django-debug-toolbar==1.2.
1
django-debug-toolbar==1.2.
2
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