Skip to content

Commit

Permalink
Merge branch 'main' of github.com:pola-rs/nodejs-polars into nodejs-p…
Browse files Browse the repository at this point in the history
…olars-0.8.4
  • Loading branch information
universalmind303 committed Jan 9, 2024
2 parents 1d80cf0 + 693449c commit 3ecf701
Show file tree
Hide file tree
Showing 11 changed files with 70 additions and 96 deletions.
18 changes: 0 additions & 18 deletions .github/workflows/create-js-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,6 @@ jobs:
architecture: x64
build: yarn build
target: x86_64-pc-windows-msvc
- host: windows-latest
build: |
export CARGO_PROFILE_RELEASE_CODEGEN_UNITS=128;
export CARGO_PROFILE_RELEASE_LTO=false
npm run build -- --target i686-pc-windows-msvc
target: i686-pc-windows-msvc
architecture: x86
- host: ubuntu-latest
architecture: x64
target: x86_64-unknown-linux-gnu
Expand Down Expand Up @@ -140,19 +133,8 @@ jobs:
run: ${{ matrix.settings.setup }}
if: ${{ matrix.settings.setup }}
shell: bash
- name: Setup node x86
if: matrix.settings.target == 'i686-pc-windows-msvc'
run: yarn config set supportedArchitectures.cpu "ia32"
- name: Install dependencies
run: yarn install
- name: Setup node x86
uses: actions/setup-node@v4
if: matrix.settings.target == 'i686-pc-windows-msvc'
with:
node-version: 20
check-latest: true
cache: yarn
architecture: x86
- name: Build in docker
uses: addnab/docker-run-action@v3
if: ${{ matrix.settings.docker }}
Expand Down
Binary file modified .yarn/install-state.gz
Binary file not shown.
2 changes: 1 addition & 1 deletion __tests__/expr.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -956,7 +956,7 @@ describe("expr.str", () => {
a: ["Foo", "foo", "FoO"],
});

const re = new RegExp("foo", "i");
const re = /foo/i;
const expected = pl.DataFrame({
a: ["Foo", "foo", "FoO"],
contains: [true, true, true],
Expand Down
3 changes: 2 additions & 1 deletion biome.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
},
"suspicious": {
"noExplicitAny": "off",
"noUnsafeDeclarationMerging": "off"
"noUnsafeDeclarationMerging": "off",
"noImplicitAnyLet": "off"

},
"complexity": {
Expand Down
3 changes: 0 additions & 3 deletions npm/win32-ia32-msvc/README.md

This file was deleted.

33 changes: 0 additions & 33 deletions npm/win32-ia32-msvc/package.json

This file was deleted.

3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"aarch64-unknown-linux-gnu",
"aarch64-unknown-linux-musl",
"aarch64-linux-android",
"i686-pc-windows-msvc",
"x86_64-unknown-linux-musl"
]
}
Expand Down Expand Up @@ -55,7 +54,7 @@
"precommit": "yarn lint && yarn test"
},
"devDependencies": {
"@biomejs/biome": "^1.4.1",
"@biomejs/biome": "^1.5.0",
"@napi-rs/cli": "^2.17.0",
"@types/chance": "^1.1.6",
"@types/jest": "^29.5.11",
Expand Down
5 changes: 4 additions & 1 deletion polars/datatypes/datatype.ts
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,10 @@ class _Categorical extends DataType {}
* Datetime type
*/
class _Datetime extends DataType {
constructor(private timeUnit: TimeUnit, private timeZone?: string) {
constructor(
private timeUnit: TimeUnit,
private timeZone?: string,
) {
super();
}
override get inner() {
Expand Down
5 changes: 4 additions & 1 deletion polars/datatypes/field.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ export interface Field {
}

export class Field implements Field {
constructor(public name: string, public dtype: DataType) {}
constructor(
public name: string,
public dtype: DataType,
) {}
toString() {
return `Field("${this.name}", ${this.dtype})`;
}
Expand Down
10 changes: 6 additions & 4 deletions polars/lazy/expr/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -585,10 +585,12 @@ export const _Expr = (_expr: any): Expr => {
return _Expr(unwrap(method, ...args));
};

const wrapExprArg = (method: string, lit = false) => (other: any) => {
const expr = exprToLitOrExpr(other, lit).inner();
return wrap(method, expr);
};
const wrapExprArg =
(method: string, lit = false) =>
(other: any) => {
const expr = exprToLitOrExpr(other, lit).inner();
return wrap(method, expr);
};

const rolling =
(method: string) =>
Expand Down
84 changes: 52 additions & 32 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -408,73 +408,93 @@ __metadata:
languageName: node
linkType: hard

"@biomejs/biome@npm:^1.4.1":
version: 1.4.1
resolution: "@biomejs/biome@npm:1.4.1"
dependencies:
"@biomejs/cli-darwin-arm64": 1.4.1
"@biomejs/cli-darwin-x64": 1.4.1
"@biomejs/cli-linux-arm64": 1.4.1
"@biomejs/cli-linux-x64": 1.4.1
"@biomejs/cli-win32-arm64": 1.4.1
"@biomejs/cli-win32-x64": 1.4.1
"@biomejs/biome@npm:^1.5.0":
version: 1.5.0
resolution: "@biomejs/biome@npm:1.5.0"
dependencies:
"@biomejs/cli-darwin-arm64": 1.5.0
"@biomejs/cli-darwin-x64": 1.5.0
"@biomejs/cli-linux-arm64": 1.5.0
"@biomejs/cli-linux-arm64-musl": 1.5.0
"@biomejs/cli-linux-x64": 1.5.0
"@biomejs/cli-linux-x64-musl": 1.5.0
"@biomejs/cli-win32-arm64": 1.5.0
"@biomejs/cli-win32-x64": 1.5.0
dependenciesMeta:
"@biomejs/cli-darwin-arm64":
optional: true
"@biomejs/cli-darwin-x64":
optional: true
"@biomejs/cli-linux-arm64":
optional: true
"@biomejs/cli-linux-arm64-musl":
optional: true
"@biomejs/cli-linux-x64":
optional: true
"@biomejs/cli-linux-x64-musl":
optional: true
"@biomejs/cli-win32-arm64":
optional: true
"@biomejs/cli-win32-x64":
optional: true
bin:
biome: bin/biome
checksum: 6b016b2b5c48df6af6b74eda75dc9e36a9d2c88911d6a0f1e11dbf25906645ae61bc6366e299aa97c931a96fea9284bdab5e843950110083dc2ce597f70f14b8
checksum: 86f3a59fb1614a552a6fe47722140c06472a5e0f8d17e03d72991e69b8f1d565250b386aca695d920d7c7a8b5b3f3fff263171674892e0415698b64b319ec628
languageName: node
linkType: hard

"@biomejs/cli-darwin-arm64@npm:1.4.1":
version: 1.4.1
resolution: "@biomejs/cli-darwin-arm64@npm:1.4.1"
"@biomejs/cli-darwin-arm64@npm:1.5.0":
version: 1.5.0
resolution: "@biomejs/cli-darwin-arm64@npm:1.5.0"
conditions: os=darwin & cpu=arm64
languageName: node
linkType: hard

"@biomejs/cli-darwin-x64@npm:1.4.1":
version: 1.4.1
resolution: "@biomejs/cli-darwin-x64@npm:1.4.1"
"@biomejs/cli-darwin-x64@npm:1.5.0":
version: 1.5.0
resolution: "@biomejs/cli-darwin-x64@npm:1.5.0"
conditions: os=darwin & cpu=x64
languageName: node
linkType: hard

"@biomejs/cli-linux-arm64@npm:1.4.1":
version: 1.4.1
resolution: "@biomejs/cli-linux-arm64@npm:1.4.1"
conditions: os=linux & cpu=arm64
"@biomejs/cli-linux-arm64-musl@npm:1.5.0":
version: 1.5.0
resolution: "@biomejs/cli-linux-arm64-musl@npm:1.5.0"
conditions: os=linux & cpu=arm64 & libc=musl
languageName: node
linkType: hard

"@biomejs/cli-linux-arm64@npm:1.5.0":
version: 1.5.0
resolution: "@biomejs/cli-linux-arm64@npm:1.5.0"
conditions: os=linux & cpu=arm64 & libc=glibc
languageName: node
linkType: hard

"@biomejs/cli-linux-x64-musl@npm:1.5.0":
version: 1.5.0
resolution: "@biomejs/cli-linux-x64-musl@npm:1.5.0"
conditions: os=linux & cpu=x64 & libc=musl
languageName: node
linkType: hard

"@biomejs/cli-linux-x64@npm:1.4.1":
version: 1.4.1
resolution: "@biomejs/cli-linux-x64@npm:1.4.1"
conditions: os=linux & cpu=x64
"@biomejs/cli-linux-x64@npm:1.5.0":
version: 1.5.0
resolution: "@biomejs/cli-linux-x64@npm:1.5.0"
conditions: os=linux & cpu=x64 & libc=glibc
languageName: node
linkType: hard

"@biomejs/cli-win32-arm64@npm:1.4.1":
version: 1.4.1
resolution: "@biomejs/cli-win32-arm64@npm:1.4.1"
"@biomejs/cli-win32-arm64@npm:1.5.0":
version: 1.5.0
resolution: "@biomejs/cli-win32-arm64@npm:1.5.0"
conditions: os=win32 & cpu=arm64
languageName: node
linkType: hard

"@biomejs/cli-win32-x64@npm:1.4.1":
version: 1.4.1
resolution: "@biomejs/cli-win32-x64@npm:1.4.1"
"@biomejs/cli-win32-x64@npm:1.5.0":
version: 1.5.0
resolution: "@biomejs/cli-win32-x64@npm:1.5.0"
conditions: os=win32 & cpu=x64
languageName: node
linkType: hard
Expand Down Expand Up @@ -3067,7 +3087,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "nodejs-polars@workspace:."
dependencies:
"@biomejs/biome": ^1.4.1
"@biomejs/biome": ^1.5.0
"@napi-rs/cli": ^2.17.0
"@types/chance": ^1.1.6
"@types/jest": ^29.5.11
Expand Down

0 comments on commit 3ecf701

Please sign in to comment.