From 47f927af9e7188ce63c06cc5b965226de2c6694a Mon Sep 17 00:00:00 2001 From: Sean Mackesey Date: Fri, 31 Jan 2025 23:42:46 -0500 Subject: [PATCH] [components] project_name -> code_location_name in scaffolded pyproject.toml --- .../templates/PROJECT_NAME_PLACEHOLDER/pyproject.toml.jinja | 4 ++-- python_modules/libraries/dagster-dg/dagster_dg/scaffold.py | 1 + .../CODE_LOCATION_NAME_PLACEHOLDER/pyproject.toml.jinja | 2 +- python_modules/libraries/dagster-dg/dagster_dg/utils.py | 1 - .../cli_tests/test_code_location_commands.py | 5 +++++ 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/python_modules/dagster/dagster/_generate/templates/PROJECT_NAME_PLACEHOLDER/pyproject.toml.jinja b/python_modules/dagster/dagster/_generate/templates/PROJECT_NAME_PLACEHOLDER/pyproject.toml.jinja index 6e1afe2858a3a..f37c3e931aa03 100644 --- a/python_modules/dagster/dagster/_generate/templates/PROJECT_NAME_PLACEHOLDER/pyproject.toml.jinja +++ b/python_modules/dagster/dagster/_generate/templates/PROJECT_NAME_PLACEHOLDER/pyproject.toml.jinja @@ -21,7 +21,7 @@ build-backend = "setuptools.build_meta" [tool.dagster] module_name = "{{ project_name }}.definitions" -project_name = "{{ project_name }}" +code_location_name = "{{ project_name }}" [tool.setuptools.packages.find] -exclude=["{{ project_name }}_tests"] \ No newline at end of file +exclude=["{{ project_name }}_tests"] diff --git a/python_modules/libraries/dagster-dg/dagster_dg/scaffold.py b/python_modules/libraries/dagster-dg/dagster_dg/scaffold.py index 42d067456d1ec..265f2cca4c008 100644 --- a/python_modules/libraries/dagster-dg/dagster_dg/scaffold.py +++ b/python_modules/libraries/dagster-dg/dagster_dg/scaffold.py @@ -117,6 +117,7 @@ def scaffold_code_location( ), dependencies=dependencies, dev_dependencies=dev_dependencies, + code_location_name=path.name, uv_sources=uv_sources, ) diff --git a/python_modules/libraries/dagster-dg/dagster_dg/templates/CODE_LOCATION_NAME_PLACEHOLDER/pyproject.toml.jinja b/python_modules/libraries/dagster-dg/dagster_dg/templates/CODE_LOCATION_NAME_PLACEHOLDER/pyproject.toml.jinja index 33d2df039b9f0..bb3a31bfd9e1a 100644 --- a/python_modules/libraries/dagster-dg/dagster_dg/templates/CODE_LOCATION_NAME_PLACEHOLDER/pyproject.toml.jinja +++ b/python_modules/libraries/dagster-dg/dagster_dg/templates/CODE_LOCATION_NAME_PLACEHOLDER/pyproject.toml.jinja @@ -16,7 +16,7 @@ build-backend = "setuptools.build_meta" [tool.dagster] module_name = "{{ project_name }}.definitions" -project_name = "{{ project_name }}" +code_location_name = "{{ code_location_name }}" [tool.dg] is_code_location = true diff --git a/python_modules/libraries/dagster-dg/dagster_dg/utils.py b/python_modules/libraries/dagster-dg/dagster_dg/utils.py index 027a849988856..057d3ca6ec28a 100644 --- a/python_modules/libraries/dagster-dg/dagster_dg/utils.py +++ b/python_modules/libraries/dagster-dg/dagster_dg/utils.py @@ -200,7 +200,6 @@ def scaffold_subtree( f.write( template.render( repo_name=project_name, # deprecated - code_location_name=project_name, dagster_version=dagster_version, project_name=project_name, **other_template_vars, diff --git a/python_modules/libraries/dagster-dg/dagster_dg_tests/cli_tests/test_code_location_commands.py b/python_modules/libraries/dagster-dg/dagster_dg_tests/cli_tests/test_code_location_commands.py index 6702e4990742d..554f173d0279b 100644 --- a/python_modules/libraries/dagster-dg/dagster_dg_tests/cli_tests/test_code_location_commands.py +++ b/python_modules/libraries/dagster-dg/dagster_dg_tests/cli_tests/test_code_location_commands.py @@ -43,6 +43,11 @@ def test_code_location_scaffold_inside_deployment_success(monkeypatch) -> None: assert Path("code_locations/foo-bar/foo_bar_tests").exists() assert Path("code_locations/foo-bar/pyproject.toml").exists() + # Check TOML content + toml = tomli.loads(Path("code_locations/foo-bar/pyproject.toml").read_text()) + assert toml["tool"]["dagster"]["module_name"] == "foo_bar.definitions" + assert toml["tool"]["dagster"]["code_location_name"] == "foo-bar" + # Check venv created assert Path("code_locations/foo-bar/.venv").exists() assert Path("code_locations/foo-bar/uv.lock").exists()