refactor(server): consolidate core+graph+admin into modules/server (sub-PR 4 of 2026.5)

.coveragerc

@@ -24,17 +24,15 @@ include =
     */modules/sdk/karrio/*
     */modules/connectors/*/karrio/*
     # Server modules
-    */modules/core/karrio/server/*
+    */modules/server/karrio/server/*
     */apps/api/karrio/server/*
-    */modules/graph/karrio/server/*
     */modules/data/karrio/server/*
     */modules/events/karrio/server/*
     */modules/manager/karrio/server/*
     */modules/orders/karrio/server/*
     */modules/proxy/karrio/server/*
     */modules/pricing/karrio/server/*
     */modules/documents/karrio/server/*
-    */modules/admin/karrio/server/*
 precision = 2
 show_missing = True
 skip_covered = False

bin/build-and-release-packages

@@ -241,6 +241,7 @@ main() {
     # Define packages to build
     declare -a packages=(
         "modules/sdk:karrio"
+        "modules/server:karrio_server_modules"
         "modules/core:karrio_server_core"
         "modules/data:karrio_server_data"
         "modules/documents:karrio_server_documents"

bin/update-package-versions

@@ -61,6 +61,7 @@ main() {
     # Define packages to update
     declare -a packages=(
         "modules/sdk"
+        "modules/server"
         "modules/core"
         "modules/data"
         "modules/documents"

modules/admin/README.md

@@ -1,10 +1,17 @@
-# karrio.server.admin
+# karrio.server.admin (shim)
 
-This package is a module of the [karrio](https://pypi.org/project/karrio.server) universal shipping API.
+Starting with 2026.5.0 the source code previously packaged as
+`karrio_server_admin` lives in `karrio_server_modules` (directory
+`modules/server/`). This package is now a thin shim that depends on
+`karrio_server_modules` to preserve backwards compatibility for pinned
+installs (`pip install karrio-server-admin==...`) for one release cycle.
+
+Import paths are unchanged: `karrio.server.admin.*` continues to resolve
+from the consolidated `modules/server/karrio/server/admin/` tree.
 
 ## Requirements
 
-`Python 3.8+`
+`Python 3.11+`
 
 ## Installation
 

modules/admin/pyproject.toml

@@ -4,8 +4,8 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "karrio_server_admin"
-version = "2026.1.11"
-description = "Multi-carrier shipping API admin module"
+version = "2026.1.29"
+description = "Multi-carrier shipping API admin module (shim — code lives in karrio_server_modules)"
 readme = "README.md"
 requires-python = ">=3.11"
 license = "LGPL-3.0"
@@ -16,8 +16,7 @@ classifiers = [
     "Programming Language :: Python :: 3",
 ]
 dependencies = [
-    "karrio_server_core",
-    "karrio_server_graph",
+    "karrio_server_modules",
 ]
 
 [project.urls]

modules/core/README.md

@@ -1,6 +1,13 @@
-# karrio.server.core
+# karrio.server.core (shim)
 
-This package is a module of the [karrio](https://pypi.org/project/karrio.server) universal shipping API.
+Starting with 2026.5.0 the source code previously packaged as
+`karrio_server_core` lives in `karrio_server_modules` (directory
+`modules/server/`). This package is now a thin shim that depends on
+`karrio_server_modules` to preserve backwards compatibility for pinned
+installs (`pip install karrio-server-core==...`) for one release cycle.
+
+Import paths are unchanged: `karrio.server.core.*` continues to resolve
+from the consolidated `modules/server/karrio/server/core/` tree.
 
 ## Requirements
 

modules/core/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "karrio_server_core"
 version = "2026.1.29"
-description = "Multi-carrier shipping API Core module"
+description = "Multi-carrier shipping API Core module (shim — code lives in karrio_server_modules)"
 readme = "README.md"
 requires-python = ">=3.11"
 license = "LGPL-3.0"
@@ -16,13 +16,7 @@ classifiers = [
     "Programming Language :: Python :: 3",
 ]
 dependencies = [
-    "karrio",
-    "psycopg2-binary",
-    "django-health-check",
-    "dnspython",
-    "psutil",
-    "pyyaml",
-    "Jinja2",
+    "karrio_server_modules",
 ]
 
 [project.urls]
@@ -38,7 +32,3 @@ include-package-data = true
 [tool.setuptools.packages.find]
 exclude = ["tests.*", "tests"]
 namespaces = true
-
-[tool.setuptools.package-data]
-"karrio.server.user" = ["templates/**/*"]
-"*" = ["*.html", "*.txt", "*.css", "*.js", "*.png", "*.jpg", "*.gif", "*.ico"]

modules/graph/README.md

@@ -1,6 +1,13 @@
-# karrio.server.graph
+# karrio.server.graph (shim)
 
-This package is a module of the [karrio](https://pypi.org/project/karrio.server) universal shipping API.
+Starting with 2026.5.0 the source code previously packaged as
+`karrio_server_graph` lives in `karrio_server_modules` (directory
+`modules/server/`). This package is now a thin shim that depends on
+`karrio_server_modules` to preserve backwards compatibility for pinned
+installs (`pip install karrio-server-graph==...`) for one release cycle.
+
+Import paths are unchanged: `karrio.server.graph.*` continues to resolve
+from the consolidated `modules/server/karrio/server/graph/` tree.
 
 ## Requirements
 

modules/graph/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "karrio_server_graph"
 version = "2026.1.29"
-description = "Multi-carrier shipping API Graph module"
+description = "Multi-carrier shipping API Graph module (shim — code lives in karrio_server_modules)"
 readme = "README.md"
 requires-python = ">=3.11"
 license = "LGPL-3.0"
@@ -16,9 +16,7 @@ classifiers = [
     "Programming Language :: Python :: 3",
 ]
 dependencies = [
-    "karrio_server_core",
-    "django-filter",
-    "strawberry-graphql",
+    "karrio_server_modules",
 ]
 
 [project.urls]
@@ -34,7 +32,3 @@ include-package-data = true
 [tool.setuptools.packages.find]
 exclude = ["tests.*", "tests"]
 namespaces = true
-
-[tool.setuptools.package-data]
-"karrio.server.graph" = ["templates/**/*"]
-"*" = ["*.html", "*.txt", "*.css", "*.js", "*.png", "*.jpg", "*.gif", "*.ico"]

modules/graph/MANIFEST.in → modules/server/MANIFEST.in

@@ -1 +1,2 @@
+recursive-include karrio/server/user/templates *
 recursive-include karrio/server/graph/templates *

modules/server/README.md

@@ -0,0 +1,27 @@
+# karrio.server (consolidated modules)
+
+This package consolidates the three OSS core server modules of the
+[karrio](https://pypi.org/project/karrio.server) universal shipping API
+into a single namespace-package install:
+
+- `karrio.server.core` (formerly `modules/core`)
+- `karrio.server.graph` (formerly `modules/graph`)
+- `karrio.server.admin` (formerly `modules/admin`)
+
+The distributions `karrio_server_core`, `karrio_server_graph`, and
+`karrio_server_admin` are still published for one release cycle as thin
+shim packages that depend on this package. Import paths
+(`karrio.server.core.*`, `karrio.server.graph.*`, `karrio.server.admin.*`)
+continue to resolve unchanged.
+
+## Requirements
+
+`Python 3.11+`
+
+## Installation
+
+```bash
+pip install karrio.server.modules
+```
+
+Check the [karrio docs](https://docs.karrio.io) to get started.