← Back to branch summary

~davidc3/ubuntu-rest-scopes/testing-newyorktimes

~davidc3/ubuntu-rest-scopes/testing-newyorktimes

Viewing all changes in revision 5.

Committer: David Callé
Date: 2014-02-11 09:16:57 UTC
mfrom: (3.1.15 ubuntu-rest-scopes)
Revision ID: davidc@framli.eu-20140211091657-2759quotvgxqg318

Merge trunk, fix conflitcts, add secrets config

files added:

configs/dev-secrets.yaml

src/scopes/ebay.py

src/scopes/grooveshark.py

src/scopes/tests

src/scopes/tests/__init__.py

src/scopes/tests/fixtures

src/scopes/tests/fixtures/ebay-results.json

src/scopes/tests/fixtures/grooveshark-song-album.json

src/scopes/tests/fixtures/weatherchannel-loc_key-lookup.json

src/scopes/tests/fixtures/weatherchannel-loc_key.json

src/scopes/tests/fixtures/weatherchannel-simple.json

src/scopes/tests/fixtures/wikipedia-extraction.json

src/scopes/tests/fixtures/wikipedia-otherlang.xml

src/scopes/tests/fixtures/wikipedia-simple.xml

src/scopes/tests/test_base.py

src/scopes/tests/test_ebay.py

src/scopes/tests/test_grooveshark.py

src/scopes/tests/test_weatherchannel.py

src/scopes/tests/test_wikipedia.py

src/scopes/weatherchannel.py

src/tests

src/tests/__init__.py

src/tests/test_rest_scopes.py

test

utilities

utilities/check_scopes.py

files removed:

files renamed:
.bzrignore => .bzrignore

Makefile => Makefile

README.txt => README.txt

build/ => build/

configs/ => configs/

lib/ => lib/

src/ => src/

files modified:
configs/development.yaml

configs/scopes-info.yaml

src/__init__.py

src/rest_scopes.py

src/scopes/__init__.py

src/scopes/newyorktimes.py

src/scopes/wikipedia.py

src/utils.py

src/wsgi.py

Show diffs side-by-side

added added

removed removed

configs/dev-secrets.yaml

configs/development.yaml

configs/scopes-info.yaml

src/__init__.py

src/rest_scopes.py

src/scopes/__init__.py

src/scopes/ebay.py

src/scopes/grooveshark.py

src/scopes/newyorktimes.py

src/scopes/tests/

src/scopes/tests/__init__.py

src/scopes/tests/fixtures/

src/scopes/tests/fixtures/ebay-results.json

src/scopes/tests/fixtures/grooveshark-song-album.json

src/scopes/tests/fixtures/weatherchannel-loc_key-lookup.json

src/scopes/tests/fixtures/weatherchannel-loc_key.json

src/scopes/tests/fixtures/weatherchannel-simple.json

src/scopes/tests/fixtures/wikipedia-extraction.json

src/scopes/tests/fixtures/wikipedia-otherlang.xml

src/scopes/tests/fixtures/wikipedia-simple.xml

src/scopes/tests/test_base.py

src/scopes/tests/test_ebay.py

src/scopes/tests/test_grooveshark.py

src/scopes/tests/test_weatherchannel.py

src/scopes/tests/test_wikipedia.py

src/scopes/weatherchannel.py

src/scopes/wikipedia.py

src/tests/__init__.py

src/tests/test_rest_scopes.py

utilities/check_scopes.py

Older »