Skip to content

Commit 0feff74

Browse files
committed
Update CHANGELOG for minor version update
1 parent d0949c0 commit 0feff74

File tree

7 files changed

+325
-121
lines changed

7 files changed

+325
-121
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Change Log
22

3+
0.2.1
4+
### Changed
5+
- Updated dev requirements
6+
37
0.2.0
48
### Added
59
- `concat` to concatenate multiple `DataFrame`s or `Series`

dist/core/frame.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,18 +47,12 @@ var _generic = require('./generic');
4747

4848
var _generic2 = _interopRequireDefault(_generic);
4949

50-
var _multiindex = require('./multiindex');
51-
5250
var _series = require('./series');
5351

5452
var _series2 = _interopRequireDefault(_series);
5553

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

58-
var _concat = require('./reshape/concat');
59-
60-
var _concat2 = _interopRequireDefault(_concat);
61-
6256
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
6357

6458
var parseArrayToSeriesMap = function parseArrayToSeriesMap(array, index) {

package-lock.json

Lines changed: 301 additions & 90 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,24 @@
2020
"immutable": "^3.8.1"
2121
},
2222
"devDependencies": {
23-
"babel-cli": "^6.24.1",
23+
"babel-cli": "^6.26.0",
2424
"babel-eslint": "^7.2.3",
2525
"babel-jest": "^20.0.3",
26-
"babel-loader": "^7.1.1",
26+
"babel-loader": "^7.1.2",
2727
"babel-plugin-transform-decorators-legacy": "^1.3.4",
2828
"babel-plugin-transform-flow-strip-types": "^6.22.0",
2929
"babel-plugin-transform-react-jsx": "^6.24.1",
3030
"babel-plugin-transform-runtime": "^6.23.0",
3131
"babel-preset-es2015": "^6.24.1",
3232
"babel-preset-react": "^6.24.1",
3333
"babel-preset-stage-2": "^6.24.1",
34-
"eslint": "^4.4.1",
34+
"eslint": "^4.5.0",
3535
"eslint-config-airbnb": "^15.1.0",
3636
"eslint-plugin-flowtype": "^2.35.0",
3737
"eslint-plugin-import": "^2.7.0",
3838
"eslint-plugin-jsx-a11y": "^6.0.2",
39-
"eslint-plugin-react": "^7.2.0",
40-
"flow-bin": "^0.52.0",
39+
"eslint-plugin-react": "^7.2.1",
40+
"flow-bin": "^0.53.1",
4141
"flow-remove-types": "^1.2.1",
4242
"jest": "^20.0.4",
4343
"jest-cli": "^20.0.4",

scripts/generate-docs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ mkdir docs
66
CORE_DIR=core
77

88
# Iterate over the directories
9-
for rel_dir in ${CORE_DIR}
9+
for rel_dir in ${CORE_DIR} core/reshape
1010
do
1111
ES6_DIR=src/es6/${rel_dir%*/}
1212
DOC_DIR=docs/${rel_dir%*/}/

src/es6/core/frame.js

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@ import Immutable from 'immutable';
88

99
import { InvalidAxisError } from './exceptions';
1010
import NDFrame from './generic';
11-
import { MultiIndex } from './multiindex';
11+
// import { MultiIndex } from './multiindex';
1212
import Series, { _concatSeries } from './series';
1313
// import { Workbook, Sheet } from './structs'; TODO
1414
import { enumerate, nonMergeColumns, intersectingColumns, parseIndex,
1515
OP_CUMSUM, OP_CUMMUL, OP_CUMMIN, OP_CUMMAX, generateCumulativeFunc } from './utils';
16-
import concat from './reshape/concat';
1716

1817

1918
declare type T_LIST = Immutable.List
@@ -1587,13 +1586,13 @@ export default class DataFrame extends NDFrame {
15871586
* const df2 = new DataFrame([{x: 2, y: 2}, {x: 3, y: 3}], {index: [2, 3]});
15881587
*
15891588
* // Returns DataFrame(
1590-
* [{x: 1, y: 2}, {x: 2, y: 3}, {x: 2, y: 2}, {x: 3, y: 3}],
1591-
* {index: [1, 2, 2, 3]});
1589+
* // [{x: 1, y: 2}, {x: 2, y: 3}, {x: 2, y: 2}, {x: 3, y: 3}],
1590+
* // {index: [1, 2, 2, 3]});
15921591
* df1.append(df2);
15931592
*
15941593
* // Returns DataFrame(
1595-
* [{x: 1, y: 2}, {x: 2, y: 3}, {x: 2, y: 2}, {x: 3, y: 3}],
1596-
* {index: [0, 1, 2, 3]});
1594+
* // [{x: 1, y: 2}, {x: 2, y: 3}, {x: 2, y: 2}, {x: 3, y: 3}],
1595+
* // {index: [0, 1, 2, 3]});
15971596
* df1.append(df2, true);
15981597
*/
15991598
append(other: DataFrame, ignore_index: boolean = false): DataFrame {
@@ -1614,7 +1613,7 @@ export default class DataFrame extends NDFrame {
16141613
* const df1 = new DataFrame([{x: 1, y: 2}, {x: 2, y: 3}, {x: 3, y: 4}], {index: [1, 2, 3]});
16151614
*
16161615
* // Returns DataFrame(
1617-
* [{1: 1, 2: 2, 3: 3}, {1: 2, 2: 3, 3: 4}], {index: ['x', 'y']});
1616+
* // [{1: 1, 2: 2, 3: 3}, {1: 2, 2: 3, 3: 4}], {index: ['x', 'y']});
16181617
* df1.transpose();
16191618
*/
16201619
transpose(): DataFrame {

src/js/core/frame.js

Lines changed: 8 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)