Skip to content

Commit

Permalink
[#517] remove the development.ini dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
tobes committed Mar 1, 2013
1 parent 9f128c0 commit 92a1f54
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 3 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Expand Up @@ -13,8 +13,6 @@ before_script:
- psql -c 'CREATE DATABASE datastore;' -U postgres
- psql -c 'CREATE USER readonlyuser;' -U postgres
- python setup.py develop
# we should really remove the development.ini requirements from test-core.ini
- paster make-config ckan development.ini --no-interactive
- sed -i -e 's/.*solr_url.*/solr_url = http:\/\/127.0.0.1:8983\/solr/' test-core.ini
- sed -i -e 's/.*ckan\.site_id.*/ckan.site_id = travis_ci/' test-core.ini
- sed -i -e 's/^sqlalchemy.url.*/sqlalchemy.url = postgresql:\/\/postgres@localhost\/ckantest/' test-core.ini
Expand Down
15 changes: 14 additions & 1 deletion test-core.ini
Expand Up @@ -8,7 +8,10 @@ host = 0.0.0.0
port = 5000

[app:main]
use = config:development.ini
#use = config:development.ini
use = egg:ckan
full_stack = true
cache_dir = %(here)s/data
debug = false

#faster_db_test_hacks = True
Expand All @@ -19,6 +22,11 @@ debug = false
sqlalchemy.url = postgresql://ckanuser:pass@localhost/ckantesting
#sqlalchemy.url = sqlite:///

## Datastore
## Uncommment to set the datastore urls
ckan.datastore.write_url = postgresql://ckanuser:pass@localhost/ckantesting
ckan.datastore.read_url = postgresql://readonlyuser:pass@localhost/ckantesting

ckan.auth.user_create_organizations = true
ckan.auth.user_create_groups = true
ckan.auth.create_user_via_api = false
Expand Down Expand Up @@ -87,6 +95,11 @@ ckan.activity_streams_email_notifications = True

ckan.activity_list_limit = 15

# repoze.who config
who.config_file = %(here)s/who.ini
who.log_level = warning
who.log_file = %(cache_dir)s/who_log.ini

# Logging configuration
[loggers]
keys = root, ckan, sqlalchemy
Expand Down

0 comments on commit 92a1f54

Please sign in to comment.