Commit Graph

212 Commits

Author SHA1 Message Date
Calen Pennington
34a696cdf6 Merge branch 'master' into cpennington/cms
Conflicts:
	rakefile
	requirements.txt
2012-06-18 13:46:33 -04:00
Calen Pennington
5404345b1f Make tests pass when running on cms 2012-06-18 13:21:06 -04:00
Calen Pennington
8134bcbc3d Get the cms up to the point of rendering a template 2012-06-08 14:01:41 -04:00
Calen Pennington
d690aebc78 Set up a pylintrc file 2012-06-08 09:08:18 -04:00
Calen Pennington
374ce67e36 Run pep8 and pylint on all libraries, not just the lms 2012-06-07 17:04:57 -04:00
Calen Pennington
1d1af3be74 Move coverage report html into the reports directory 2012-06-07 17:00:03 -04:00
Calen Pennington
92c6f1e63d Add reports for library tests 2012-06-07 16:54:05 -04:00
Calen Pennington
4a0969df9d Move tests for xmodules into the xmodule library, and make them run without django 2012-06-07 10:46:10 -04:00
Calen Pennington
46a1c43c76 Give a general purpose rake command for running django-admin in the right way for either the lms or the cms 2012-06-06 14:41:48 -04:00
Calen Pennington
dc2dc1f0dd Make it possible to run cleanliness stuff on lms 2012-06-06 14:23:09 -04:00
Calen Pennington
5ba03130aa Moving LMS code into subdirectory 2012-06-06 14:09:01 -04:00
Calen Pennington
f467134fc5 Don't fail post-install configuration if gunicorn won't stop 2012-05-31 11:59:14 -04:00
Calen Pennington
16046aa8e9 Be more specific when deleting mako template cache directory 2012-05-25 15:37:50 -04:00
Calen Pennington
bd7f1c3ab2 Delete mako temp files during .deb install 2012-05-25 15:27:56 -04:00
Calen Pennington
cdf6c87bb8 Exclude things during .deb packaging correctly, so that we don't have a bunch of build detritus left over. FPM still leaves the empty directories, unfortunately 2012-05-25 12:50:21 -04:00
Calen Pennington
06e06c81ad Mark the collectstatic alias as executable 2012-05-24 11:22:23 -04:00
Calen Pennington
25e01799bb Add a script to doing the collectstatic run during apt configuration 2012-05-24 10:56:26 -04:00
Calen Pennington
4e59e163cf Merge branch 'master' into asset-pipeline 2012-05-23 16:20:24 -04:00
Calen Pennington
f0c98a939a Try and get fpm to match exclude patterns 2012-05-23 11:50:06 -04:00
Calen Pennington
b84da37731 Make fpm run in verbose mode 2012-05-23 11:47:16 -04:00
Calen Pennington
d2ec58c06e Don't pipeline in dev environment, which means that there is no need to run collectstatic either. Hooray\! 2012-05-18 15:37:57 -04:00
Calen Pennington
6b15303d89 Make collectstatic compile .coffee files, and preserve the askbot workflow using guard 2012-05-18 15:10:10 -04:00
Calen Pennington
8823346a0c Merge branch 'new-settings' into asset-pipeline 2012-05-18 12:07:19 -04:00
Calen Pennington
a2eb8fcada Delete settings.py in favor of envs/*.py, and add a rake task to run a dev server locally from those settings 2012-05-18 11:59:08 -04:00
Calen Pennington
bc823d3bfe Merge branch 'master' into asset-pipeline
Conflicts:
	djangoapps/multicourse/__init__.py
	requirements.txt
	sass/_info.scss
	sass/_textbook.scss
	sass/courseware/_sequence-nav.scss
	sass/courseware/_video.scss
	sass/index/_base.scss
	sass/index/_extends.scss
	sass/index/_footer.scss
	sass/index/_header.scss
	sass/index/_index.scss
	sass/index/_variables.scss
	sass/layout/_calculator.scss
	sass/print.scss
	static/css
	static/css/application.css
	static/css/marketing.css
	templates/main.html
	templates/marketing.html
	templates/sass/index/_base.scss
	templates/sass/index/_extends.scss
	templates/sass/index/_footer.scss
	templates/sass/index/_header.scss
	templates/sass/index/_index.scss
	templates/sass/index/_variables.scss
	templates/sass/marketing/_base.scss
	templates/sass/marketing/_extends.scss
	templates/sass/marketing/_footer.scss
	templates/sass/marketing/_header.scss
	templates/sass/marketing/_index.scss
	templates/sass/marketing/_variables.scss
2012-05-17 16:32:39 -04:00
Calen Pennington
37abb7aad1 Search the path for both django-admin.py and django-admin when running tests 2012-05-17 10:50:41 -04:00
Calen Pennington
2efc013316 Ignore long lines in pep8 2012-05-17 10:12:10 -04:00
Calen Pennington
1b8ea44403 Exclude reports from debian package 2012-05-15 15:22:46 -04:00
Calen Pennington
4a3929a28f Move test reports into a separate directory 2012-05-15 14:50:01 -04:00
Calen Pennington
e3dc7d0a49 Don't step on Ruby's built in VERSION constant 2012-05-15 14:49:51 -04:00
Calen Pennington
337f1aff54 Add pylint command 2012-05-15 14:33:05 -04:00
Calen Pennington
a712fe020f Don't try and install stuff from requirements.txt 2012-05-15 13:18:59 -04:00
Calen Pennington
f7e947b5f5 Install all requirements before running tests 2012-05-15 10:58:43 -04:00
Calen Pennington
8567fb1655 Make rake test install the test requirements 2012-05-14 16:36:50 -04:00
Calen Pennington
8e78f73d00 Adding a test environment with some debug stuff turned off 2012-05-14 11:14:55 -04:00
Calen Pennington
3fb185fb0c Merge branch 'master' into anonymous_user
Conflicts:
	rakefile
2012-05-10 11:47:14 -04:00
Calen Pennington
9c42c90412 Move to a normalized deploy name for .deb files 2012-05-10 11:43:46 -04:00
Calen Pennington
88da17f087 Glob package names before publishing 2012-05-10 11:38:32 -04:00
Calen Pennington
72f1cd1da3 Push all architecture .debs to the packages server 2012-05-10 11:36:54 -04:00
Calen Pennington
4ff31d1bdc Push all architecture .debs to the packages server 2012-05-10 11:36:43 -04:00
Calen Pennington
41aaadf019 Add back in the exclusions for build artifacts 2012-05-10 10:18:05 -04:00
Calen Pennington
bdecc17cf6 Add task for running mitx tests 2012-04-25 11:20:14 -04:00
Calen Pennington
e8c4d1dbef Replace links to static in problems with links to fingerprinted data 2012-04-23 11:42:42 -04:00
Calen Pennington
8ec81a1c2b Removing hardcoded dependencies in favor of deps from puppet 2012-04-18 18:13:24 -04:00
Calen Pennington
a49057dfbf Deploy packages to /opt/wwc, rather than /opt/packages 2012-04-18 14:58:16 -04:00
Calen Pennington
ce346f6608 Don't use sudo during configuration script 2012-04-18 14:35:18 -04:00
Calen Pennington
c7c74c729c Make code be owned by makeitso 2012-04-18 14:24:09 -04:00
Calen Pennington
ee5dedad4e Revert "Use git to get the branch name and commit number, rather than incoming environment variables"
This reverts commit d6a57558d7.
2012-04-18 13:06:25 -04:00
Calen Pennington
d6a57558d7 Use git to get the branch name and commit number, rather than incoming environment variables 2012-04-18 12:47:38 -04:00
Calen Pennington
033f525182 Lowercase the branch name while building .debs 2012-04-18 12:43:24 -04:00