piker/ui/_axes.py

@@ -20,9 +20,8 @@ Chart axes graphics and behavior.
 """
 from __future__ import annotations
 from functools import lru_cache
-from math import floor
-import platform
 from typing import Callable
+from math import floor
 
 import polars as pl
 import pyqtgraph as pg
@@ -43,7 +42,6 @@ from ._style import DpiAwareFont, hcolor, _font
 from ._interaction import ChartView
 from ._dataviz import Viz
 
-_friggin_macos: bool = platform.system() == 'Darwin'
 _axis_pen = pg.mkPen(hcolor('bracket'))
 
 
@@ -174,7 +172,6 @@ class Axis(pg.AxisItem):
         text_offset = None
         if self.orientation in ('bottom',):
             text_offset = floor(0.25 * font_size)
-
         elif self.orientation in ('left', 'right'):
             text_offset = floor(font_size / 2)
 
@@ -296,22 +293,15 @@ class PriceAxis(Axis):
     ) -> None:
         self._min_tick = size
 
-    if _friggin_macos:
-        def size_to_values(self) -> None:
-            # Call PyQtGraph's internal width update mechanism
-            # This respects autoExpandTextSpace and updates min/max constraints
-            self._updateWidth()
-            # tell Qt our preferred size changed so layout recalculates
-            self.updateGeometry()
-            # force parent plot item to recalculate its layout
-            if self.pi and hasattr(self.pi, 'updateGeometry'):
-                self.pi.updateGeometry()
-
-    else:
-        def size_to_values(self) -> None:
-            # XXX, old code!
-            self.setWidth(self.typical_br.width())
-
+    def size_to_values(self) -> None:
+        # Call PyQtGraph's internal width update mechanism
+        # This respects autoExpandTextSpace and updates min/max constraints
+        self._updateWidth()
+        # tell Qt our preferred size changed so layout recalculates
+        self.updateGeometry()
+        # force parent plot item to recalculate its layout
+        if self.pi and hasattr(self.pi, 'updateGeometry'):
+            self.pi.updateGeometry()
 
     # XXX: drop for now since it just eats up h space
 
@@ -354,21 +344,15 @@ class DynamicDateAxis(Axis):
         1: '%H:%M:%S',
     }
 
-    if _friggin_macos:
-        def size_to_values(self) -> None:
-            # Call PyQtGraph's internal height update mechanism
-            # This respects autoExpandTextSpace and updates min/max constraints
-            self._updateHeight()
-            # tell Qt our preferred size changed so layout recalculates
-            self.updateGeometry()
-            # force parent plot item to recalculate its layout
-            if self.pi and hasattr(self.pi, 'updateGeometry'):
-                self.pi.updateGeometry()
-
-    else:
-        def size_to_values(self) -> None:
-            # XXX, old code!
-            self.setHeight(self.typical_br.height() + 1)
+    def size_to_values(self) -> None:
+        # Call PyQtGraph's internal height update mechanism
+        # This respects autoExpandTextSpace and updates min/max constraints
+        self._updateHeight()
+        # tell Qt our preferred size changed so layout recalculates
+        self.updateGeometry()
+        # force parent plot item to recalculate its layout
+        if self.pi and hasattr(self.pi, 'updateGeometry'):
+            self.pi.updateGeometry()
 
     def _indexes_to_timestrs(
         self,

pyproject.toml

@@ -206,8 +206,8 @@ pyvnc = { git = "https://github.com/regulad/pyvnc.git" }
 # xonsh = { git = 'https://github.com/xonsh/xonsh.git', branch = 'main' }
 
 # XXX since, we're like, always hacking new shite all-the-time. Bp
-# tractor = { git = "https://github.com/goodboy/tractor.git", branch ="main" }
+tractor = { git = "https://github.com/goodboy/tractor.git", branch ="main" }
 # tractor = { git = "https://pikers.dev/goodboy/tractor", branch = "piker_pin" }
 # ------ goodboy ------
 # hackin dev-envs, usually there's something new he's hackin in..
-tractor = { path = "../tractor", editable = true }
+# tractor = { path = "../tractor", editable = true }

uv.lock

@@ -1034,7 +1034,7 @@ requires-dist = [
     { name = "tomli", specifier = ">=2.0.1,<3.0.0" },
     { name = "tomli-w", specifier = ">=1.0.0,<2.0.0" },
     { name = "tomlkit", git = "https://github.com/pikers/tomlkit.git?branch=piker_pin" },
-    { name = "tractor", editable = "../tractor" },
+    { name = "tractor", git = "https://github.com/goodboy/tractor.git?branch=main" },
     { name = "trio", specifier = ">=0.27" },
     { name = "trio-typing", specifier = ">=0.10.0" },
     { name = "trio-util", specifier = ">=0.7.0,<0.8.0" },
@@ -1680,7 +1680,7 @@ wheels = [
 [[package]]
 name = "tractor"
 version = "0.1.0a6.dev0"
-source = { editable = "../tractor" }
+source = { git = "https://github.com/goodboy/tractor.git?branch=main#e77198bb64f0467a50e251ed140daee439752354" }
 dependencies = [
     { name = "bidict" },
     { name = "cffi" },
@@ -1693,48 +1693,6 @@ dependencies = [
     { name = "wrapt" },
 ]
 
-[package.metadata]
-requires-dist = [
-    { name = "bidict", specifier = ">=0.23.1" },
-    { name = "cffi", specifier = ">=1.17.1" },
-    { name = "colorlog", specifier = ">=6.8.2,<7" },
-    { name = "msgspec", specifier = ">=0.19.0" },
-    { name = "pdbp", specifier = ">=1.8.2,<2" },
-    { name = "platformdirs", specifier = ">=4.4.0" },
-    { name = "tricycle", specifier = ">=0.4.1,<0.5" },
-    { name = "trio", specifier = ">0.27" },
-    { name = "wrapt", specifier = ">=1.16.0,<2" },
-]
-
-[package.metadata.requires-dev]
-dev = [
-    { name = "greenback", specifier = ">=1.2.1,<2" },
-    { name = "pexpect", specifier = ">=4.9.0,<5" },
-    { name = "prompt-toolkit", specifier = ">=3.0.50" },
-    { name = "psutil", specifier = ">=7.0.0" },
-    { name = "pyperclip", specifier = ">=1.9.0" },
-    { name = "pytest", specifier = ">=8.3.5" },
-    { name = "stackscope", specifier = ">=0.2.2,<0.3" },
-    { name = "typing-extensions", specifier = ">=4.14.1" },
-    { name = "xonsh", specifier = ">=0.22.2" },
-]
-devx = [
-    { name = "greenback", specifier = ">=1.2.1,<2" },
-    { name = "stackscope", specifier = ">=0.2.2,<0.3" },
-    { name = "typing-extensions", specifier = ">=4.14.1" },
-]
-lint = [{ name = "ruff", specifier = ">=0.9.6" }]
-repl = [
-    { name = "prompt-toolkit", specifier = ">=3.0.50" },
-    { name = "psutil", specifier = ">=7.0.0" },
-    { name = "pyperclip", specifier = ">=1.9.0" },
-    { name = "xonsh", specifier = ">=0.22.2" },
-]
-testing = [
-    { name = "pexpect", specifier = ">=4.9.0,<5" },
-    { name = "pytest", specifier = ">=8.3.5" },
-]
-
 [[package]]
 name = "tricycle"
 version = "0.4.1"