Skip to content

Commit 8ebf233

Browse files
committed
Merge branch 'dev' of https://github.com/javascriptdata/danfojs into JanKaul-esmodule
2 parents 23243dd + c9cc17d commit 8ebf233

File tree

5 files changed

+20
-17
lines changed

5 files changed

+20
-17
lines changed

src/danfojs-base/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"eslint": "^7.1.0",
4646
"ify-loader": "^1.1.0",
4747
"install-peers": "^1.0.3",
48-
"karma": "6.3.14",
48+
"karma": "6.3.16",
4949
"karma-browserify": "7.0.0",
5050
"karma-chai": "^0.1.0",
5151
"karma-chrome-launcher": "^3.1.0",

src/danfojs-base/yarn.lock

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4412,10 +4412,10 @@ karma-mocha@^2.0.1:
44124412
dependencies:
44134413
minimist "^1.2.3"
44144414

4415-
karma@6.3.14:
4416-
version "6.3.14"
4417-
resolved "https://registry.yarnpkg.com/karma/-/karma-6.3.14.tgz#1ed57a489249b9260bc604325ae333766d4cddc9"
4418-
integrity sha512-SDFoU5F4LdosEiUVWUDRPCV/C1zQRNtIakx7rWkigf7R4sxGADlSEeOma4S1f/js7YAzvqLW92ByoiQptg+8oQ==
4415+
karma@6.3.16:
4416+
version "6.3.16"
4417+
resolved "https://registry.yarnpkg.com/karma/-/karma-6.3.16.tgz#76d1a705fd1cf864ee5ed85270b572641e0958ef"
4418+
integrity sha512-nEU50jLvDe5yvXqkEJRf8IuvddUkOY2x5Xc4WXHz6dxINgGDrgD2uqQWeVrJs4hbfNaotn+HQ1LZJ4yOXrL7xQ==
44194419
dependencies:
44204420
body-parser "^1.19.0"
44214421
braces "^3.0.2"
@@ -4432,6 +4432,7 @@ karma@6.3.14:
44324432
log4js "^6.4.1"
44334433
mime "^2.5.2"
44344434
minimatch "^3.0.4"
4435+
mkdirp "^0.5.5"
44354436
qjobs "^1.2.0"
44364437
range-parser "^1.2.1"
44374438
rimraf "^3.0.2"

src/danfojs-browser/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
"ify-loader": "^1.1.0",
9191
"install-peers": "^1.0.3",
9292
"json-loader": "^0.5.7",
93-
"karma": "6.3.14",
93+
"karma": "6.3.16",
9494
"karma-browserify": "7.0.0",
9595
"karma-chai": "^0.1.0",
9696
"karma-chrome-launcher": "^3.1.0",

src/danfojs-browser/yarn.lock

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4314,10 +4314,10 @@ karma-mocha@^2.0.1:
43144314
dependencies:
43154315
minimist "^1.2.3"
43164316

4317-
karma@6.3.14:
4318-
version "6.3.14"
4319-
resolved "https://registry.npmjs.org/karma/-/karma-6.3.14.tgz"
4320-
integrity sha512-SDFoU5F4LdosEiUVWUDRPCV/C1zQRNtIakx7rWkigf7R4sxGADlSEeOma4S1f/js7YAzvqLW92ByoiQptg+8oQ==
4317+
karma@6.3.16:
4318+
version "6.3.16"
4319+
resolved "https://registry.yarnpkg.com/karma/-/karma-6.3.16.tgz#76d1a705fd1cf864ee5ed85270b572641e0958ef"
4320+
integrity sha512-nEU50jLvDe5yvXqkEJRf8IuvddUkOY2x5Xc4WXHz6dxINgGDrgD2uqQWeVrJs4hbfNaotn+HQ1LZJ4yOXrL7xQ==
43214321
dependencies:
43224322
body-parser "^1.19.0"
43234323
braces "^3.0.2"
@@ -4334,6 +4334,7 @@ karma@6.3.14:
43344334
log4js "^6.4.1"
43354335
mime "^2.5.2"
43364336
minimatch "^3.0.4"
4337+
mkdirp "^0.5.5"
43374338
qjobs "^1.2.0"
43384339
range-parser "^1.2.1"
43394340
rimraf "^3.0.2"
@@ -4679,7 +4680,7 @@ mkdirp-classic@^0.5.2:
46794680
resolved "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz"
46804681
integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
46814682

4682-
mkdirp@^0.5.1:
4683+
mkdirp@^0.5.1, mkdirp@^0.5.5:
46834684
version "0.5.5"
46844685
resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz"
46854686
integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==

src/danfojs-node/test/utils.test.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { assert } from "chai";
22
import { describe, it } from "mocha";
3+
import { ArrayType1D } from "../dist/danfojs-base/shared/types";
34
import { Utils, __version } from "../dist/danfojs-node/src";
45
import packagejson from "../package.json";
56

@@ -147,27 +148,27 @@ describe("Utils", function () {
147148

148149
describe("replaceUndefinedWithNaN", function () {
149150
it("replace undefined in Series with NaN", function () {
150-
let data = [10.01, 2.2, undefined, 20.505, 20.22, undefined];
151+
let data = [10.01, 2.2, undefined, 20.505, 20.22, undefined] as ArrayType1D;
151152
assert.deepEqual(utils.replaceUndefinedWithNaN(data, true), [10.01, 2.2, NaN, 20.505, 20.22, NaN]);
152153
});
153154

154155
it("replace undefined in DataFrame with NaN", function () {
155-
let data = [[10.01, 2.2, undefined, 20.505, 20.22, undefined],
156-
[10.01, undefined, undefined, 20.505, 20, undefined]];
156+
let data = [[10.01, 2.2, undefined, 20.505, 20.22, undefined] as ArrayType1D,
157+
[10.01, undefined, undefined, 20.505, 20, undefined] as ArrayType1D];
157158

158159
let result = [[10.01, 2.2, NaN, 20.505, 20.22, NaN],
159160
[10.01, NaN, NaN, 20.505, 20, NaN]];
160161
assert.deepEqual(utils.replaceUndefinedWithNaN(data, false), result);
161162
});
162163

163164
it("replace null in Series with NaN", function () {
164-
let data = [10.01, 2.2, null, 20.505, 20.22, null];
165+
let data = [10.01, 2.2, null, 20.505, 20.22, null] as ArrayType1D;
165166
assert.deepEqual(utils.replaceUndefinedWithNaN(data, true), [10.01, 2.2, NaN, 20.505, 20.22, NaN]);
166167
});
167168

168169
it("replace null in DataFrame with NaN", function () {
169-
let data = [[10.01, 2.2, null, 20.505, 20.22, null],
170-
[10.01, null, null, 20.505, 20, null]];
170+
let data = [[10.01, 2.2, null, 20.505, 20.22, null] as ArrayType1D,
171+
[10.01, null, null, 20.505, 20, null] as ArrayType1D];
171172

172173
let result = [[10.01, 2.2, NaN, 20.505, 20.22, NaN],
173174
[10.01, NaN, NaN, 20.505, 20, NaN]];

0 commit comments

Comments
 (0)