Merge pull request #51 from jonmmease/jonmmease/publish-rs

Publication fixes

automation/bump_version.py

@@ -42,6 +42,12 @@ def bump_version(version):
         cargo_toml_path.write_text(toml.dumps(cargo_toml))
         print(f"Updated version in {cargo_toml_path}")
 
+    # pyproject.toml
+    pyproject_toml_path = (root / "avenger-python" / "pyproject.toml")
+    pyproject_toml = toml.loads(pyproject_toml_path.read_text())
+    pyproject_toml["project"]["version"] = version
+    pyproject_toml_path.write_text(toml.dumps(pyproject_toml))
+
 
 if __name__ == '__main__':
     bump_version()

avenger-python/Cargo.toml

@@ -1,8 +1,9 @@
 [package]
 name = "avenger-python"
-version = "0.0.1-a1"
+version = "0.0.2-a0"
 edition = "2021"
 license = "BSD-3-Clause"
+description = "Python API to Avenger visualization framework"
 publish = false
 
 [lib]
@@ -16,17 +17,17 @@ pollster = "0.3"
 [dependencies.avenger]
 path = "../avenger"
 features = [ "pyo3",]
-version = "0.0.1-a1"
+version = "0.0.2-a0"
 
 [dependencies.avenger-vega]
 path = "../avenger-vega"
 features = [ "pyo3",]
-version = "0.0.1-a1"
+version = "0.0.2-a0"
 
 [dependencies.avenger-wgpu]
 path = "../avenger-wgpu"
 features = [ "pyo3",]
-version = "0.0.1-a1"
+version = "0.0.2-a0"
 
 [dependencies.pyo3]
 workspace = true

avenger-python/pyproject.toml

@@ -1,14 +1,13 @@
 [project]
 name = "avenger"
-version = "0.0.1"
-
-[tool.maturin]
-module-name = "avenger._avenger"
+version = "0.0.2-a0"
 
 [build-system]
-requires = ["maturin>=1.1.0,<2"]
+requires = [ "maturin>=1.1.0,<2",]
 build-backend = "maturin"
 
-# Register Altair renderer plugin
+[tool.maturin]
+module-name = "avenger._avenger"
+
 [project.entry-points."altair.vegalite.v5.renderer"]
-avenger-png = "avenger.altair_utils:avenger_png_renderer"
+avenger-png = "avenger.altair_utils:avenger_png_renderer"

avenger-vega-test-data/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "avenger-vega-test-data"
-version = "0.0.1-a1"
+version = "0.0.2-a0"
 edition = "2021"
 
 [dependencies]

avenger-vega/Cargo.toml

@@ -1,7 +1,9 @@
 [package]
 name = "avenger-vega"
-version = "0.0.1-a1"
+version = "0.0.2-a0"
 edition = "2021"
+description = "Utilities for importing Vega scenegraphs into Avenger"
+license = "BSD-3-Clause"
 
 [features]
 image-request = [ "reqwest",]
@@ -12,7 +14,7 @@ csscolorparser = "0.6.2"
 
 [dependencies.avenger]
 path = "../avenger"
-version = "0.0.1-a1"
+version = "0.0.2-a0"
 
 [dependencies.thiserror]
 workspace = true

avenger-wgpu/Cargo.toml

@@ -1,13 +1,15 @@
 [package]
 name = "avenger-wgpu"
-version = "0.0.1-a1"
+version = "0.0.2-a0"
 edition = "2021"
+description = "WGPU rendering engine for the Avenger visualization framework"
+license = "BSD-3-Clause"
 
 [lib]
 crate-type = [ "cdylib", "rlib",]
 
 [features]
-text-glyphon = [ "glyphon",]
+text-glyphon = [ "avenger-glyphon",]
 default = [ "text-glyphon",]
 
 [dependencies]
@@ -30,7 +32,7 @@ rstest = "0.18.2"
 
 [dependencies.avenger]
 path = "../avenger"
-version = "0.0.1-a1"
+version = "0.0.2-a0"
 
 [dependencies.thiserror]
 workspace = true
@@ -46,9 +48,8 @@ workspace = true
 workspace = true
 optional = true
 
-[dependencies.glyphon]
-git = "https://github.com/jonmmease/glyphon.git"
-rev = "c468f5dacd4130b27a29b098c4de3f4d5c146209"
+[dependencies.avenger-glyphon]
+version = "0.3.0"
 optional = true
 
 [dependencies.lyon]
@@ -57,7 +58,7 @@ workspace = true
 [dev-dependencies.avenger-vega]
 path = "../avenger-vega"
 features = [ "image-request",]
-version = "0.0.1-a1"
+version = "0.0.2-a0"
 
 [dev-dependencies.serde_json]
 version = "1.0.111"

avenger-wgpu/src/marks/text.rs

@@ -4,7 +4,7 @@ use avenger::marks::text::{
     FontStyleSpec, FontWeightNameSpec, FontWeightSpec, TextAlignSpec, TextBaselineSpec, TextMark,
 };
 
-use glyphon::{
+use avenger_glyphon::{
     Attrs, Buffer, Color, ColorMode, Family, FontSystem, Metrics, Resolution, Shaping, SwashCache,
     TextArea, TextAtlas, TextBounds, TextRenderer, Weight,
 };

avenger/Cargo.toml

@@ -1,7 +1,9 @@
 [package]
 name = "avenger"
-version = "0.0.1-a1"
+version = "0.0.2-a0"
 edition = "2021"
+description = "A visualization engine and renderer"
+license = "BSD-3-Clause"
 
 [dependencies.thiserror]
 workspace = true