From 13dc975404d77aa5de0e198fa94c27fc9d26fc9c Mon Sep 17 00:00:00 2001 From: Stefan Verhoeven Date: Thu, 8 Jun 2017 13:50:02 +0200 Subject: [PATCH] Pin versions of dependencies During test installation some dependencies have changed to much. --- web/README.rst | 3 ++- web/production.ini-dist | 12 ++++++------ web/setup.py | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/web/README.rst b/web/README.rst index 0737556..b1e96bd 100644 --- a/web/README.rst +++ b/web/README.rst @@ -161,7 +161,8 @@ Then start uWSGI with: Minimize javascript ------------------- -Install Sencha SDK tools by following instructions at http://www.sencha.com/products/sencha-cmd . +Install Sencha SDK tools by following instructions at http://www.sencha.com/products/sencha-cmd use version 4.x.x. +Direct download https://cdn.sencha.com/cmd/4.0.5.87/SenchaCmd-4.0.5.87-linux-x64.run.zip. Then concatenate and compress javascript with: diff --git a/web/production.ini-dist b/web/production.ini-dist index a6c0110..98b01cf 100644 --- a/web/production.ini-dist +++ b/web/production.ini-dist @@ -21,7 +21,7 @@ cookie.path = magma # It's not needed to create a user account # A route requiring permission will create a guest account with an unique id. # The login/logout button will be hidden as they have no function -auto_register = false +auto_register = true # force restriction so calculations go faster restricted = false @@ -31,11 +31,11 @@ access_token.expires_in = 30758400 # account used for updating status of jobs monitor_user = joblauncher -# user database +# user database (directory should exist) sqlalchemy.url = sqlite:///%(here)s/data/users.db?timeout=30 # In magmaweb/static/ which ExtJS directory to use -extjsroot = extjs-4.2.0 +extjsroot = ext-4.2.1.883 jobfactory.root_dir = %(here)s/data/jobs # url to which job request is submitted @@ -46,9 +46,9 @@ jobfactory.submit_url = http://localhost:9998/job # Example script: # tar -zxf Magma-1.1.tar.gz # Magma-1.1/magma "$@" -jobfactory.init_script: tar -zxf Magma-1.1-rh57-x86_64.tar.gz - export PATH=Magma-1.1:$PATH -jobfactory.tarball = /home/stefanv/workspace/magma/job/Magma-1.1.tar.gz +#jobfactory.init_script: tar -zxf Magma-1.1-rh57-x86_64.tar.gz +# export PATH=Magma-1.1:$PATH +#jobfactory.tarball = /home/stefanv/workspace/magma/job/Magma-1.1.tar.gz # To submit job to local installation of MAGMaJob jobfactory.init_script = . /home/stefanv/workspace/magma/env/bin/activate diff --git a/web/setup.py b/web/setup.py index 87a98b9..a3b42b9 100644 --- a/web/setup.py +++ b/web/setup.py @@ -9,7 +9,7 @@ requires = ['pyramid==1.4.5', 'SQLAlchemy>=0.8.0,<1.1.0', - 'pyramid_tm', + 'pyramid_tm==0.11', 'pyramid_multiauth', 'pyramid_macauth', 'zope.sqlalchemy',