Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .bowerrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"directory": "remoteappmanager/static/components/"
}
10 changes: 4 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ deps:
plat_packages="docker.io python3-venv"; \
fi; \
sudo apt-get install -o Dpkg::Options::="--force-confold" --force-yes -y $$plat_packages npm nodejs-legacy python3-pip
npm install
`npm bin`/bower install

.PHONY: pythondeps
pythondeps:
pip3 install --upgrade pip setuptools
# Currently set to 1.4.0dev fixing X-Forward behavior
npm install "git://github.com/jupyterhub/configurable-http-proxy.git#f54c6a46a235f17cb6c36046a913d37fa45ec95b"
pip3 install -r requirements.txt

.PHONY: devdeps
Expand All @@ -45,8 +45,6 @@ devdeps:
@echo "----------------------------"
pip3 install -r dev-requirements.txt -r doc-requirements.txt
sudo apt-get install phantomjs
sudo npm install -g jshint
sudo npm install -g node-qunit-phantomjs

.PHONY: develop
develop:
Expand Down Expand Up @@ -109,8 +107,8 @@ pythontest:
jstest:
@echo "Running javascript testsuite"
@echo "----------------------------"
jshint --config .jshintrc remoteappmanager/static/js/
node-qunit-phantomjs jstests/tests.html
`npm bin`/jshint --config .jshintrc remoteappmanager/static/js/
`npm bin`/node-qunit-phantomjs jstests/tests.html

.PHONY: seleniumtest
seleniumtest:
Expand Down
24 changes: 24 additions & 0 deletions bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"name": "simphony-remote-deps",
"version": "0.0.0",
"homepage": "https://github.com/simphony/simphony-remote",
"authors": [
"Stefano Borini <sborini@enthought.com>"
],
"ignore": [
"**/.*",
"node_modules",
"test",
"tests"
],
"dependencies": {
"bootstrap": "components/bootstrap#~3.1",
"font-awesome": "components/font-awesome#~4.1",
"jquery": "components/jquery#~2.0",
"moment": "~2.7",
"requirejs": "~2.1"
},
"devDependencies": {
"blanket": "jstest/components/blanket#^1.1.7"
}
}
5 changes: 3 additions & 2 deletions doc/source/deployment.rst
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,11 @@ Deployment of the complete system in a single machine/VM.

docker info

#. Create and activate a virtual environment::
#. Create and activate a virtual environment, then set the appropriate PATH for the node modules::

make venv
. venv/bin/activate
. venv/bin/activate
export PATH=`node bin`:$PATH

#. Install the python dependencies::

Expand Down
20 changes: 20 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"name": "simphony-remote-deps",
"version": "0.0.0",
"description": "SimPhoNy-remote nodejs dependencies",
"author": "Enthought",
"license": "BSD",
"repository": {
"type": "git",
"url": "https://github.com/simphony-remote/simphony-remote.git"
},
"dependencies": {
"bower": "*",
"configurable-http-proxy": "git://github.com/jupyterhub/configurable-http-proxy.git#f54c6a46a235f17cb6c36046a913d37fa45ec95b"
},
"devDependencies": {
"jshint": "*",
"node-qunit-phantomjs": "*"
}
}

29 changes: 0 additions & 29 deletions remoteappmanager/static/components/bootstrap/.bower.json

This file was deleted.

6 changes: 0 additions & 6 deletions remoteappmanager/static/components/bootstrap/.gitignore

This file was deleted.

18 changes: 0 additions & 18 deletions remoteappmanager/static/components/bootstrap/README.md

This file was deleted.

19 changes: 0 additions & 19 deletions remoteappmanager/static/components/bootstrap/bower.json

This file was deleted.

Loading