From ee3d86e03908201f3a57bb108aeb38be5400c304 Mon Sep 17 00:00:00 2001 From: Koen Van Daele Date: Fri, 5 Sep 2014 16:05:16 +0200 Subject: [PATCH] Project maintenance. Make sure scaffolds run in dojo dist mode. Update changes. Update dependency list for scaffolds. --- CHANGES.rst | 3 ++- .../atramhasis_demo/development.ini_tmpl | 4 ++++ .../atramhasis_demo/requirements.txt_tmpl | 19 +++++++++---------- .../atramhasis_scaffold/development.ini_tmpl | 4 ++++ .../atramhasis_scaffold/requirements.txt_tmpl | 16 +++++++++------- 5 files changed, 28 insertions(+), 18 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 7122ba78..428905fc 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -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. diff --git a/atramhasis/scaffolds/atramhasis_demo/development.ini_tmpl b/atramhasis/scaffolds/atramhasis_demo/development.ini_tmpl index 637a3c7b..13f26b65 100644 --- a/atramhasis/scaffolds/atramhasis_demo/development.ini_tmpl +++ b/atramhasis/scaffolds/atramhasis_demo/development.ini_tmpl @@ -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 diff --git a/atramhasis/scaffolds/atramhasis_demo/requirements.txt_tmpl b/atramhasis/scaffolds/atramhasis_demo/requirements.txt_tmpl index 84ee0e5e..b32532ae 100644 --- a/atramhasis/scaffolds/atramhasis_demo/requirements.txt_tmpl +++ b/atramhasis/scaffolds/atramhasis_demo/requirements.txt_tmpl @@ -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 diff --git a/atramhasis/scaffolds/atramhasis_scaffold/development.ini_tmpl b/atramhasis/scaffolds/atramhasis_scaffold/development.ini_tmpl index cc652b7e..58662896 100644 --- a/atramhasis/scaffolds/atramhasis_scaffold/development.ini_tmpl +++ b/atramhasis/scaffolds/atramhasis_scaffold/development.ini_tmpl @@ -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 diff --git a/atramhasis/scaffolds/atramhasis_scaffold/requirements.txt_tmpl b/atramhasis/scaffolds/atramhasis_scaffold/requirements.txt_tmpl index ccf57717..b32532ae 100644 --- a/atramhasis/scaffolds/atramhasis_scaffold/requirements.txt_tmpl +++ b/atramhasis/scaffolds/atramhasis_scaffold/requirements.txt_tmpl @@ -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