Change package layout (#96)

Author: vrslev

.github/workflows/publish.yml

@@ -12,8 +12,12 @@ jobs:
       - uses: actions/checkout@v4
       - uses: extractions/setup-just@v2
       - uses: astral-sh/setup-uv@v5
-        with:
-          cache-dependency-glob: "**/pyproject.toml"
-      - run: just publish
+      - if: startsWith(github.ref_name, 'stompman')
+        run: just publish stompman
+        env:
+          PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
+
+      - if: startsWith(github.ref_name, 'faststream-stomp')
+        run: just publish faststream-stomp
         env:
           PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}

Dockerfile

@@ -6,10 +6,16 @@ FROM ${PYTHON_IMAGE}
 RUN pip install uv
 
 WORKDIR /app
+
+# Copy rarely changing files first
 COPY pyproject.toml README.md ./
-COPY stompman/__init__.py stompman/__init__.py
+COPY packages/stompman/stompman/__init__.py packages/stompman/stompman/__init__.py
+COPY packages/stompman/pyproject.toml packages/stompman/pyproject.toml
+COPY packages/faststream-stomp/README.md packages/faststream-stomp/README.md
+COPY packages/faststream-stomp/pyproject.toml packages/faststream-stomp/pyproject.toml
+COPY packages/faststream-stomp/faststream_stomp/__init__.py packages/faststream-stomp/faststream_stomp/__init__.py
 
 ENV SETUPTOOLS_SCM_PRETEND_VERSION=0
 RUN --mount=type=cache,target=~/.cache/uv \
-    uv lock && uv sync
+    ls packages/faststream-stomp && uv lock && uv sync
 COPY . .

Justfile

@@ -13,7 +13,7 @@ test *args:
 test-integration *args:
     #!/bin/bash
     trap 'echo; docker compose down --remove-orphans' EXIT
-    docker compose run --build --rm app .venv/bin/pytest tests/integration.py --no-cov {{args}}
+    docker compose run --build --rm app .venv/bin/pytest packages/stompman/test_stompman/integration.py --no-cov {{args}}
 
 run-artemis:
     #!/bin/bash
@@ -26,7 +26,7 @@ run-consumer:
 run-producer:
     uv run examples/producer.py
 
-publish:
+publish package:
     rm -rf dist
-    uv build
+    uv build --package {{package}}
     uv publish --token $PYPI_TOKEN

packages/faststream-stomp/README.md

@@ -0,0 +1,2 @@
+# FastStream STOMP broker
+

tests/__init__.py renamed to packages/faststream-stomp/faststream_stomp/__init__.py

@@ -0,0 +1,32 @@
+[project]
+name = "faststream-stomp"
+description = "FastStream STOMP broker"
+authors = [{ name = "Lev Vereshchagin", email = "mail@vrslev.com" }]
+dependencies = ["faststream>=0.5", "stompman"]
+requires-python = ">=3.11"
+readme = "README.md"
+license = { text = "MIT" }
+keywords = ["faststream", "stomp", "artemis", "activemq", "messaging", "jms"]
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "Natural Language :: English",
+    "Programming Language :: Python :: Implementation :: CPython",
+    "Topic :: System :: Networking",
+    "Typing :: Typed",
+]
+dynamic = ["version"]
+
+[project.urls]
+repository = "https://github.com/vrslev/stompman"
+
+[build-system]
+requires = ["hatchling", "hatch-vcs"]
+build-backend = "hatchling.build"
+
+[tool.hatch.version]
+source = "vcs"
+raw-options.root = "../.."
+fallback-version = "0"
+
+[tool.hatch.build]
+include = ["faststream_stomp"]

packages/faststream-stomp/pyproject.toml

@@ -0,0 +1,37 @@
+[project]
+name = "stompman"
+description = "Python STOMP client with pleasant API"
+authors = [{ name = "Lev Vereshchagin", email = "mail@vrslev.com" }]
+dependencies = []
+requires-python = ">=3.11"
+license = { text = "MIT" }
+keywords = ["stomp", "artemis", "activemq", "messaging", "jms"]
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "Natural Language :: English",
+    "Programming Language :: Python :: Implementation :: CPython",
+    "Topic :: System :: Networking",
+    "Typing :: Typed",
+]
+dynamic = ["version", "readme"]
+
+[project.urls]
+repository = "https://github.com/vrslev/stompman"
+
+[build-system]
+requires = ["hatchling", "hatch-vcs", "hatch-fancy-pypi-readme"]
+build-backend = "hatchling.build"
+
+[tool.hatch.version]
+source = "vcs"
+raw-options.root = "../.."
+fallback-version = "0"
+
+[tool.hatch.build]
+include = ["stompman"]
+
+[tool.hatch.metadata.hooks.fancy-pypi-readme]
+content-type = "text/markdown"
+
+[[tool.hatch.metadata.hooks.fancy-pypi-readme.fragments]]
+path = "../../README.md"