Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Publication fixes #51

Merged
merged 7 commits into from
Jan 30, 2024
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
35 changes: 18 additions & 17 deletions Cargo.lock

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

6 changes: 6 additions & 0 deletions automation/bump_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
9 changes: 5 additions & 4 deletions avenger-python/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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]
Expand All @@ -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
Expand Down
13 changes: 6 additions & 7 deletions avenger-python/pyproject.toml
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion avenger-vega-test-data/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "avenger-vega-test-data"
version = "0.0.1-a1"
version = "0.0.2-a0"
edition = "2021"

[dependencies]
Expand Down
6 changes: 4 additions & 2 deletions avenger-vega/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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",]
Expand All @@ -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
Expand Down
15 changes: 8 additions & 7 deletions avenger-wgpu/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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]
Expand All @@ -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
Expand All @@ -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]
Expand All @@ -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"
2 changes: 1 addition & 1 deletion avenger-wgpu/src/marks/text.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
Expand Down
4 changes: 3 additions & 1 deletion avenger/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading
Loading