Skip to content

Commit 200e240

Browse files
committed
Fix cargo src rules, publish to crates.io
1 parent f33257a commit 200e240

File tree

18 files changed

+148
-43
lines changed

18 files changed

+148
-43
lines changed

packages/perspective-jupyterlab/test/results/results.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"__GIT_COMMIT__": "ef6df703f94bdda20d81b476d8725782904357db",
2+
"__GIT_COMMIT__": "82f3e58191f6e05c750e4f3f10977d0b3a14ea4e",
33
"resize_Config_should_show_by_default": "f492628efc5ce5c9e1bab910cf2557c9",
44
"resize_Resize_the_container_causes_the_widget_to_resize": "96a80143ba27bf42cc22d69c4ff1692a",
55
"resize_group_by_traitlet_works": "f86409c2ccbdf3613a4aa20fc24cc543",

packages/perspective-viewer-d3fc/test/results/results.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"__GIT_COMMIT__": "ef6df703f94bdda20d81b476d8725782904357db",
2+
"__GIT_COMMIT__": "82f3e58191f6e05c750e4f3f10977d0b3a14ea4e",
33
"area_shows_a_grid_without_any_settings_applied": "67bab9ea6654cc7cf7c7b096824e610a",
44
"area_displays_visible_columns_": "9c195f0f7bf184a4cb9e727f1b37b301",
55
"area_pivot_by_a_row": "fbae982b73c9cbf91be40a767cbbd3df",

packages/perspective-viewer-datagrid/test/results/results.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"superstore_displays_visible_columns_": "09dd14f0e60da0e8749b7dd514e929f0",
1515
"superstore_resets_viewable_area_when_the_logical_size_expands_": "e9dd1d275f46f6a0857e0168835d0b38",
1616
"superstore_resets_viewable_area_when_the_physical_size_expands_": "e469597235cc032619bc095a76f9ad6f",
17-
"__GIT_COMMIT__": "ef6df703f94bdda20d81b476d8725782904357db",
17+
"__GIT_COMMIT__": "82f3e58191f6e05c750e4f3f10977d0b3a14ea4e",
1818
"superstore_shows_a_grid_without_any_settings_applied": "192edc6b035af6432c5bd82d295987f1",
1919
"superstore_pivot_by_a_row": "709a4a6b40153d9bf013f90398ee568d",
2020
"superstore_pivot_by_two_rows": "23db46ccf9d8327ae992fe3b5f468b3b",
@@ -28,6 +28,6 @@
2828
"superstore_filters_filters_by_an_alpha_column": "4b9a40c2ffad050ff4cf059e22cb2b68",
2929
"superstore_filters_filters_with__in__comparator": "5882e2d2694519ba9880d0b2d5b19c44",
3030
"superstore_perspective-config-update_event_is_fired_when_column_style_is_changed": "3d03b2787f9b903050942052168f755a",
31-
"superstore_Column_style_menu_opens_for_numeric_columns": "fc42b6bd729d72974f1f3c91dee18d8b",
32-
"superstore_Column_style_menu_opens_for_string_columns": "64ca2b3567212ac3b2a5184b7c033db5"
31+
"superstore_Column_style_menu_opens_for_numeric_columns": "bb90da1cce340c8c311850f0b81f0d6a",
32+
"superstore_Column_style_menu_opens_for_string_columns": "1c634f208fd1a55ed54a48ccb2c85c14"
3333
}

packages/perspective-workspace/test/results/results.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"__GIT_COMMIT__": "ef6df703f94bdda20d81b476d8725782904357db",
2+
"__GIT_COMMIT__": "82f3e58191f6e05c750e4f3f10977d0b3a14ea4e",
33
"index_restore_workspace_with_detail_only": "d24f601369fbf86c853d4dd2894506e3",
44
"index_Light_DOM_restore_workspace_with_detail_only": "e23bd42ed74c5efc2d067301b449027d",
55
"index_Shadow_DOM_restore_workspace_with_detail_only": "aa44cdf6689ff93f68d4a4cffe292e09",

rust/perspective-viewer/Cargo.lock

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

rust/perspective-viewer/Cargo.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "perspective"
3-
version = "1.7.1"
3+
version = "1.7.2"
44
authors = ["Andrew Stein <steinlink@gmail.com>"]
55
edition = "2021"
66
description = "A data visualization and analytics component, especially well-suited for large and/or streaming datasets."
@@ -12,7 +12,6 @@ build = "build.rs"
1212
include = [
1313
"build.rs",
1414
"src/**/*",
15-
"build/css/**/*",
1615
"Cargo.toml",
1716
"package.json",
1817
]
@@ -27,7 +26,7 @@ default = []
2726

2827
[build-dependencies]
2928
serde_json = { version = "1.0.59", features = ["raw_value"] }
30-
procss = { version = "0.1.4" }
29+
procss = { version = "0.1.5" }
3130
glob = "0.3.0"
3231
anyhow = "1.0.66"
3332

rust/perspective-viewer/build.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ const BUILD = [
3737
external: ["*.wasm", "*.worker.js"],
3838
outdir: "dist/esm",
3939
},
40-
4140
{
4241
entryPoints: ["src/ts/perspective-viewer.ts"],
4342
plugins: [
@@ -118,6 +117,7 @@ async function build_all() {
118117
await Promise.all(POSTBUILD.map(build)).catch(() => process.exit(1));
119118

120119
// legacy compat
120+
execSync("cpy target/themes/* dist/css");
121121
execSync("cpy dist/css/* dist/umd");
122122
}
123123

rust/perspective-viewer/build.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ fn main() -> Result<(), anyhow::Error> {
3737
build.add(&src);
3838
}
3939

40-
build.compile()?.write("./build/css")?;
40+
build.compile("./target/css")?;
4141

4242
let mut build = BuildCss::new("./src/themes");
4343
build.add("variables.less");
@@ -49,7 +49,7 @@ fn main() -> Result<(), anyhow::Error> {
4949
build.add("solarized-dark.less");
5050
build.add("vaporwave.less");
5151
build.add("themes.less");
52-
build.compile()?.write("./dist/css")?;
52+
build.compile("./target/themes")?;
5353

5454
println!(
5555
"cargo:rustc-env=PKG_VERSION={}",

rust/perspective-viewer/src/rust/components/config_selector.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ impl Component for ConfigSelector {
164164
}
165165
ConfigSelectorMsg::Close(index, DragTarget::Sort) => {
166166
let mut sort = ctx.props().session.get_view_config().sort.clone();
167-
sort.remove(index as usize);
167+
sort.remove(index);
168168
let sort = Some(sort);
169169
let config = ViewConfigUpdate {
170170
sort,
@@ -176,7 +176,7 @@ impl Component for ConfigSelector {
176176
}
177177
ConfigSelectorMsg::Close(index, DragTarget::GroupBy) => {
178178
let mut group_by = ctx.props().session.get_view_config().group_by.clone();
179-
group_by.remove(index as usize);
179+
group_by.remove(index);
180180
let config = ViewConfigUpdate {
181181
group_by: Some(group_by),
182182
..ViewConfigUpdate::default()
@@ -187,7 +187,7 @@ impl Component for ConfigSelector {
187187
}
188188
ConfigSelectorMsg::Close(index, DragTarget::SplitBy) => {
189189
let mut split_by = ctx.props().session.get_view_config().split_by.clone();
190-
split_by.remove(index as usize);
190+
split_by.remove(index);
191191
let config = ViewConfigUpdate {
192192
split_by: Some(split_by),
193193
..ViewConfigUpdate::default()
@@ -199,7 +199,7 @@ impl Component for ConfigSelector {
199199
ConfigSelectorMsg::Close(index, DragTarget::Filter) => {
200200
self.filter_dropdown.hide().unwrap();
201201
let mut filter = ctx.props().session.get_view_config().filter.clone();
202-
filter.remove(index as usize);
202+
filter.remove(index);
203203
let config = ViewConfigUpdate {
204204
filter: Some(filter),
205205
..ViewConfigUpdate::default()

rust/perspective-viewer/src/rust/components/containers/dragdrop_list.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ where
197197
.collect::<Vec<(usize, (bool, Option<yew::virtual_dom::VChild<U>>))>>();
198198

199199
if let Some((x, column)) = &ctx.props().is_dragover {
200-
let index = *x as usize;
200+
let index = *x;
201201
let col_vchild = columns
202202
.iter()
203203
.map(|z| z.1 .1.as_ref().unwrap())

0 commit comments

Comments
 (0)