Workspace Support

docs/history/hatchling.md

@@ -12,6 +12,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Drop support for Python 3.8
 
+***Changed:***
+
+- Drop support for Python 3.8
+
 ## [1.27.0](https://github.com/pypa/hatch/releases/tag/hatchling-v1.27.0) - 2024-11-26 ## {: #hatchling-v1.27.0 }
 
 ***Added:***

docs/meta/authors.md

@@ -17,3 +17,4 @@
 - Olga Matoula [:material-github:](https://github.com/olgarithms) [:material-twitter:](https://twitter.com/olgarithms_)
 - Philip Blair [:material-email:](mailto:[email protected])
 - Robert Rosca [:material-github:](https://github.com/robertrosca)
+- Cary Hawkins [:material-github](https://github.com/cjames23)

hatch.toml

@@ -1,25 +1,21 @@
+[workpace]
+members = ["hatch/*"]
+
 [envs.hatch-static-analysis]
 config-path = "ruff_defaults.toml"
 
 [envs.default]
 installer = "uv"
-post-install-commands = [
-  "uv pip install {verbosity:flag:-1} -e ./backend",
-]
 
 [envs.hatch-test]
 extra-dependencies = [
   "filelock",
   "flit-core",
-  "hatchling",
   "pyfakefs",
   "trustme",
   # Hatchling dynamic dependency
   "editables",
 ]
-post-install-commands = [
-  "pip install {verbosity:flag:-1} -e ./backend",
-]
 extra-args = ["--dist", "worksteal"]
 
 [envs.hatch-test.extra-scripts]
@@ -125,9 +121,7 @@ update-ruff = [
 [envs.release]
 detached = true
 installer = "uv"
-dependencies = [
-  "hatchling",
-]
+
 [envs.release.scripts]
 bump = "python scripts/bump.py {args}"
 github = "python scripts/release_github.py {args}"

pyproject.toml

@@ -39,7 +39,6 @@ classifiers = [
 ]
 dependencies = [
   "click>=8.0.6",
-  "hatchling>=1.24.2",
   "httpx>=0.22.0",
   "hyperlink>=21.0.0",
   "keyring>=23.5.0",
@@ -53,7 +52,7 @@ dependencies = [
   "tomlkit>=0.11.1",
   "userpath~=1.7",
   "uv>=0.5.23",
-  "virtualenv>=20.26.6",
+  "virtualenv>=20.26.6,<20.35.0",
   "zstandard<1",
 ]
 dynamic = ["version"]
@@ -68,6 +67,9 @@ Source = "https://github.com/pypa/hatch"
 [project.scripts]
 hatch = "hatch.cli:main"
 
+[tool.hatch.workspace]
+members = ["backend"]
+
 [tool.hatch.version]
 source = "vcs"
 

src/hatch/cli/__init__.py

@@ -29,6 +29,38 @@
 from hatch.utils.fs import Path
 
 
+def find_workspace_root(path: Path) -> Path | None:
+    """Find workspace root by traversing up from given path."""
+    from hatch.utils.toml import load_toml_file
+
+    current = path
+    while current.parent != current:
+        # Check hatch.toml first
+        hatch_toml = current / "hatch.toml"
+        if hatch_toml.exists() and _has_workspace_config(load_toml_file, str(hatch_toml), "workspace"):
+            return current
+
+        # Then check pyproject.toml
+        pyproject = current / "pyproject.toml"
+        if pyproject.exists() and _has_workspace_config(load_toml_file, str(pyproject), "tool.hatch.workspace"):
+            return current
+
+        current = current.parent
+    return None
+
+
+def _has_workspace_config(load_func, file_path: str, config_path: str) -> bool:
+    """Check if file has workspace configuration, returning False on any error."""
+    try:
+        config = load_func(file_path)
+        if config_path == "workspace":
+            return bool(config.get("workspace"))
+        # "tool.hatch.workspace"
+        return bool(config.get("tool", {}).get("hatch", {}).get("workspace"))
+    except (OSError, ValueError, TypeError, KeyError):
+        return False
+
+
 @click.group(
     context_settings={"help_option_names": ["-h", "--help"], "max_content_width": 120}, invoke_without_command=True
 )
@@ -170,8 +202,20 @@ def hatch(ctx: click.Context, env_name, project, verbose, quiet, color, interact
         app.project.set_app(app)
         return
 
-    app.project = Project(Path.cwd())
-    app.project.set_app(app)
+    # Discover workspace-aware project
+    workspace_root = find_workspace_root(Path.cwd())
+    if workspace_root:
+        # Create project from workspace root with workspace context
+        app.project = Project(workspace_root, locate=False)
+        app.project.set_app(app)
+        # Set current member context if we're in a member directory
+        current_dir = Path.cwd()
+        if current_dir != workspace_root:
+            app.project.current_member_path = current_dir
+    else:
+        # No workspace, use current directory as before
+        app.project = Project(Path.cwd())
+        app.project.set_app(app)
 
     if app.config.mode == "local":
         return

src/hatch/cli/application.py

@@ -15,8 +15,7 @@
 if TYPE_CHECKING:
     from collections.abc import Generator
 
-    from packaging.requirements import Requirement
-
+    from hatch.dep.core import Dependency
     from hatch.env.plugin.interface import EnvironmentInterface
 
 
@@ -141,11 +140,11 @@ def ensure_environment_plugin_dependencies(self) -> None:
             self.project.config.env_requires_complex, wait_message="Syncing environment plugin requirements"
         )
 
-    def ensure_plugin_dependencies(self, dependencies: list[Requirement], *, wait_message: str) -> None:
+    def ensure_plugin_dependencies(self, dependencies: list[Dependency], *, wait_message: str) -> None:
         if not dependencies:
             return
 
-        from hatch.dep.sync import dependencies_in_sync
+        from hatch.dep.sync import InstalledDistributions
         from hatch.env.utils import add_verbosity_flag
 
         if app_path := os.environ.get("PYAPP"):
@@ -154,12 +153,14 @@ def ensure_plugin_dependencies(self, dependencies: list[Requirement], *, wait_me
             management_command = os.environ["PYAPP_COMMAND_NAME"]
             executable = self.platform.check_command_output([app_path, management_command, "python-path"]).strip()
             python_info = PythonInfo(self.platform, executable=executable)
-            if dependencies_in_sync(dependencies, sys_path=python_info.sys_path):
+            distributions = InstalledDistributions(sys_path=python_info.sys_path)
+            if distributions.dependencies_in_sync(dependencies):
                 return
 
             pip_command = [app_path, management_command, "pip"]
         else:
-            if dependencies_in_sync(dependencies):
+            distributions = InstalledDistributions()
+            if distributions.dependencies_in_sync(dependencies):
                 return
 
             pip_command = [sys.executable, "-u", "-m", "pip"]

src/hatch/cli/dep/__init__.py

@@ -49,8 +49,7 @@ def table(app, project_only, env_only, show_lines, force_ascii):
     """Enumerate dependencies in a tabular format."""
     app.ensure_environment_plugin_dependencies()
 
-    from packaging.requirements import Requirement
-
+    from hatch.dep.core import Dependency
     from hatch.utils.dep import get_complex_dependencies, get_normalized_dependencies, normalize_marker_quoting
 
     environment = app.project.get_environment()
@@ -76,7 +75,7 @@ def table(app, project_only, env_only, show_lines, force_ascii):
         if not all_requirements:
             continue
 
-        normalized_requirements = [Requirement(d) for d in get_normalized_dependencies(all_requirements)]
+        normalized_requirements = [Dependency(d) for d in get_normalized_dependencies(all_requirements)]
 
         columns = {"Name": {}, "URL": {}, "Versions": {}, "Markers": {}, "Features": {}}
         for i, requirement in enumerate(normalized_requirements):

src/hatch/cli/env/show.py

@@ -70,8 +70,7 @@ def show(
         app.display(json.dumps(contextual_config, separators=(",", ":")))
         return
 
-    from packaging.requirements import InvalidRequirement, Requirement
-
+    from hatch.dep.core import Dependency, InvalidDependencyError
     from hatchling.metadata.utils import get_normalized_dependency, normalize_project_name
 
     if internal:
@@ -126,8 +125,8 @@ def show(
             normalized_dependencies = set()
             for dependency in dependencies:
                 try:
-                    req = Requirement(dependency)
-                except InvalidRequirement:
+                    req = Dependency(dependency)
+                except InvalidDependencyError:
                     normalized_dependencies.add(dependency)
                 else:
                     normalized_dependencies.add(get_normalized_dependency(req))

src/hatch/dep/core.py

@@ -0,0 +1,37 @@
+from __future__ import annotations
+
+from functools import cached_property
+
+from packaging.requirements import InvalidRequirement, Requirement
+
+from hatch.utils.fs import Path
+
+InvalidDependencyError = InvalidRequirement
+
+
+class Dependency(Requirement):
+    def __init__(self, s: str, *, editable: bool = False) -> None:
+        super().__init__(s)
+
+        if editable and self.url is None:
+            message = f"Editable dependency must refer to a local path: {s}"
+            raise InvalidDependencyError(message)
+
+        self.__editable = editable
+
+    @property
+    def editable(self) -> bool:
+        return self.__editable
+
+    @cached_property
+    def path(self) -> Path | None:
+        if self.url is None:
+            return None
+
+        import hyperlink
+
+        uri = hyperlink.parse(self.url)
+        if uri.scheme != "file":
+            return None
+
+        return Path.from_uri(self.url)