fix: missing logos in v0.25.0 by adding build-system configuration (#1187)

* Initial plan

* Initial investigation of logo display issue

Co-authored-by: mingrammer <6178510+mingrammer@users.noreply.github.com>

* Fix: Add build-system configuration to include resources in package

Co-authored-by: mingrammer <6178510+mingrammer@users.noreply.github.com>

* Clean up pyproject.toml - remove duplicate Poetry configuration

Co-authored-by: mingrammer <6178510+mingrammer@users.noreply.github.com>

* Update version to 0.25.1 and add rendering test for resources

Co-authored-by: mingrammer <6178510+mingrammer@users.noreply.github.com>

* Update poetry.lock to reflect current dependencies

Co-authored-by: mingrammer <6178510+mingrammer@users.noreply.github.com>

* Fix pre-commit issues: trailing whitespace and formatting

Co-authored-by: mingrammer <6178510+mingrammer@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: mingrammer <6178510+mingrammer@users.noreply.github.com>

Author: Copilot

.gitignore

@@ -29,3 +29,5 @@ website/package-lock.json
 
 # Ignore .swp files
 .swp
+*.whl
+dist/

CONTRIBUTING.md

@@ -65,7 +65,7 @@ find . -type f -name "*.svg" -exec bash -c 'inkscape -h 256  --export-filename="
 find . -type f -name "*.svg" -exec bash -c 'rm "$0"' {} \;
 ```
 
-If you get any errors with autogen, it will probably be a '+' in  filename 
+If you get any errors with autogen, it will probably be a '+' in  filename
 
 ### Add new provider
 

diagrams/azure/monitor.py

@@ -38,6 +38,8 @@ class DiagnosticsSettings(_Monitor):
 
 class LogAnalyticsWorkspaces(_Monitor):
     _icon = "log-analytics-workspaces.png"
+
+
 class Logs(_Monitor):
     _icon = "logs.png"
 

poetry.lock

@@ -1,6 +1,10 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
 [project]
 name = "diagrams"
-version = "0.25.0"
+version = "0.25.1"
 description = "Diagram as Code"
 authors = [{ name = "mingrammer", email = "mingrammer@gmail.com" }]
 requires-python = "~=3.9"
@@ -13,6 +17,9 @@ dependencies = [
     "pre-commit>=4.0.1,<5",
 ]
 
+[project.scripts]
+diagrams = "diagrams.cli:main"
+
 [project.urls]
 Homepage = "https://diagrams.mingrammer.com"
 Repository = "https://github.com/mingrammer/diagrams"
@@ -26,28 +33,8 @@ dev = [
     "black~=24.4",
 ]
 
-[tool.hatch.build.targets.sdist]
-include = ["resources/**/*"]
-
-[tool.poetry.scripts]
-diagrams="diagrams.cli:main"
-
-[tool.poetry.dependencies]
-python = "^3.9"
-graphviz = ">=0.13.2,<0.21.0"
-jinja2 = ">=2.10,<4.0"
-typed-ast = {version="^1.5.5", markers="python_version<'3.8'"}
-
-[tool.poetry.group.dev.dependencies]
-pytest = "^8.4"
-pylint = "^3.3"
-rope = "^1.13"
-isort = "^6.0"
-black = "^24.4"
-pre-commit = "^4.3.0"
-
-[tool.hatch.build.targets.wheel]
-include = ["resources/**/*"]
+[tool.hatch.build]
+only-include = ["diagrams", "resources"]
 
 [tool.black]
 line-length=120

pyproject.toml

@@ -393,3 +393,49 @@ def test_folder_depth(self):
             _,
             _ in os.walk(resources_dir))
         self.assertLessEqual(max_depth, 2)
+
+    def test_resources_exist_and_render(self):
+        """
+        Test that resources directory exists and icons can be loaded for rendering.
+        This ensures the package build includes all necessary resource files.
+        """
+        from diagrams.aws.compute import EC2
+        from diagrams.aws.database import RDS
+
+        # Verify resources directory exists
+        resources_dir = pathlib.Path(__file__).parent.parent / "resources"
+        self.assertTrue(resources_dir.exists(), "resources directory should exist")
+
+        # Verify AWS resources exist (sample check)
+        aws_compute_dir = resources_dir / "aws" / "compute"
+        self.assertTrue(aws_compute_dir.exists(), "AWS compute resources should exist")
+
+        # Verify icon files exist
+        ec2_icon = aws_compute_dir / "ec2.png"
+        self.assertTrue(ec2_icon.exists(), "EC2 icon should exist")
+
+        # Test that nodes can load their icons
+        test_diagram_name = "test_resources_render"
+        try:
+            with Diagram(test_diagram_name, show=False):
+                ec2_node = EC2("test-ec2")
+                rds_node = RDS("test-rds")
+
+                # Verify nodes have icon attributes set
+                self.assertIsNotNone(ec2_node._icon, "EC2 node should have an icon")
+                self.assertIsNotNone(rds_node._icon, "RDS node should have an icon")
+
+                # Verify icon paths are valid
+                ec2_icon_path = ec2_node._load_icon()
+                rds_icon_path = rds_node._load_icon()
+
+                self.assertTrue(os.path.exists(ec2_icon_path),
+                                f"EC2 icon path should exist: {ec2_icon_path}")
+                self.assertTrue(os.path.exists(rds_icon_path),
+                                f"RDS icon path should exist: {rds_icon_path}")
+        finally:
+            # Clean up generated files
+            try:
+                os.remove(test_diagram_name + ".png")
+            except FileNotFoundError:
+                pass