Skip to content

Commit

Permalink
Merge 20edb43 into 9522e9f
Browse files Browse the repository at this point in the history
  • Loading branch information
mwvolo committed Sep 11, 2015
2 parents 9522e9f + 20edb43 commit dc99b1a
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 0 deletions.
9 changes: 9 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@ before_install:
# * Install cnx-archive
- git clone https://github.com/Connexions/cnx-archive.git
- cd cnx-archive && sudo /usr/bin/python setup.py install && cd ..

# * Install cnx-publishing-builds
- git clone https://github.com/Connexions/cnx-transforms.git
- cd cnx-transforms && sudo /usr/bin/python setup.py install && cd ..

# * Install cnx-publishing-builds
- git clone https://github.com/Connexions/cnx-publishing-builds.git
- cd cnx-publishing-builds && sudo /usr/bin/python setup.py install && cd ..

# Install the coverage utility and coveralls reporting utility
- sudo apt-get install python-pip
# Scripts get installed to /usr/local/bin
Expand Down
2 changes: 2 additions & 0 deletions cnxpublishing/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ def main(global_config, **settings):
config.set_authorization_policy(authz_policy)

config.scan(ignore='cnxpublishing.tests')

#config.include('cnxpublishingbuilds')
return config.make_wsgi_app()


Expand Down
2 changes: 2 additions & 0 deletions development.ini
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ pyramid.debug_routematch = false
pyramid.default_locale_name = en
pyramid.includes =
pyramid_sawing
cnx-transforms
cnx-publishing-builds

pyramid_sawing.file = %(here)s/logging.yaml
pyramid_sawing.transit_logging.enabled? = yes
Expand Down
2 changes: 2 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
'pyramid>=1.5',
'pyramid_jinja2',
'pyramid_multiauth',
'cnx-transforms',
'cnx-publishing-builds',
)
tests_require = [
'webtest',
Expand Down

0 comments on commit dc99b1a

Please sign in to comment.