Skip to content

Commit

Permalink
Pin versions of dependencies
Browse files Browse the repository at this point in the history
During test installation some dependencies have changed to much.
  • Loading branch information
sverhoeven committed Jun 8, 2017
1 parent 35feb10 commit 13dc975
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
3 changes: 2 additions & 1 deletion web/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
12 changes: 6 additions & 6 deletions web/production.ini-dist
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion web/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down

0 comments on commit 13dc975

Please sign in to comment.