Skip to content

Commit

Permalink
Merge pull request #156 from redbearsam/feature/parameter_names
Browse files Browse the repository at this point in the history
Feature/parameter names
  • Loading branch information
matt-hooper authored Apr 3, 2019
2 parents ec08bd5 + 2773b18 commit d84ef26
Show file tree
Hide file tree
Showing 75 changed files with 796 additions and 547 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ matrix:

- python: "3.6"
language: python
env: TEST=PYTHON
env: TEST=PYTHON_TABLE
cache: pip
services: docker

Expand All @@ -44,8 +44,8 @@ script:
- if [ "$TEST" = "WASM" ]; then PSP_DOCKER=1 yarn test --quiet; fi
- if [ "$TEST" = "CPP" ]; then PSP_DOCKER=1 yarn build_cpp; fi
- if [ "$TEST" = "CPP" ]; then PSP_DOCKER=1 yarn test_cpp; fi
- if [ "$TEST" = "PYTHON" ]; then PSP_DOCKER=1 yarn build_python; fi
- if [ "$TEST" = "PYTHON" ]; then PSP_DOCKER=1 yarn lint_python; fi
- if [ "$TEST" = "PYTHON" ]; then PSP_DOCKER=1 yarn test_python; fi
- if [ "$TEST" = "PYTHON_TABLE" ]; then PSP_DOCKER=1 yarn build_python:table; fi
- if [ "$TEST" = "PYTHON_TABLE" ]; then PSP_DOCKER=1 yarn lint_python:table; fi
- if [ "$TEST" = "PYTHON_TABLE" ]; then PSP_DOCKER=1 yarn test_python:table; fi
- if [ "$TEST" = "CPP_OSX" ]; then yarn build_cpp; fi
- if [ "$TEST" = "CPP_OSX" ]; then yarn test_cpp; fi
28 changes: 27 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,39 @@
# Changelog

# [0.2.21] - 2019-04-03
### Added
* [#488](https://github.com/jpmorganchase/perspective/pull/488) Candlestick and OHLC charts for `perspective-viewer-d3fc`.
* [#479](https://github.com/jpmorganchase/perspective/pull/479) Added zooming, label rotation and new scatter types to `perspective-viewer-d3fc`.
* [#498](https://github.com/jpmorganchase/perspective/pull/498) Bollinger bands, moving averages, draggable legends for `perspective-viewer-d3fc`.
* [#489](https://github.com/jpmorganchase/perspective/pull/489) Header sort indicator for `perspective-viewer-hypergrid`.
* [#506](https://github.com/jpmorganchase/perspective/pull/506) Header click-to-sort for `perspective-viewer-hypergrid`, improved scroll performance.
* [#516](https://github.com/jpmorganchase/perspective/pull/516) New `perspective-cli` package for convenient Perspective operations from the command line.
* [#483](https://github.com/jpmorganchase/perspective/pull/483) Performance improvement for `perspective.to_*` methods.
* [#485](https://github.com/jpmorganchase/perspective/pull/485) Added window support to `to_arrow()` method.
* [#486](https://github.com/jpmorganchase/perspective/pull/486) Disabled delta calculation for `on_update` method by default, improving update performance.
* [#503](https://github.com/jpmorganchase/perspective/pull/503) Added `get_config()` API to `perspective.table`.
* [#512](https://github.com/jpmorganchase/perspective/pull/512) Column context labels are now configurable via the plugin API.

### Fixes
* [#478](https://github.com/jpmorganchase/perspective/pull/478) Fixed broken filtering on `date` type columns.
* [#486](https://github.com/jpmorganchase/perspective/pull/486) Fixed un-pivoted `view.to_schema()` method to only show visible columns.
* [#490](https://github.com/jpmorganchase/perspective/pull/490) Fixed bug which removed filter columns when dragged from active columns list.
* [#491](https://github.com/jpmorganchase/perspective/pull/491) Fixed `perspective-webpack-plugin` load_path issue when `perspective-*` modules are not at the top-level of `node_modules`.
* [#493](https://github.com/jpmorganchase/perspective/pull/493) Fixed `sum abs` aggregate type.
* [#501](https://github.com/jpmorganchase/perspective/pull/501) Fixed pivot on categories containing nulls bug.
* [#502](https://github.com/jpmorganchase/perspective/pull/502) Fixed expand/collapse on 2-sided contexts bug.

### Internal
* [#497](https://github.com/jpmorganchase/perspective/pull/497) Added local puppeteer mode for testing.

## [0.2.20] - 2019-03-07
### Added
* [#463](https://github.com/jpmorganchase/perspective/pull/463) D3FC plugin features Area and Heatmap charts, hierarchial axes have been added to all chart types, as well as a host of additioanl improvements.
* [#473](https://github.com/jpmorganchase/perspective/pull/473) Performance improvement to `to_*()` output methods.
* [#469](https://github.com/jpmorganchase/perspective/pull/469) `open()` in the node.js API now takes a `table()` argument so it may be retained in the invoking code.
* [#475](https://github.com/jpmorganchase/perspective/pull/475) Added `not in` filter type to `<perspective-viewer>`.

### Fixed
### Fixes
* [#470](https://github.com/jpmorganchase/perspective/pull/470) Fixed Jupyterlab extension dist
* [#471](https://github.com/jpmorganchase/perspective/pull/471) Fixed CSV parse issue when converting `integer` to `string` via schema.

Expand Down
6 changes: 3 additions & 3 deletions cpp/perspective/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ elseif(PSP_CPP_BUILD OR PSP_PYTHON_BUILD)
# PYTHON BINDINGS BUILD #
#########################
include_directories("/usr/local/include/python3.7m") # FIXME
include_directories("${CMAKE_SOURCE_DIR}/../../python/perspective/include")
include_directories("${CMAKE_SOURCE_DIR}/../../python/table/perspective/include")
find_package( PythonInterp 3.7 REQUIRED )
find_package( PythonLibs 3.7 REQUIRED )
include_directories( ${PYTHON_INCLUDE_DIRS} )
Expand Down Expand Up @@ -382,14 +382,14 @@ elseif(PSP_CPP_BUILD OR PSP_PYTHON_BUILD)
########################
# Python extra targets #
########################
add_library(psp SHARED ${SOURCE_FILES} ${CMAKE_SOURCE_DIR}/../../python/perspective/src/numpy.cpp ${HEADER_FILES})
add_library(psp SHARED ${SOURCE_FILES} ${CMAKE_SOURCE_DIR}/../../python/table/perspective/src/numpy.cpp ${HEADER_FILES})
target_compile_definitions(psp PRIVATE PSP_ENABLE_PYTHON=1)
target_link_libraries(psp ${BOOST_PYTHON})
target_link_libraries(psp ${BOOST_NUMPY})
target_link_libraries(psp ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})
set(CMAKE_SHARED_LIBRARY_SUFFIX .so)

add_library(binding SHARED ${CMAKE_SOURCE_DIR}/../../python/perspective/src/python.cpp)
add_library(binding SHARED ${CMAKE_SOURCE_DIR}/../../python/table/perspective/src/python.cpp)
target_compile_definitions(binding PRIVATE PSP_ENABLE_PYTHON=1)
target_link_libraries(binding psp)
target_link_libraries(binding tbb)
Expand Down
2 changes: 0 additions & 2 deletions cpp/perspective/src/cpp/emscripten.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1999,8 +1999,6 @@ using namespace perspective::binding;
*/
int
main(int argc, char** argv) {
std::cout << "Perspective initialized successfully" << std::endl;

// clang-format off
EM_ASM({

Expand Down
7 changes: 0 additions & 7 deletions examples/cli/README.md

This file was deleted.

31 changes: 0 additions & 31 deletions examples/cli/index.css

This file was deleted.

20 changes: 0 additions & 20 deletions examples/cli/package.json

This file was deleted.

62 changes: 0 additions & 62 deletions examples/cli/server.js

This file was deleted.

10 changes: 5 additions & 5 deletions examples/git_history/package.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"name": "git-history",
"private": true,
"version": "0.2.20",
"version": "0.2.21",
"description": "An example of Perspective's own GIT history rendered in Perspective.",
"scripts": {
"start": "node server.js"
},
"keywords": [],
"license": "Apache-2.0",
"dependencies": {
"@jpmorganchase/perspective": "^0.2.20",
"@jpmorganchase/perspective-viewer": "^0.2.20",
"@jpmorganchase/perspective-viewer-highcharts": "^0.2.20",
"@jpmorganchase/perspective-viewer-hypergrid": "^0.2.20"
"@jpmorganchase/perspective": "^0.2.21",
"@jpmorganchase/perspective-viewer": "^0.2.21",
"@jpmorganchase/perspective-viewer-highcharts": "^0.2.21",
"@jpmorganchase/perspective-viewer-hypergrid": "^0.2.21"
}
}
10 changes: 5 additions & 5 deletions examples/simple/package.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"name": "simple",
"private": true,
"version": "0.2.20",
"version": "0.2.21",
"description": "A collection of simple client-side Perspective examples.",
"scripts": {
"start": "node server.js"
},
"keywords": [],
"license": "Apache-2.0",
"dependencies": {
"@jpmorganchase/perspective": "^0.2.20",
"@jpmorganchase/perspective-viewer": "^0.2.20",
"@jpmorganchase/perspective-viewer-highcharts": "^0.2.20",
"@jpmorganchase/perspective-viewer-hypergrid": "^0.2.20"
"@jpmorganchase/perspective": "^0.2.21",
"@jpmorganchase/perspective-viewer": "^0.2.21",
"@jpmorganchase/perspective-viewer-highcharts": "^0.2.21",
"@jpmorganchase/perspective-viewer-hypergrid": "^0.2.21"
}
}
12 changes: 6 additions & 6 deletions examples/webpack/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "webpack",
"private": true,
"version": "0.2.20",
"version": "0.2.21",
"description": "An example of using the Perspective Webpack plugin to build a JS file with Webpack.",
"scripts": {
"start": "npm-run-all -l -p webpack-watch host:app host:bundles",
Expand All @@ -12,13 +12,13 @@
"keywords": [],
"license": "Apache-2.0",
"dependencies": {
"@jpmorganchase/perspective": "^0.2.20",
"@jpmorganchase/perspective-viewer": "^0.2.20",
"@jpmorganchase/perspective-viewer-highcharts": "^0.2.20",
"@jpmorganchase/perspective-viewer-hypergrid": "^0.2.20"
"@jpmorganchase/perspective": "^0.2.21",
"@jpmorganchase/perspective-viewer": "^0.2.21",
"@jpmorganchase/perspective-viewer-highcharts": "^0.2.21",
"@jpmorganchase/perspective-viewer-hypergrid": "^0.2.21"
},
"devDependencies": {
"@jpmorganchase/perspective-webpack-plugin": "^0.2.20",
"@jpmorganchase/perspective-webpack-plugin": "^0.2.21",
"css-loader": "^0.28.7",
"http-server": "^0.11.1",
"less-loader": "^4.0.5",
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
],
"npmClient": "yarn",
"useWorkspaces": true,
"version": "0.2.20"
"version": "0.2.21"
}
6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,16 @@
"build": "node scripts/build.js",
"build_cpp": "node scripts/build_cpp.js",
"build_python": "node scripts/build_python.js",
"install_python": "cd python && python3 setup.py install",
"build_python:table": "node scripts/build_python_table.js",
"install_python": "cd python/table && python3 setup.py install",
"install_python:table": "cd python/perspective && python3 setup.py install",
"bench": "node scripts/bench.js",
"docs": "lerna run docs --silent --stream",
"autodocs": "node scripts/docs.js",
"test": "node scripts/test.js",
"test_cpp": "node scripts/test_cpp.js",
"test_python": "node scripts/test_python.js",
"test_python:table": "node scripts/test_python_table.js",
"clean": "node scripts/clean.js",
"start": "lerna run start --stream --scope",
"precommit": "npm run lint",
Expand All @@ -66,6 +69,7 @@
"lint:eslint": "eslint packages/*/src/**/*.js packages/*/test/**/*.js examples/*/*.js",
"lint:cpp": "node scripts/lint_cpp.js",
"lint_python": "node scripts/lint_python.js",
"lint_python:table": "node scripts/lint_python_table.js",
"fix:es": "npm run lint:eslint -- --fix",
"fix:cpp": "node scripts/fix_cpp.js",
"fix:less": "prettier --tab-width 4 --write packages/**/src/less/*.less",
Expand Down
24 changes: 24 additions & 0 deletions packages/perspective-cli/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Perspective CLI

```bash
Usage: perspective [options] [command]

A convenient command-line client for Perspective.js. Can convert between Perspective supported format, or host a local web server.

Options:
-V, --version output the version number
-h, --help output usage information

Commands:
convert [options] [filename] Convert a file into a new format. Reads from STDIN if no filename is provided
Options:
-f, --format <format> Which output format to use: arrow, csv, columns, json.
-o, --output <filename> Filename to write to. If not supplied, writes to STDOUT
-h, --help output usage information

host [options] [filename] Host a file on a local Websocket/HTTP server using a server-side Perspective. Reads from STDIN if no filename is provided
Options:
-p, --port <port> Which port to bind to (default: 8080)
-o, --open Open a browser automagically
-h, --help output usage information
```
21 changes: 21 additions & 0 deletions packages/perspective-cli/babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
module.exports = {
presets: [
[
"@babel/preset-env",
{
useBuiltIns: "usage"
}
]
],
sourceType: "unambiguous",
plugins: [
["@babel/plugin-proposal-decorators", {legacy: true}],
"transform-custom-element-classes",
[
"@babel/plugin-transform-for-of",
{
loose: true
}
]
]
};
Loading

0 comments on commit d84ef26

Please sign in to comment.