Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 8 additions & 19 deletions .github/workflows/build_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
- name: Install latest stable Rust toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: 1.60.0
toolchain: stable
override: true
- name: Install node
uses: actions/setup-node@v2
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
- name: Install latest stable Rust toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: 1.60.0
toolchain: stable
override: true
- name: Cache rust dependencies
uses: Swatinem/rust-cache@v1
Expand Down Expand Up @@ -140,10 +140,10 @@ jobs:
run: |
choco install --yes protoc
if: ${{ runner.os == 'Windows' }}
- name: Install latest stable Rust toolchain
- name: Install nightly Rust toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: 1.60.0
toolchain: nightly
override: true
- name: Cache rust dependencies
uses: Swatinem/rust-cache@v1
Expand All @@ -155,7 +155,8 @@ jobs:
maturin-version: latest
command: build
manylinux: 2010
args: --release -m vegafusion-python-embed/Cargo.toml --strip
rust-toolchain: nightly
args: --release -m vegafusion-python-embed/Cargo.toml --strip --rustc-extra-args="-Z oom=panic"
- name: Download Apple Silicon toolchain
if: ${{ runner.os == 'macOS' }}
run: |
Expand All @@ -166,7 +167,8 @@ jobs:
with:
maturin-version: latest
command: build
args: --release -m vegafusion-python-embed/Cargo.toml --strip --target aarch64-apple-darwin -i python3.10 -i python3.9 -i python3.8 -i python3.7
rust-toolchain: nightly
args: --release -m vegafusion-python-embed/Cargo.toml --strip --rustc-extra-args="-Z oom=panic" --target aarch64-apple-darwin -i python3.10 -i python3.9 -i python3.8 -i python3.7
- name: Remove unwanted universal
if: ${{ runner.os == 'macOS' }}
run: |
Expand Down Expand Up @@ -206,19 +208,6 @@ jobs:
with:
name: vegafusion-wasm-packages
path: vegafusion-wasm/pkg
- name: Build and pack vegafusion-embed package
working-directory: javascript/vegafusion-embed/
run: |
npm install
npm run prepack
npm pack
mkdir packed
mv vegafusion-embed-*.tgz packed;
- name: Upload artifacts
uses: actions/upload-artifact@v2
with:
name: vegafusion-embed-packages
path: javascript/vegafusion-embed/packed

build-vegafusion-wheel:
runs-on: ubuntu-latest
Expand Down
29 changes: 5 additions & 24 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion javascript/vegafusion-chart-editor/package-lock.json

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

2 changes: 1 addition & 1 deletion javascript/vegafusion-chart-editor/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "create-wasm-app",
"version": "0.6.1",
"version": "0.6.2",
"description": "create an app to consume rust-generated wasm packages",
"main": "index.js",
"bin": {
Expand Down
8 changes: 4 additions & 4 deletions javascript/vegafusion-embed/package-lock.json

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

2 changes: 1 addition & 1 deletion javascript/vegafusion-embed/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vegafusion-embed",
"version": "0.6.1",
"version": "0.6.2",
"description": "Library to embed vegafusion visualizations",
"keywords": [
"vega",
Expand Down
2 changes: 1 addition & 1 deletion python/vegafusion-jupyter/package-lock.json

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

2 changes: 1 addition & 1 deletion python/vegafusion-jupyter/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vegafusion-jupyter",
"version": "0.6.1",
"version": "0.6.2",
"description": "Altair Jupyter Widget library that relies on VegaFusion for serverside calculations",
"keywords": [
"jupyter",
Expand Down
2 changes: 1 addition & 1 deletion python/vegafusion-jupyter/vegafusion_jupyter/_frontend.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
Information about the frontend package of the widgets.
"""
module_name = "vegafusion-jupyter"
module_version = "^0.6.1"
module_version = "^0.6.2"
2 changes: 1 addition & 1 deletion python/vegafusion-jupyter/vegafusion_jupyter/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.6.1'
__version__ = '0.6.2'
2 changes: 1 addition & 1 deletion python/vegafusion/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ universal = 0
[metadata]
name = vegafusion
description = Core tools for using VegaFusion from Python
version = 0.6.1
version = 0.6.2
long_description = file: README.md
long_description_content_type = text/markdown
keywords = vega, altair, vegafusion, arrow
Expand Down
2 changes: 1 addition & 1 deletion python/vegafusion/vegafusion/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.6.1'
__version__ = '0.6.2'
2 changes: 1 addition & 1 deletion vegafusion-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "vegafusion-core"
license = "AGPL-3.0-or-later"
edition = "2021"
version = "0.6.1"
version = "0.6.2"

[features]
tonic_support = [ "tonic", "tonic-build",]
Expand Down
6 changes: 1 addition & 5 deletions vegafusion-python-embed/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "vegafusion-python-embed"
license = "AGPL-3.0-or-later"
edition = "2021"
version = "0.6.1"
version = "0.6.2"

[lib]
name = "vegafusion_embed"
Expand Down Expand Up @@ -33,7 +33,3 @@ features = [ "macros", "rt-multi-thread",]
[dependencies.pyo3]
version = "0.16.4"
features = [ "extension-module",]

[dependencies.mimalloc]
version = "*"
default-features = false
5 changes: 0 additions & 5 deletions vegafusion-python-embed/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,8 @@ use vegafusion_core::proto::gen::services::pre_transform_result;
use vegafusion_rt_datafusion::task_graph::runtime::TaskGraphRuntime;

use serde::{Deserialize, Serialize};

use mimalloc::MiMalloc;
use vegafusion_core::data::dataset::VegaFusionDataset;

#[global_allocator]
static GLOBAL: MiMalloc = MiMalloc;

#[derive(Clone, Serialize, Deserialize)]
struct PreTransformWarning {
#[serde(rename = "type")]
Expand Down
2 changes: 1 addition & 1 deletion vegafusion-rt-datafusion/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ harness = false
name = "vegafusion-rt-datafusion"
license = "AGPL-3.0-or-later"
edition = "2021"
version = "0.6.1"
version = "0.6.2"

[features]
pyarrow = [ "vegafusion-core/pyarrow",]
Expand Down
2 changes: 1 addition & 1 deletion vegafusion-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ path = "src/main.rs"

[package]
name = "vegafusion-server"
version = "0.6.1"
version = "0.6.2"
edition = "2021"
license = "AGPL-3.0-or-later"

Expand Down
2 changes: 1 addition & 1 deletion vegafusion-wasm/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "vegafusion-wasm"
version = "0.6.1"
version = "0.6.2"
edition = "2021"

[lib]
Expand Down
2 changes: 1 addition & 1 deletion vegafusion-wasm/package-lock.json

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

2 changes: 1 addition & 1 deletion vegafusion-wasm/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vegafusion-wasm",
"version": "0.6.1",
"version": "0.6.2",
"author": {
"name": "VegaFusion Technologies LLC",
"email": "[email protected]",
Expand Down