use uv

.gitea/workflows/tests.yaml

@@ -16,19 +16,17 @@ jobs:
             sleep 5
           done
   build:
-    runs-on: galactica
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python 3.12
-        uses: actions/setup-python@v4
-        with:
-          python-version: "3.12"
-      - name: Install uv
-        uses: astral-sh/setup-uv@v5
       - name: Set up Python
-        run: uv python install
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
+          cache: 'pip'
+      - run: pip install -r requirements.txt
       - name: Install the code linting and formatting tool Ruff
-        run: uv build
+        run: pip install ruff
       - name: Lint code with Ruff
         run: ruff check --output-format=github --target-version=py39
       - name: Check code formatting with Ruff

grid/ui/items.py

@@ -60,13 +60,11 @@ class AgilitySphereGraphicsItem(SphereGraphicsItem):
     def __init__(self, x_pos: int, y_pos: int) -> None:
         super().__init__(x_pos, y_pos, Qt.GlobalColor.darkYellow)
 
-
 class EmptySphereGraphicsItem(SphereGraphicsItem):
     def __init__(self, x_pos: int, y_pos: int) -> None:
         self.SPHERE_WIDTH = 20
         super().__init__(x_pos, y_pos, Qt.GlobalColor.black)
 
-
 @staticmethod
 def random_sphere_factory(x_pos: int, y_pos: int) -> SphereGraphicsItem:
     rand = random.random()
@@ -80,7 +78,6 @@ def random_sphere_factory(x_pos: int, y_pos: int) -> SphereGraphicsItem:
         obj = EmptySphereGraphicsItem(x_pos, y_pos)
     return obj
 
-
 class ArcGraphicsItem(QGraphicsItem):
     """Circle arc."""
 
@@ -114,7 +111,7 @@ class ArcGraphicsItem(QGraphicsItem):
         # must a more elegant way but it works
         if angle_end == 0:
             angle_end = 360
-        self.draw_angle_end = int(abs(angle_end - angle_start) * 16)
+        self.draw_angle_end = int(abs(angle_end-angle_start) * 16)
         logging.debug(
             "arc from %s:%s of %s from %s° to %s°",
             self.x_pos,

grid/ui/pattern.py

@@ -2,8 +2,9 @@ import math
 
 from typing import List, Tuple
 
+from PySide6.QtCore import Qt
 
-from PySide6.QtGui import QPainter
+from PySide6.QtGui import QBrush, QPainter
 
 from PySide6.QtWidgets import QGraphicsItemGroup
 from PySide6.QtWidgets import (
@@ -15,7 +16,6 @@ from grid.ui.items import (
     HPSphereGraphicsItem,
     ArcGraphicsItem,
     LineGraphicsItem,
-    SphereGraphicsItem,
     random_sphere_factory,
 )
 
@@ -31,26 +31,6 @@ class Pattern(QGraphicsItemGroup):
         # center coordinates of the pattern
         self.center_x = top_left_corner_x + int(self.PATTERN_WIDTH / 2)
         self.center_y = top_left_corner_y + int(self.PATTERN_WIDTH / 2)
-        self.external_connectors: List[SphereGraphicsItem] = []
-
-    def get_external_connectors(self) -> List[SphereGraphicsItem]:
-        """Candidate spheres to connect with other patterns.
-
-        Returns:
-            List[SphereGraphicsItem]: List of spheres
-        """
-        return self.external_connectors
-
-    def connect(self, other: "Pattern") -> None:
-        s1 = self.external_connectors[0]
-        s2 = other.external_connectors[1]
-        line_start_x = s1.x_pos + s1.SPHERE_WIDTH / 2
-        line_start_y = s1.y_pos + s1.SPHERE_WIDTH / 2
-        line_end_x = s2.x_pos + s2.SPHERE_WIDTH / 2
-        line_end_y = s2.y_pos + s2.SPHERE_WIDTH / 2
-        self.addToGroup(
-            LineGraphicsItem(line_start_x, line_start_y, line_end_x, line_end_y, self)
-        )
 
     def paint(
         self,
@@ -59,8 +39,8 @@ class Pattern(QGraphicsItemGroup):
         widget: QWidget | None = ...,
     ):
         super().paint(painter, option, widget)
-        # brush = QBrush(Qt.GlobalColor.gray)
+        brush = QBrush(Qt.GlobalColor.gray)
-        # painter.setBrush(brush)
+        painter.setBrush(brush)
         painter.drawRect(
             self.top_left_corner_x,
             self.top_left_corner_y,
@@ -132,8 +112,8 @@ class LargeUltimaPattern(Pattern):
                     y_pos=self.center_y,
                     width=self.SPACE_BETWEEN_SPHERE * 2,
                     angle_start=(i * 360 / sphere_on_circle) % 360,
-                    # angle_end=((i + 1) * 360 / sphere_on_circle) % 360,
+                    #angle_end=((i + 1) * 360 / sphere_on_circle) % 360,
-                    angle_end=(360 / sphere_on_circle),
+                    angle_end=(360 / sphere_on_circle ),
                     parent=self,
                 )
             )
@@ -163,9 +143,7 @@ class LargeUltimaPattern(Pattern):
                 )
             )
         for x, y in points:
-            external_sphere = random_sphere_factory(x, y)
+            self.addToGroup(random_sphere_factory(x, y))
-            self.addToGroup(external_sphere)
-            self.external_connectors.append(external_sphere)
         # self.addToGroup(
         #    ArcGraphicsItem(
         #        self.center_x, self.center_y, self.SPACE_BETWEEN_SPHERE * 2, 0, 90, self
@@ -183,7 +161,7 @@ class SmallZPattern(Pattern):
 
         sphere_on_circle = 6
         for i in range(sphere_on_circle):
-            if i == 2 or i == 3 or i == 5 or i == 0:
+            if i == 2 or i == 3:
                 continue
             else:
                 self.addToGroup(
@@ -199,22 +177,8 @@ class SmallZPattern(Pattern):
         points = self.generate_circle_points(
             self.center_x, self.center_y, self.SPACE_BETWEEN_SPHERE, sphere_on_circle
         )
-        self.addToGroup(
-            LineGraphicsItem(
-                self.center_x, self.center_y, points[1][0], points[1][1], self
-            )
-        )
-        self.addToGroup(
-            LineGraphicsItem(
-                self.center_x, self.center_y, points[4][0], points[4][1], self
-            )
-        )
         # Remove left and right sphere
         del points[0]
         del points[2]
         for x, y in points:
-            external_sphere = random_sphere_factory(x, y)
+            self.addToGroup(random_sphere_factory(x, y))
-            self.addToGroup(external_sphere)
-            self.external_connectors.append(external_sphere)
-
-        self.addToGroup(HPSphereGraphicsItem(self.center_x, self.center_y))

grid/ui/window.py

@@ -1,5 +1,9 @@
+import logging
+import sys
+
 from PySide6.QtGui import QPainter
 from PySide6.QtWidgets import (
+    QApplication,
     QGraphicsScene,
     QGraphicsView,
     QHBoxLayout,
@@ -18,8 +22,7 @@ class Window(QWidget):
         self.scene = QGraphicsScene(0, 0, 400, 400)
 
         pp1 = LargeUltimaPattern(0, 0)
-        pp2 = SmallZPattern(351, 0)
+        pp2 = SmallZPattern(401, 0)
-        pp1.connect(pp2)
         self.scene.addItem(pp1)
         self.scene.addItem(pp2)
 
@@ -31,3 +34,12 @@ class Window(QWidget):
 
         self.setLayout(vbox)
         self.show()
+
+
+logging.basicConfig(
+    level=logging.DEBUG,
+    format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
+)
+app = QApplication(sys.argv)
+w = Window()
+app.exec()

main.py

@@ -1,19 +0,0 @@
-import logging
-import sys
-
-from grid.ui.window import Window
-from PySide6.QtWidgets import QApplication
-
-def main():
-    print("Hello from sphere-grid!")
-    logging.basicConfig(
-        level=logging.DEBUG,
-        format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
-    )
-    app = QApplication(sys.argv)
-    w = Window()  # noqa: F841
-    app.exec()
-
-
-if __name__ == "__main__":
-    main()

pyproject.toml

@@ -9,7 +9,3 @@ dependencies = [
     "pytest==8.3.3",
     "ruff==0.12.10",
 ]
-
-[build-system]
-requires = ["setuptools>=42"]
-build-backend = "setuptools.build_meta"

requirements.txt

@@ -0,0 +1,3 @@
+pyside6>=6.6.1
+pytest==8.3.3
+ruff==0.12.10

setup.py

@@ -0,0 +1,7 @@
+from setuptools import find_packages, setup
+
+setup(
+    name="sphere_grid",
+    version="1.0",
+    packages=find_packages("."),
+)

uv.lock

@@ -142,7 +142,7 @@ wheels = [
 [[package]]
 name = "sphere-grid"
 version = "0.1.0"
-source = { editable = "." }
+source = { virtual = "." }
 dependencies = [
     { name = "pyside6" },
     { name = "pytest" },