rsplotlib 0.1.4__tar.gz → 0.1.5__tar.gz

{rsplotlib-0.1.4 → rsplotlib-0.1.5}/.gitignore

@@ -27,6 +27,7 @@ uv.lock
 Thumbs.db
 
 # Data / plots
+testing/
 main*.py
 out/
 wheelhouse/

{rsplotlib-0.1.4 → rsplotlib-0.1.5}/Cargo.lock

@@ -339,7 +339,7 @@ dependencies = [
 
 [[package]]
 name = "rsplotlib"
-version = "0.1.4"
+version = "0.1.5"
 dependencies = [
  "plotters",
  "png",

{rsplotlib-0.1.4 → rsplotlib-0.1.5}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rsplotlib"
-version = "0.1.4"
+version = "0.1.5"
 edition = "2024"
 readme = "README.md"
 

{rsplotlib-0.1.4 → rsplotlib-0.1.5}/PKG-INFO

@@ -1,16 +1,33 @@
 Metadata-Version: 2.4
 Name: rsplotlib
-Version: 0.1.4
+Version: 0.1.5
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
+Classifier: Operating System :: MacOS
+Classifier: Operating System :: Microsoft :: Windows
+Classifier: Operating System :: POSIX :: Linux
 Classifier: Topic :: Scientific/Engineering :: Visualization
-Requires-Dist: xlrd>=2.0.2
+Requires-Dist: pytest>=7.0 ; extra == 'dev'
+Requires-Dist: pillow>=9.0 ; extra == 'dev'
+Requires-Dist: numpy>=1.20 ; extra == 'dev'
+Requires-Dist: pytest>=7.0 ; extra == 'test'
+Requires-Dist: pillow>=9.0 ; extra == 'test'
+Requires-Dist: numpy>=1.20 ; extra == 'test'
+Provides-Extra: dev
+Provides-Extra: test
 License-File: LICENSE
 Summary: A high-performance matplotlib-compatible plotting library powered by Rust
-Author: rsplotlib contributors
+Keywords: plotting,matplotlib,visualization,rust,scientific
+Author: YJ-Niu
 License: MIT
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM

{rsplotlib-0.1.4 → rsplotlib-0.1.5}/build_wheel.sh

@@ -6,10 +6,16 @@ set -euo pipefail
 
 RELEASE=true
 OUT_DIR="wheelhouse"
+cache_file="/Users/user/Desktop/rust_project/rsplotlib/python/rsplotlib/rsplotlib.cpython-313-darwin.so"
 # 如果 wheelhouse 目录存在, 则删除
 if [[ -d "$OUT_DIR" ]]; then
   rm -rf "$OUT_DIR"
 fi
+# 如果 cache_file 目录存在, 则删除
+if [[ -f "$cache_file" ]]; then
+  rm "$cache_file"
+fi
+
 # Default python executable; may be overridden by --python or positional arg
 PYTHON_EXEC="python"
 # Flag set when the user explicitly provided a Python executable

rsplotlib-0.1.5/pyproject.toml

@@ -0,0 +1,48 @@
+[build-system]
+requires = ["maturin>=1.13,<2.0"]
+build-backend = "maturin"
+
+[project]
+name = "rsplotlib"
+version = "0.1.5"
+description = "A high-performance matplotlib-compatible plotting library powered by Rust"
+readme = "README_zh.md"
+license = { text = "MIT" }
+requires-python = ">=3.8"
+authors = [
+    { name = "YJ-Niu" },
+]
+classifiers = [
+    "Programming Language :: Rust",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: Implementation :: CPython",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: MacOS",
+    "Operating System :: Microsoft :: Windows",
+    "Operating System :: POSIX :: Linux",
+    "Topic :: Scientific/Engineering :: Visualization",
+]
+keywords = ["plotting", "matplotlib", "visualization", "rust", "scientific"]
+dependencies = []
+
+[project.optional-dependencies]
+test = [
+    "pytest>=7.0",
+    "pillow>=9.0",
+    "numpy>=1.20",
+]
+dev = [
+    "pytest>=7.0",
+    "pillow>=9.0",
+    "numpy>=1.20",
+]
+
+[tool.maturin]
+python-source = "python"

{rsplotlib-0.1.4 → rsplotlib-0.1.5}/python/rsplotlib/api.py

@@ -301,7 +301,7 @@ def contourf(X, Y, Z, levels=None, cmap='coolwarm', alpha=1.0):
 
 def stackplot(x, *args, labels=None, colors=None, alpha=1.0):
     """绘制堆叠面积图
-    
+
     Args:
         x: x 轴数据
         *args: 多个 y 数据数组
@@ -309,11 +309,10 @@ def stackplot(x, *args, labels=None, colors=None, alpha=1.0):
         colors: 颜色列表 (默认: None)
         alpha: 透明度 (默认: 1.0)
     """
-    try:
-        return _rsplotlib.stackplot(x, args, labels, colors, alpha)
-    except AttributeError:
-        _warnings.warn("stackplot is not yet implemented in rsplotlib")
-        return None
+    y_data = list(args) if args else []
+    if len(y_data) == 1 and isinstance(y_data[0], (list, tuple)) and y_data[0] and isinstance(y_data[0][0], (list, tuple)):
+        y_data = list(y_data[0])
+    return _rsplotlib.stackplot(_to_list(x), y_data, labels, colors, alpha)
 
 
 # ==================== 辅助元素 ====================

{rsplotlib-0.1.4 → rsplotlib-0.1.5}/python/rsplotlib/gridspec.py

@@ -78,8 +78,13 @@ class SubplotSpec:
         self.row_end = row_end
         self.col_start = col_start
         self.col_end = col_end
-        self.numRows = gridspec.nrows
-        self.numCols = gridspec.ncols
+        if gridspec is not None:
+            self.numRows = gridspec.nrows
+            self.numCols = gridspec.ncols
+        else:
+            # 用于模式 (nrows, ncols, index) 调用 add_subplot
+            self.numRows = max(row_end, 1)
+            self.numCols = max(col_end, 1)
         self.rowStart = row_start
         self.rowStop = row_end
         self.colStart = col_start
@@ -87,6 +92,12 @@ class SubplotSpec:
 
     def get_position(self, figure):
         """返回子图位置 (left, bottom, width, height)"""
+        if self.gridspec is None:
+            # 没有 gridspec 时使用均匀划分
+            return (self.colStart / self.numCols,
+                    1.0 - self.rowEnd / self.numRows,
+                    (self.colEnd - self.colStart) / self.numCols,
+                    (self.rowEnd - self.rowStart) / self.numRows)
         row_heights = self.gridspec.height_ratios
         col_widths = self.gridspec.width_ratios