Skip to content

Commit

Permalink
Update CHANGELOG for minor version update
Browse files Browse the repository at this point in the history
  • Loading branch information
mjclawar committed Aug 20, 2017
1 parent d0949c0 commit 0feff74
Show file tree
Hide file tree
Showing 7 changed files with 325 additions and 121 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Change Log

0.2.1
### Changed
- Updated dev requirements

0.2.0
### Added
- `concat` to concatenate multiple `DataFrame`s or `Series`
Expand Down
6 changes: 0 additions & 6 deletions dist/core/frame.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,18 +47,12 @@ var _generic = require('./generic');

var _generic2 = _interopRequireDefault(_generic);

var _multiindex = require('./multiindex');

var _series = require('./series');

var _series2 = _interopRequireDefault(_series);

var _utils = require('./utils');

var _concat = require('./reshape/concat');

var _concat2 = _interopRequireDefault(_concat);

function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

var parseArrayToSeriesMap = function parseArrayToSeriesMap(array, index) {
Expand Down
391 changes: 301 additions & 90 deletions package-lock.json

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,24 @@
"immutable": "^3.8.1"
},
"devDependencies": {
"babel-cli": "^6.24.1",
"babel-cli": "^6.26.0",
"babel-eslint": "^7.2.3",
"babel-jest": "^20.0.3",
"babel-loader": "^7.1.1",
"babel-loader": "^7.1.2",
"babel-plugin-transform-decorators-legacy": "^1.3.4",
"babel-plugin-transform-flow-strip-types": "^6.22.0",
"babel-plugin-transform-react-jsx": "^6.24.1",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-preset-es2015": "^6.24.1",
"babel-preset-react": "^6.24.1",
"babel-preset-stage-2": "^6.24.1",
"eslint": "^4.4.1",
"eslint": "^4.5.0",
"eslint-config-airbnb": "^15.1.0",
"eslint-plugin-flowtype": "^2.35.0",
"eslint-plugin-import": "^2.7.0",
"eslint-plugin-jsx-a11y": "^6.0.2",
"eslint-plugin-react": "^7.2.0",
"flow-bin": "^0.52.0",
"eslint-plugin-react": "^7.2.1",
"flow-bin": "^0.53.1",
"flow-remove-types": "^1.2.1",
"jest": "^20.0.4",
"jest-cli": "^20.0.4",
Expand Down
2 changes: 1 addition & 1 deletion scripts/generate-docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ mkdir docs
CORE_DIR=core

# Iterate over the directories
for rel_dir in ${CORE_DIR}
for rel_dir in ${CORE_DIR} core/reshape
do
ES6_DIR=src/es6/${rel_dir%*/}
DOC_DIR=docs/${rel_dir%*/}/
Expand Down
13 changes: 6 additions & 7 deletions src/es6/core/frame.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,11 @@ import Immutable from 'immutable';

import { InvalidAxisError } from './exceptions';
import NDFrame from './generic';
import { MultiIndex } from './multiindex';
// import { MultiIndex } from './multiindex';
import Series, { _concatSeries } from './series';
// import { Workbook, Sheet } from './structs'; TODO
import { enumerate, nonMergeColumns, intersectingColumns, parseIndex,
OP_CUMSUM, OP_CUMMUL, OP_CUMMIN, OP_CUMMAX, generateCumulativeFunc } from './utils';
import concat from './reshape/concat';


declare type T_LIST = Immutable.List
Expand Down Expand Up @@ -1587,13 +1586,13 @@ export default class DataFrame extends NDFrame {
* const df2 = new DataFrame([{x: 2, y: 2}, {x: 3, y: 3}], {index: [2, 3]});
*
* // Returns DataFrame(
* [{x: 1, y: 2}, {x: 2, y: 3}, {x: 2, y: 2}, {x: 3, y: 3}],
* {index: [1, 2, 2, 3]});
* // [{x: 1, y: 2}, {x: 2, y: 3}, {x: 2, y: 2}, {x: 3, y: 3}],
* // {index: [1, 2, 2, 3]});
* df1.append(df2);
*
* // Returns DataFrame(
* [{x: 1, y: 2}, {x: 2, y: 3}, {x: 2, y: 2}, {x: 3, y: 3}],
* {index: [0, 1, 2, 3]});
* // [{x: 1, y: 2}, {x: 2, y: 3}, {x: 2, y: 2}, {x: 3, y: 3}],
* // {index: [0, 1, 2, 3]});
* df1.append(df2, true);
*/
append(other: DataFrame, ignore_index: boolean = false): DataFrame {
Expand All @@ -1614,7 +1613,7 @@ export default class DataFrame extends NDFrame {
* const df1 = new DataFrame([{x: 1, y: 2}, {x: 2, y: 3}, {x: 3, y: 4}], {index: [1, 2, 3]});
*
* // Returns DataFrame(
* [{1: 1, 2: 2, 3: 3}, {1: 2, 2: 3, 3: 4}], {index: ['x', 'y']});
* // [{1: 1, 2: 2, 3: 3}, {1: 2, 2: 3, 3: 4}], {index: ['x', 'y']});
* df1.transpose();
*/
transpose(): DataFrame {
Expand Down
20 changes: 8 additions & 12 deletions src/js/core/frame.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 0feff74

Please sign in to comment.