Skip to content

Commit

Permalink
Merge pull request #620 from Kitware/new-release
Browse files Browse the repository at this point in the history
New release
  • Loading branch information
jourdain authored Apr 5, 2018
2 parents c06f09d + e72afa2 commit 7706fe5
Show file tree
Hide file tree
Showing 229 changed files with 39,993 additions and 7,730 deletions.
10 changes: 10 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
presets: [
'react',
['env', {
targets: {
browsers: ['last 2 versions'],
},
}],
],
}
83 changes: 49 additions & 34 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,41 +1,56 @@
var prettierConf = require('./prettier.config.js');

module.exports = {
extends: 'airbnb',
env: { browser: true },
extends: ['airbnb', 'prettier'],
rules: {
// ESLint ----------------------------------
'block-spacing': 0,
'global-require': 0,
'max-len': [1, 160, 4, {"ignoreUrls": true}],
'prettier/prettier': ['error', prettierConf],

// But we want the following
'no-multi-spaces': ["error", { exceptions: { "ImportDeclaration": true } }],
'no-param-reassign': ["error", { props: false }],
'no-unused-vars': ["error", { args: 'none' }],
'prefer-destructuring': ["error", { VariableDeclarator: { array: false, object: true }, AssignmentExpression: { array: false, object: false } }, { enforceForRenamedProperties: false }],
'import/no-extraneous-dependencies': 0, // Needed for tests
// 'no-mixed-operators': 'error', // Wish we can put it back with prettier

// Not for us
'jsx-a11y/label-has-for': 0,
'no-console': 0,
'no-mixed-operators': 0,
'no-multi-spaces': [2, { exceptions: { "ImportDeclaration": true } }],
'no-nested-ternary': 0,
'no-param-reassign': [2, { props: false }],
'no-plusplus': ["error", { "allowForLoopAfterthoughts": true }],
'no-prototype-builtins': 0,
'no-underscore-dangle': 0,
'no-unused-vars': [2, { args: 'none' }],
'no-var': 0,
'one-var': 0,
// imports ----------------------------------
'import/imports-first': 0,
'import/no-extraneous-dependencies': 0,
'no-plusplus': 0,
'import/no-named-as-default': 0,
'import/no-named-as-default-member': 0,
'import/no-unresolved': 0,
'import/prefer-default-export': 0,
// react ----------------------------------
'react/forbid-prop-types': 0,
'react/jsx-closing-bracket-location': 0,
'react/jsx-curly-spacing': 0,
'prefer-destructuring': 0, // Can have unwanted side effect
'react/jsx-filename-extension': 0,
'react/jsx-first-prop-new-line': 0,
'react/jsx-indent': 0,
'react/no-is-mounted': 1,
'react/prefer-es6-class': 0,
'react/prefer-stateless-function': 0,
// jsx-a11y ----------------------------------
'jsx-a11y/img-has-alt': 0,
'jsx-a11y/label-has-for': 0,
'jsx-a11y/no-static-element-interactions': 0,
}
'jsx-a11y/click-events-have-key-events': 0,
'jsx-a11y/no-noninteractive-element-interactions': 0,
'jsx-a11y/no-autofocus': 0,
'jsx-a11y/anchor-is-valid': 0,

// Introduced with new eslint
// and no time to fix them...
// [...]
'linebreak-style': 0,
'no-useless-escape': 0,
'no-nested-ternary': 0,
'react/forbid-prop-types': 0,
'react/no-array-index-key': 0,
'no-underscore-dangle': 0,
'import/prefer-default-export': 0,
'prefer-promise-reject-errors': 0,
},
plugins: [
'prettier'
],
globals: {
__BASE_PATH__: false,
VRFrameData: true,
},
'settings': {
'import/resolver': 'webpack'
},
env: {
es6: true,
browser: true,
},
};
51 changes: 29 additions & 22 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,35 +1,41 @@
os: linux
sudo: required
dist: trusty
group: travis_lts

language: python
python:
- "2.7"
- "3.4"
- "2.7"
- "3.6"

env:
- CXX=g++-4.8
- CXX=g++-4.8

addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-4.8
- libgif-dev
chrome: stable
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-4.8
- libgif-dev

notifications:
email:
recipients:
- sebastien.jourdain@kitware.com
- tristan.wright@kitware.com
- chris.harris@kitware.com
on_success: change
on_failure: always
email:
recipients:
- sebastien.jourdain@kitware.com
- chris.harris@kitware.com
on_success: change
on_failure: always

cache:
directories:
- node_modules
- $HOME/.cache
directories:
- node_modules
- $HOME/.cache

compiler:
- gcc

before_install:
# Update pip
- pip install -U pip virtualenv
Expand All @@ -39,8 +45,9 @@ before_install:
- if [ ${TRAVIS_PYTHON_VERSION:0:1} == "3" ]; then export PY3="true"; else export PY2="true"; fi
- if [ -n "${PY3}" ]; then export MONGO_VERSION=3.0.7; export PY_COVG="OFF"; else export MONGO_VERSION=2.6.11; export PY_COVG="ON"; fi
- export IGNORE_PLUGINS=celery_jobs,geospatial,google_analytics,hdfs_assetstore,jquery_widgets,metadata_extractor
- pip install -r girder/requirements.txt
- pip install -r girder/requirements-dev.txt
- pushd girder
- pip install -r requirements-dev.txt
- popd
- pip install girder/
- CACHE=$HOME/.cache source ./girder/scripts/install_mongo.sh
- mkdir /tmp/db
Expand All @@ -53,7 +60,7 @@ before_install:
# Install CMake
- CACHE=$HOME/.cache CMAKE_VERSION=3.1.0 CMAKE_SHORT_VERSION=3.1 source $HOME/build/girder/scripts/install_cmake.sh
# Install Node
- sudo curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash -
- sudo curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash -
- sudo apt-get install -y nodejs

install:
Expand Down
74 changes: 74 additions & 0 deletions config/rules-hpccloud.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
const autoprefixer = require('autoprefixer');

module.exports = [
{
test: /\.js$/,
exclude: /node_modules/,
use: [
{
loader: 'babel-loader',
options: {
presets: ['env', 'react'],
},
},
],
},
{
test: /\.mcss$/,
use: [
{ loader: 'style-loader' },
{
loader: 'css-loader',
options: {
localIdentName: '[name]-[local]_[sha512:hash:base32:5]',
modules: true,
},
},
{
loader: 'postcss-loader',
options: {
plugins: () => [autoprefixer('last 2 version', 'ie >= 10')],
},
},
],
},
{
test: /\.html$/,
loader: 'html-loader',
},
{
test: /\.isvg$/,
loader: 'html-loader?attrs=false',
},
{
test: /\.svg$/,
loader: 'svg-sprite-loader?runtimeCompat=true',
exclude: /fonts/,
},
{
test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
loader: 'url-loader?limit=60000&mimetype=application/font-woff',
},
{
test: /\.(ttf|eot|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
loader: 'url-loader?limit=60000',
include: /fonts/,
},
{
test: /\.(png|jpg)$/,
loader: 'url-loader?limit=8192',
},
{
test: /\.css$/,
use: [
{ loader: 'style-loader' },
{ loader: 'css-loader' },
{
loader: 'postcss-loader',
options: {
plugins: () => [autoprefixer('last 2 version', 'ie >= 10')],
},
},
],
},
];
13 changes: 13 additions & 0 deletions config/rules-linter.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
const path = require('path');

const eslintrcPath = path.join(__dirname, '../.eslintrc.js');

module.exports = [
{
test: /\.js$/,
exclude: /node_modules/,
loader: 'eslint-loader',
enforce: 'pre',
options: { configFile: eslintrcPath },
},
];
21 changes: 21 additions & 0 deletions config/rules-pvw.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
const autoprefixer = require('autoprefixer');

module.exports = [
{
test: /\.js$/,
include: /node_modules(\/|\\)paraviewweb(\/|\\)/,
use: [
{
loader: 'babel-loader',
options: {
presets: ['env', 'react'],
},
},
],
},
{
test: /\.c$/i,
include: /node_modules(\/|\\)paraviewweb(\/|\\)/,
loader: 'shader-loader',
},
];
14 changes: 14 additions & 0 deletions config/rules-simput.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
module.exports = [
{
test: /\.js$/,
include: /node_modules(\/|\\)simput(\/|\\)/,
use: [
{
loader: 'babel-loader',
options: {
presets: ['env', 'react'],
},
},
],
},
];
14 changes: 14 additions & 0 deletions config/rules-visualizer.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
module.exports = [
{
test: /\.js$/,
include: /node_modules(\/|\\)pvw-visualizer(\/|\\)/,
use: [
{
loader: 'babel-loader',
options: {
presets: ['env', 'react'],
},
},
],
},
];
19 changes: 19 additions & 0 deletions config/rules-vtkjs.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
module.exports = [
{
test: /\.glsl$/i,
include: /node_modules(\/|\\)vtk.js(\/|\\)/,
loader: 'shader-loader',
},
{
test: /\.js$/,
include: /node_modules(\/|\\)vtk.js(\/|\\)/,
use: [
{
loader: 'babel-loader',
options: {
presets: ['env'],
},
},
],
},
];
14 changes: 14 additions & 0 deletions config/rules-wslink.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
module.exports = [
{
test: /\.js$/,
include: /node_modules(\/|\\)wslink(\/|\\)/,
use: [
{
loader: 'babel-loader',
options: {
presets: ['env'],
},
},
],
},
];
402 changes: 65 additions & 337 deletions dist/HPCCloud.js

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions docs/content/docs/vagrant__introduction.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,18 @@ This can be adjusted in the following file (replace: HOSTNAME_OR_VALID_IP by the
}
```


Same for girder so `http://localhost:8080` properly reach girder

```js /opt/hpccloud/girder/girder/conf/girder.local.cfg
[global]
server.socket_host = "0.0.0.0"
server.socket_port = 8080
server.thread_pool = 100

[...]
```

## Running Celery by hand

This can be usefull to follow any runtime error live or if the taskflow did properly load.
Expand Down
Loading

0 comments on commit 7706fe5

Please sign in to comment.