Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

0.16a3 #4891

Closed
Closed

0.16a3 #4891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
de3b20b
is_valid_url returns false when given windows path with drive letter
MCGallaspy Dec 15, 2015
4458705
Unpack in separate thread, so that IO isn't blocked (it's nicer)
MCGallaspy Dec 15, 2015
f92dc85
Merge branch '0.16.x' of https://github.com/manipalsingh013/ka-lite i…
manipalsingh013 Feb 18, 2016
f304d6f
Merge pull request #1 from learningequality/0.16.x
manipalsingh013 Feb 18, 2016
67b2e39
Merge branch '0.16.x' of https://github.com/manipalsingh013/ka-lite i…
manipalsingh013 Feb 18, 2016
59d6716
Added condition for wrong password of Django user
manipalsingh013 Feb 18, 2016
5ec6d51
Prevent name shadowing in view func
MCGallaspy Feb 19, 2016
ed842e7
Translate exercises correctly
MCGallaspy Feb 19, 2016
1f47ac7
Add some tests of content_item api_view
MCGallaspy Feb 19, 2016
6791e6d
move content item db location and distribute it
benjaoming Feb 2, 2016
790d0d7
remove unused arg and clean up code
benjaoming Feb 2, 2016
3ca5468
WIP on bundling content item db
benjaoming Feb 2, 2016
38e4528
fix bulk insertion
benjaoming Feb 3, 2016
10199e3
Put all database templates in kalite/database/templates, init_content…
benjaoming Feb 3, 2016
1b53758
support for retrieving en-minimal content pack
benjaoming Feb 18, 2016
49464dd
Create template content.db from retrievecontentpack and add it to sdist
benjaoming Feb 18, 2016
ccd545b
Use correct path for user's database files
benjaoming Feb 20, 2016
ab565f2
log exceptions in JSON views
benjaoming Feb 21, 2016
82678bc
Log requests and merge all logging into one config
benjaoming Feb 21, 2016
287b4b7
do not annotate content items on the template content db
benjaoming Feb 21, 2016
26e5e84
ensure existence of template dir when calling make assets
benjaoming Feb 21, 2016
8aa866f
remove files that arent essential for 0.16 and consolidate tests
benjaoming Feb 21, 2016
6606eb4
currently we have to retrieve a content pack for testing, the big eng…
benjaoming Feb 21, 2016
734b64f
fix tests to match latest content db
benjaoming Feb 21, 2016
dcc3198
let total_files=0 be okay until content packs are fixed @rtibbles @ar…
benjaoming Feb 21, 2016
63cc03d
fix the test fix, hoping test is still useful @rtibbles
benjaoming Feb 21, 2016
dcc456e
fix video download wrongly failing
benjaoming Feb 21, 2016
e6d4de0
remove not-to-be-used generate_assessment_zips
benjaoming Feb 21, 2016
ca21814
Merge branch '0.16.x' into init_content_items_w_contentpack_minimal
benjaoming Feb 22, 2016
b0e7bd0
Merge branch 'random-fixes' of https://github.com/MCGallaspy/ka-lite …
benjaoming Feb 22, 2016
d918312
Merge branch '0.16.x' of https://github.com/manipalsingh013/ka-lite i…
benjaoming Feb 22, 2016
dda5373
remove is_installed, replace with explicit check for database file
benjaoming Feb 22, 2016
7a0b4d1
serve at correct url
benjaoming Feb 22, 2016
6ad3c20
Normalize code
benjaoming Feb 22, 2016
8ab42e7
fix Python version warnings
benjaoming Feb 22, 2016
42f0cea
Merge branch 'python-27-warning-downgrade' into prereleases/0.16a3
benjaoming Feb 22, 2016
c598d90
Merge branch 'fix-assessment-serving' into prereleases/0.16a3
benjaoming Feb 22, 2016
05ca667
Merge branch 'rm-is_installed' into prereleases/0.16a3
benjaoming Feb 22, 2016
cd1adbc
Merge branch '4719-prettify-unpack-assessment-item-output' of https:/…
benjaoming Feb 22, 2016
14e5568
Merge branch 'init_content_items_w_contentpack_minimal' into prerelea…
benjaoming Feb 22, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ static-updates
# MAC stuff
.DS_Store

# oh-my-zsh
.venv

# SQLite files (should probably specify the path)
*.db
*.sqlite*
Expand Down
14 changes: 7 additions & 7 deletions MANIFEST.in.dist
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,22 @@ include requirements.txt
recursive-include kalite *.html *.txt *.png *.js *.css *.gif *.less *.otf *.svg *.woff *.eot *.ttf *.zip *.json *.handlebars

# Get the empty DBs -- make sure they are properly generated!
include kalite/database/data.sqlite
recursive-exclude kalite/database *
recursive-include kalite/database/templates *sqlite
recursive-include kalite/database/templates/content_items *sqlite

# This can be a huge problem when creating an sdist from
# a local development environment
recursive-exclude kalite/static *

# Not doing this anymore
# exclude kalite/local_settings.py
# exclude kalite/settings/local_settings.py
# exclude kalite/private_key.pem
# exclude kalite/secrets.py

# Data files, these are not picked up by sdist unless listed here
recursive-include python-packages *
recursive-include static-libraries *

# There are still a couple of files left here, however main part is for build
# process
recursive-include data *
recursive-exclude data/khan *

# Necessary because it's a data directory so they
# do not get automatically excluded
Expand Down
14 changes: 9 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,16 @@ help:

clean: clean-build clean-pyc clean-test

clean-dev-db:
rm -f kalite/database/data.sqlite

clean-build:
rm -fr build/
rm -fr dist/
rm -fr .eggs/
rm -fr dist-packages/
rm -fr dist-packages-temp/
rm -f kalite/database/data.sqlite
rm -fr kalite/database/templates
find . -name '*.egg-info' -exec rm -fr {} +
find . -name '*.egg' -exec rm -f {} +

Expand Down Expand Up @@ -87,17 +90,18 @@ assets:
npm install --production
node build.js
bin/kalite manage compileymltojson
bin/kalite manage init_content_items
bin/kalite manage annotate_content_items
bin/kalite manage syncdb --noinput
bin/kalite manage migrate
mkdir -p kalite/database/templates/
cp kalite/database/data.sqlite kalite/database/templates/
bin/kalite manage retrievecontentpack download en --minimal --foreground --template

release: clean docs assets man
release: clean clean-dev-db docs assets man
python setup.py sdist --formats=gztar,zip upload --sign
python setup.py sdist --formats=gztar,zip upload --sign --static
ls -l dist

dist: clean docs assets
dist: clean clean-dev-db docs assets
python setup.py sdist --formats=gztar,zip
python setup.py sdist --formats=gztar,zip --static
ls -l dist
Expand Down
7 changes: 0 additions & 7 deletions data/khan/channel_data.json

This file was deleted.

1 change: 0 additions & 1 deletion data/khan/contents.json

This file was deleted.

1 change: 0 additions & 1 deletion data/khan/exercises.json

This file was deleted.

42 changes: 0 additions & 42 deletions data/khan/make_unique_slugs.py

This file was deleted.

1 change: 0 additions & 1 deletion data/khan/topics.json

This file was deleted.

Loading