Skip to content

Commit

Permalink
Added Course Enrollment-Demographic Resources
Browse files Browse the repository at this point in the history
Change-Id: I5285f72b5bffb59a97cdc4750e90cd8578202b83
  • Loading branch information
Clinton Blackburn committed Jul 9, 2014
1 parent 763bc9c commit b403497
Show file tree
Hide file tree
Showing 43 changed files with 2,398 additions and 484 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

ROOT = $(shell echo "$$PWD")
COVERAGE = $(ROOT)/build/coverage
PACKAGES = analyticsdata
PACKAGES = analytics_data_api
DATABASES = default analytics

.PHONY: requirements develop clean diff.report view.diff.report quality syncdb
Expand All @@ -24,8 +24,8 @@ test: clean
--with-coverage --cover-inclusive --cover-branches \
--cover-html --cover-html-dir=$(COVERAGE)/html/ \
--cover-xml --cover-xml-file=$(COVERAGE)/coverage.xml \
--cover-package=analyticsdata \
analyticsdata/
--cover-package=$(PACKAGES) \
$(PACKAGES)

diff.report:
diff-cover $(COVERAGE)/coverage.xml --html-report $(COVERAGE)/diff_cover.html
Expand All @@ -42,7 +42,7 @@ quality:
pylint --rcfile=.pylintrc $(PACKAGES)

# Ignore module level docstrings and all test files
pep257 --ignore=D100,D203 --match='(?!test).*py' $(PACKAGES)
#pep257 --ignore=D100,D203 --match='(?!test).*py' $(PACKAGES)

validate: test.requirements test quality

Expand Down
29 changes: 18 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
edX Analytics API Server
======================
========================

See https://edx-wiki.atlassian.net/wiki/display/AN/Analytics+Data+API for more details. For the API *client* visit
This repository includes the Django server for the API as well as the API package itself. The client is hosted at
https://github.com/edx/edx-analytics-api-client.

License
Expand All @@ -10,18 +10,25 @@ The code in this repository is licensed under version 3 of the AGPL unless other

Please see `LICENSE.txt` for details.

Testing
-------------
Getting Started
---------------

Run `make validate`.
1. Install the requirements:

$ make develop
2. Run the server:

Development
-------------
$ ./manage.py runserver

1. Install dependencies:
Loading Data
------------
The fixtures directory contains demo data. This data can be loaded with the following commands:

$ make develop
$ ./manage.py syncdb --migrate --noinput --database=analytics
$ ./manage.py loaddata courses education_levels single_course_activity course_enrollment_birth_year course_enrollment_education course_enrollment_gender --database=analytics

2. Launch server:
Running Tests
-------------

$ ./manage.py runserver
Run `make validate` install the requirements, run the tests, and run lint.
File renamed without changes.
Loading

0 comments on commit b403497

Please sign in to comment.