perspective-python 3.1.1__tar.gz → 3.1.2__tar.gz

{perspective_python-3.1.1 → perspective_python-3.1.2}/Cargo.lock

@@ -1783,7 +1783,7 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "perspective"
-version = "3.1.1"
+version = "3.1.2"
 dependencies = [
  "async-lock",
  "axum",
@@ -1823,7 +1823,7 @@ dependencies = [
 
 [[package]]
 name = "perspective-client"
-version = "3.1.1"
+version = "3.1.2"
 dependencies = [
  "async-lock",
  "futures",
@@ -1845,7 +1845,7 @@ dependencies = [
 
 [[package]]
 name = "perspective-js"
-version = "3.1.1"
+version = "3.1.2"
 dependencies = [
  "anyhow",
  "base64 0.13.1",
@@ -1874,7 +1874,7 @@ dependencies = [
 
 [[package]]
 name = "perspective-lint"
-version = "3.1.1"
+version = "3.1.2"
 dependencies = [
  "glob",
  "yew-fmt",
@@ -1893,7 +1893,7 @@ dependencies = [
 
 [[package]]
 name = "perspective-python"
-version = "3.1.1"
+version = "3.1.2"
 dependencies = [
  "async-lock",
  "cmake",
@@ -1913,7 +1913,7 @@ dependencies = [
 
 [[package]]
 name = "perspective-server"
-version = "3.1.1"
+version = "3.1.2"
 dependencies = [
  "async-lock",
  "base64 0.22.1",
@@ -1929,7 +1929,7 @@ dependencies = [
 
 [[package]]
 name = "perspective-viewer"
-version = "3.1.1"
+version = "3.1.2"
 dependencies = [
  "anyhow",
  "async-lock",

{perspective_python-3.1.1 → perspective_python-3.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: perspective-python
-Version: 3.1.1
+Version: 3.1.2
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython

{perspective_python-3.1.1/rust/perspective-python → perspective_python-3.1.2}/perspective/__init__.py

@@ -10,7 +10,7 @@
 #  ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
 #  ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
-__version__ = "3.1.1"
+__version__ = "3.1.2"
 __all__ = [
     "_jupyter_labextension_paths",
     "Server",

{perspective_python-3.1.1 → perspective_python-3.1.2}/rust/perspective-client/Cargo.toml

@@ -12,7 +12,7 @@
 
 [package]
 name = "perspective-client"
-version = "3.1.1"
+version = "3.1.2"
 authors = ["Andrew Stein <steinlink@gmail.com>"]
 edition = "2021"
 description = "A data visualization and analytics component, especially well-suited for large and/or streaming datasets."

{perspective_python-3.1.1 → perspective_python-3.1.2}/rust/perspective-client/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@finos/perspective-client",
-    "version": "3.1.1",
+    "version": "3.1.2",
     "description": "",
     "private": true,
     "repository": {

{perspective_python-3.1.1 → perspective_python-3.1.2}/rust/perspective-python/Cargo.toml

@@ -12,7 +12,7 @@
 
 [package]
 name = "perspective-python"
-version = "3.1.1"
+version = "3.1.2"
 edition = "2021"
 description = "A data visualization and analytics component, especially well-suited for large and/or streaming datasets."
 repository = "https://github.com/finos/perspective"
@@ -53,8 +53,8 @@ python-config-rs = "0.1.2"
 
 [dependencies]
 async-lock = "2.5.0"
-perspective-client = { version = "3.1.1", path = "../perspective-client" }
-perspective-server = { version = "3.1.1", path = "../perspective-server" }
+perspective-client = { version = "3.1.2", path = "../perspective-client" }
+perspective-server = { version = "3.1.2", path = "../perspective-server" }
 pollster = "0.3.0"
 extend = "1.1.2"
 futures = "0.3.28"

{perspective_python-3.1.1 → perspective_python-3.1.2/rust/perspective-python}/perspective/__init__.py

@@ -10,7 +10,7 @@
 #  ┃ of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). ┃
 #  ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
 
-__version__ = "3.1.1"
+__version__ = "3.1.2"
 __all__ = [
     "_jupyter_labextension_paths",
     "Server",

{perspective_python-3.1.1 → perspective_python-3.1.2}/rust/perspective-server/Cargo.toml

@@ -12,7 +12,7 @@
 
 [package]
 name = "perspective-server"
-version = "3.1.1"
+version = "3.1.2"
 authors = ["Andrew Stein <steinlink@gmail.com>"]
 edition = "2021"
 description = "A data visualization and analytics component, especially well-suited for large and/or streaming datasets."
@@ -47,7 +47,7 @@ shlex = "1.3.0"
 
 [dependencies]
 link-cplusplus = "1.0.9"
-perspective-client = { version = "3.1.1", path = "../perspective-client" }
+perspective-client = { version = "3.1.2", path = "../perspective-client" }
 async-lock = "2.5.0"
 tracing = { version = ">=0.1.36" }
 futures = "0.3"

{perspective_python-3.1.1 → perspective_python-3.1.2}/rust/perspective-server/build/psp.rs

@@ -26,10 +26,24 @@ pub fn cmake_build() -> Result<Option<PathBuf>, std::io::Error> {
     let profile = std::env::var("PROFILE").unwrap();
     dst.always_configure(true);
     dst.define("CMAKE_BUILD_TYPE", profile.as_str());
-    if std::env::var("PSP_ARCH").as_deref() == Ok("x86_64") {
-        dst.define("CMAKE_OSX_ARCHITECTURES", "x86_64");
-    } else if std::env::var("PSP_ARCH").as_deref() == Ok("arm64") {
-        dst.define("CMAKE_OSX_ARCHITECTURES", "arm64");
+
+    if cfg!(target_os = "macos") {
+        // Set CMAKE_OSX_ARCHITECTURES et al. for Mac builds.  Arrow does not forward on
+        // CMAKE_OSX_ARCHITECTURES and but it does forward on a
+        // CMAKE_TOOLCHAIN_FILE. In Conda builds, the environment sets
+        // `CMAKE_ARGS` up with various toolchain arguments. This block may need
+        // to be patched out or adjusted for Conda.
+        let toolchain_file = match std::env::var("PSP_ARCH").as_deref() {
+            Ok("x86_64") => "./cmake/toolchains/darwin-x86_64.cmake",
+            Ok("aarch64") => "./cmake/toolchains/darwin-arm64.cmake",
+            arch @ Ok(_) | arch @ Err(_) => {
+                panic!("Unknown PSP_ARCH value: {:?}", arch)
+            },
+        };
+        dst.define(
+            "CMAKE_TOOLCHAIN_FILE",
+            std::fs::canonicalize(toolchain_file).expect("Failed to canonicalize toolchain file."),
+        );
     }
 
     if std::env::var("TARGET")

{perspective_python-3.1.1 → perspective_python-3.1.2}/rust/perspective-server/build/main.rs

@@ -41,6 +41,10 @@ pub fn copy_dir_all(
 }
 
 fn main() -> Result<(), std::io::Error> {
+    if std::env::var("DOCS_RS").is_ok() {
+        return Ok(());
+    }
+
     let markdown = fs::read_to_string("./docs/lib.md")?;
     let markdown = Regex::new("<img src=\"(.+?)\"")
         .expect("regex")
@@ -54,10 +58,6 @@ fn main() -> Result<(), std::io::Error> {
         });
 
     std::fs::write("docs/lib_gen.md", markdown.as_ref())?;
-    if std::env::var("DOCS_RS").is_ok() {
-        return Ok(());
-    }
-
     if std::env::var("CARGO_FEATURE_EXTERNAL_CPP").is_ok() {
         println!("cargo:warning=MESSAGE Building in development mode");
         let root_dir_env = std::env::var("PSP_ROOT_DIR").expect("Must set PSP_ROOT_DIR");