Skip to content

Commit

Permalink
Fixes to facilitate development
Browse files Browse the repository at this point in the history
Correct example private settings, tell Git to ignore media files, make dependency installation more verbose, and update TravisCI and Codecov config
  • Loading branch information
Renzo Lucioni committed Jul 25, 2016
1 parent 654f93f commit 29e375d
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 9 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -86,3 +86,4 @@ private.py
docs/_build/
node_modules/
credentials/static/bower_components/
credentials/media/
7 changes: 1 addition & 6 deletions .travis.yml
Expand Up @@ -3,10 +3,9 @@ python:
- "2.7"
sudo: false

# Cache the pip directory. "cache: pip" doesn't work due to install override. See https://github.com/travis-ci/travis-ci/issues/3239.
cache:
- pip
- directories:
- $HOME/.cache/pip
- node_modules
- credentials/static/bower_components
before_install:
Expand All @@ -16,11 +15,7 @@ install:
- pip install -U pip wheel codecov
- make requirements
script:
# Compile assets and run validation
- make static -e DJANGO_SETTINGS_MODULE="credentials.settings.test"
- make validate
branches:
only:
- master
after_success:
- codecov
4 changes: 2 additions & 2 deletions Makefile
Expand Up @@ -28,7 +28,7 @@ help:
@echo " start-devstack run a local development copy of the server"
@echo " open-devstack open a shell on the server started by start-devstack"
@echo " pkg-devstack build the credentials image from the latest configuration and code"
@echo " make accept run acceptance tests '
@echo " make accept run acceptance tests"
@echo ""

clean:
Expand All @@ -44,7 +44,7 @@ requirements.js:
$(NODE_BIN)/bower install

requirements: requirements.js
pip install -qr requirements/local.txt --exists-action w
pip install -r requirements/local.txt

test: clean
coverage run ./manage.py test credentials --settings=credentials.settings.test
Expand Down
9 changes: 9 additions & 0 deletions codecov.yml
@@ -0,0 +1,9 @@
comment: off
coverage:
status:
patch:
default:
target: 95
project:
default:
target: 95
2 changes: 1 addition & 1 deletion credentials/settings/private.py.example
@@ -1,6 +1,6 @@
SOCIAL_AUTH_EDX_OIDC_KEY = 'credentials-key'
SOCIAL_AUTH_EDX_OIDC_SECRET = 'credentials-secret'
SOCIAL_AUTH_EDX_OIDC_URL_ROOT = 'http://127.0.0.1:8000/oauth'
SOCIAL_AUTH_EDX_OIDC_URL_ROOT = 'http://127.0.0.1:8000/oauth2'
SOCIAL_AUTH_EDX_OIDC_ID_TOKEN_DECRYPTION_KEY = SOCIAL_AUTH_EDX_OIDC_SECRET

# PROGRAMS API CONFIGURATION
Expand Down

0 comments on commit 29e375d

Please sign in to comment.