Skip to content

Commit

Permalink
Project maintenance.
Browse files Browse the repository at this point in the history
Make sure scaffolds run in dojo dist mode.
Update changes.
Update dependency list for scaffolds.
  • Loading branch information
Koen Van Daele committed Sep 5, 2014
1 parent 49200d2 commit ee3d86e
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 18 deletions.
3 changes: 2 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@

- Update to skosprovider_sqlalchemy_ 0.2.1.
- Update to skosprovider_rdf_ 0.1.3 This fixes an issue with RDF having some
SKOS elements in the wrong namespace.
SKOS elements in the wrong namespace. Also added a missing dependency on
skosprovider_rdf_ to setup.py
- Updated the Travis build file to run a basic dojo build and test for build
failures.

Expand Down
4 changes: 4 additions & 0 deletions atramhasis/scaffolds/atramhasis_demo/development.ini_tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ sqlalchemy.url = sqlite:///%(here)s/{{package}}.sqlite

jinja2.i18n.domain = atramhasis

# Run dojo from source (src) or distribution (dist)
# If unspecified, defaults to src.
dojo.mode = dist

persona.secret = sosecret
persona.audiences = http://localhost:6543

Expand Down
19 changes: 9 additions & 10 deletions atramhasis/scaffolds/atramhasis_demo/requirements.txt_tmpl
Original file line number Diff line number Diff line change
@@ -1,31 +1,30 @@

# pyramid
pyramid==1.5
pyramid==1.5.1
pyramid-tm==0.7
pyramid_persona==1.5

# skos
skosprovider>=0.3.0
skosprovider==0.3.0
#-e git+https://github.com/koenedaele/skosprovider.git#egg=skosprovider
skosprovider_sqlalchemy>=0.2.0
skosprovider_sqlalchemy==0.2.1
#-e git+https://github.com/koenedaele/skosprovider_sqlalchemy.git#egg=skosprovider_sqlalchemy
#pyramid_skosprovider>=0.2.0
-e git+https://github.com/koenedaele/pyramid_skosprovider.git#egg=pyramid_skosprovider
skosprovider_rdf>=0.1.1
pyramid_skosprovider==0.3.0
#-e git+https://github.com/koenedaele/pyramid_skosprovider.git#egg=pyramid_skosprovider
skosprovider_rdf==0.1.3
#-e git+https://github.com/OnroerendErfgoed/skosprovider_rdf#egg=skosprovider_rdf

# sqlalchemy
sqlalchemy==0.9.4
sqlalchemy==0.9.7
zope.sqlalchemy==0.7.4
transaction==1.4.3

# jinja2
jinja2==2.7.2
pyramid-jinja2==1.10
pyramid-jinja2==2.3.3
Babel==1.3

# alembic
alembic==0.6.4
alembic==0.6.5

# colander
colander>=1.0b1
Expand Down
4 changes: 4 additions & 0 deletions atramhasis/scaffolds/atramhasis_scaffold/development.ini_tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ jinja2.directories =
atramhasis:templates
sqlalchemy.url = sqlite:///%(here)s/{{package}}.sqlite

# Run dojo from source (src) or distribution (dist)
# If unspecified, defaults to src.
dojo.mode = dist

jinja2.i18n.domain = atramhasis

# By default, the toolbar only appears for clients from IP addresses
Expand Down
16 changes: 9 additions & 7 deletions atramhasis/scaffolds/atramhasis_scaffold/requirements.txt_tmpl
Original file line number Diff line number Diff line change
@@ -1,28 +1,30 @@

# pyramid
pyramid==1.5
pyramid==1.5.1
pyramid-tm==0.7

# skos
skosprovider>=0.3.0
skosprovider==0.3.0
#-e git+https://github.com/koenedaele/skosprovider.git#egg=skosprovider
skosprovider_sqlalchemy>=0.2.0
skosprovider_sqlalchemy==0.2.1
#-e git+https://github.com/koenedaele/skosprovider_sqlalchemy.git#egg=skosprovider_sqlalchemy
pyramid_skosprovider>=0.2.0
pyramid_skosprovider==0.3.0
#-e git+https://github.com/koenedaele/pyramid_skosprovider.git#egg=pyramid_skosprovider
skosprovider_rdf==0.1.3
#-e git+https://github.com/OnroerendErfgoed/skosprovider_rdf#egg=skosprovider_rdf

# sqlalchemy
sqlalchemy==0.9.4
sqlalchemy==0.9.7
zope.sqlalchemy==0.7.4
transaction==1.4.3

# jinja2
jinja2==2.7.2
pyramid-jinja2==1.10
pyramid-jinja2==2.3.3
Babel==1.3

# alembic
alembic==0.6.4
alembic==0.6.5

# colander
colander>=1.0b1
Expand Down

0 comments on commit ee3d86e

Please sign in to comment.