Create metricflow-semantics Package

Makefile

@@ -9,7 +9,9 @@ ADDITIONAL_PYTEST_OPTIONS =
 
 # Pytest that can populate the persistent source schema
 USE_PERSISTENT_SOURCE_SCHEMA = --use-persistent-source-schema
-POPULATE_PERSISTENT_SOURCE_SCHEMA = tests/source_schema_tools.py::populate_source_schema
+TESTS_METRICFLOW = tests_metricflow
+TESTS_METRICFLOW_SEMANTICS = tests_metricflow_semantics
+POPULATE_PERSISTENT_SOURCE_SCHEMA = $(TESTS_METRICFLOW)/source_schema_tools.py::populate_source_schema
 
 # Install Hatch package / project manager
 .PHONY: install-hatch
@@ -19,32 +21,33 @@ install-hatch:
 # Testing and linting
 .PHONY: test
 test:
-	hatch -v run dev-env:pytest -vv -n $(PARALLELISM) $(ADDITIONAL_PYTEST_OPTIONS) tests/
+	cd metricflow-semantics && hatch -v run dev-env:pytest -vv -n $(PARALLELISM) $(ADDITIONAL_PYTEST_OPTIONS) $(TESTS_METRICFLOW_SEMANTICS)/
+	hatch -v run dev-env:pytest -vv -n $(PARALLELISM) $(ADDITIONAL_PYTEST_OPTIONS) $(TESTS_METRICFLOW)/
 
 .PHONY: test-postgresql
 test-postgresql:
-	hatch -v run postgres-env:pytest -vv -n $(PARALLELISM) $(ADDITIONAL_PYTEST_OPTIONS) tests/
+	hatch -v run postgres-env:pytest -vv -n $(PARALLELISM) $(ADDITIONAL_PYTEST_OPTIONS) $(TESTS_METRICFLOW)/
 
 # Engine-specific test environments.
 .PHONY: test-bigquery
 test-bigquery:
-	hatch -v run bigquery-env:pytest -vv -n $(PARALLELISM) $(ADDITIONAL_PYTEST_OPTIONS) tests/
+	hatch -v run bigquery-env:pytest -vv -n $(PARALLELISM) $(ADDITIONAL_PYTEST_OPTIONS) $(TESTS_METRICFLOW)/
 
 .PHONY: populate-persistent-source-schema-bigquery
 populate-persistent-source-schema-bigquery:
 	hatch -v run bigquery-env:pytest -vv $(ADDITIONAL_PYTEST_OPTIONS) $(USE_PERSISTENT_SOURCE_SCHEMA) $(POPULATE_PERSISTENT_SOURCE_SCHEMA)
 
 .PHONY: test-databricks
 test-databricks:
-	hatch -v run databricks-env:pytest -vv -n $(PARALLELISM) $(ADDITIONAL_PYTEST_OPTIONS) tests/
+	hatch -v run databricks-env:pytest -vv -n $(PARALLELISM) $(ADDITIONAL_PYTEST_OPTIONS) $(TESTS_METRICFLOW)/
 
 .PHONY: populate-persistent-source-schema-databricks
 populate-persistent-source-schema-databricks:
 	hatch -v run databricks-env:pytest -vv $(ADDITIONAL_PYTEST_OPTIONS) $(USE_PERSISTENT_SOURCE_SCHEMA) $(POPULATE_PERSISTENT_SOURCE_SCHEMA)
 
 .PHONY: test-redshift
 test-redshift:
-	hatch -v run redshift-env:pytest -vv -n $(PARALLELISM) $(ADDITIONAL_PYTEST_OPTIONS) tests/
+	hatch -v run redshift-env:pytest -vv -n $(PARALLELISM) $(ADDITIONAL_PYTEST_OPTIONS) $(TESTS_METRICFLOW)/
 
 .PHONY: populate-persistent-source-schema-redshift
 populate-persistent-source-schema-redshift:
@@ -53,15 +56,15 @@ populate-persistent-source-schema-redshift:
 
 .PHONY: test-snowflake
 test-snowflake:
-	hatch -v run snowflake-env:pytest -vv -n $(PARALLELISM) $(ADDITIONAL_PYTEST_OPTIONS) tests/
+	hatch -v run snowflake-env:pytest -vv -n $(PARALLELISM) $(ADDITIONAL_PYTEST_OPTIONS) $(TESTS_METRICFLOW)/
 
 .PHONY: populate-persistent-source-schema-snowflake
 populate-persistent-source-schema-snowflake:
 	hatch -v run snowflake-env:pytest -vv $(ADDITIONAL_PYTEST_OPTIONS) $(USE_PERSISTENT_SOURCE_SCHEMA) $(POPULATE_PERSISTENT_SOURCE_SCHEMA)
 
 .PHONY: test-trino
 test-trino:
-	hatch -v run trino-env:pytest -vv -n $(PARALLELISM) $(ADDITIONAL_PYTEST_OPTIONS) tests/
+	hatch -v run trino-env:pytest -vv -n $(PARALLELISM) $(ADDITIONAL_PYTEST_OPTIONS) $(TESTS_METRICFLOW)/
 
 .PHONY: lint
 lint:
@@ -79,12 +82,12 @@ trino:
 # Re-generate test snapshots using all supported SQL engines.
 .PHONY: regenerate-test-snapshots
 regenerate-test-snapshots:
-	hatch -v run dev-env:python tests/generate_snapshots.py
+	hatch -v run dev-env:python tests_metricflow/generate_snapshots.py
 
 # Populate persistent source schemas for all relevant SQL engines.
 .PHONY: populate-persistent-source-schemas
 populate-persistent-source-schemas:
-	hatch -v run dev-env:python tests/populate_persistent_source_schemas.py
+	hatch -v run dev-env:python $(TESTS_METRICFLOW)/populate_persistent_source_schemas.py
 
 # Re-generate snapshots for the default SQL engine.
 .PHONY: test-snap

metricflow-semantics/pyproject.toml

@@ -57,11 +57,12 @@ features = [
 
 [tool.hatch.build.targets.sdist]
 exclude = [
-  "/.github",
-  "/.changes",
+  ".github",
+  ".changes",
   ".changie.yaml",
   ".gitignore",
   ".pre-commit-config.yaml",
   "CONTRIBUTING.md",
   "MAKEFILE",
+  "/tests_metricflow_semantics"
 ]

pyproject.toml

@@ -87,15 +87,16 @@ trino-sql-client-packages = [
 
 [tool.hatch.build.targets.sdist]
 exclude = [
-  "/.github",
-  "/.changes",
+  ".github",
+  ".changes",
   ".changie.yaml",
   ".gitignore",
   ".pre-commit-config.yaml",
   "CONTRIBUTING.md",
   "Makefile",
   "/dbt-metricflow",
   "/local-data-warehouses",
+  "/metricflow-semantics/tests_metricflow_semantics",
   "/scripts",
   "/tests",
 ]
@@ -112,7 +113,8 @@ exclude = [
 description = "Environment for development. Includes a DuckDB-backed client."
 
 pre-install-commands = [
-  "pip install -e ./dbt-metricflow[duckdb]"
+  "pip install -e ./metricflow-semantics",
+  "pip install -e ./dbt-metricflow[duckdb]",
 ]
 
 features = [
@@ -133,6 +135,7 @@ MF_TEST_ADAPTER_TYPE="postgres"
 description = "Dev environment for working with Postgres adapter"
 
 pre-install-commands = [
+  "pip install -e ./metricflow-semantics",
   "pip install -e ./dbt-metricflow[postgres]"
 ]
 
@@ -151,6 +154,7 @@ MF_TEST_ADAPTER_TYPE="bigquery"
 description = "Dev environment for working with the BigQuery adapter"
 
 pre-install-commands = [
+  "pip install -e ./metricflow-semantics",
   "pip install -e ./dbt-metricflow[bigquery]"
 ]
 
@@ -166,6 +170,7 @@ MF_TEST_ADAPTER_TYPE="databricks"
 description = "Dev environment for working with the Databricks adapter"
 
 pre-install-commands = [
+  "pip install -e ./metricflow-semantics",
   "pip install -e ./dbt-metricflow[databricks]"
 ]
 
@@ -181,6 +186,7 @@ MF_TEST_ADAPTER_TYPE="redshift"
 description = "Dev environment for working with the Redshift adapter"
 
 pre-install-commands = [
+  "pip install -e ./metricflow-semantics",
   "pip install -e ./dbt-metricflow[redshift]"
 ]
 
@@ -196,6 +202,7 @@ MF_TEST_ADAPTER_TYPE="snowflake"
 description = "Dev environment for working with Snowflake adapter"
 
 pre-install-commands = [
+  "pip install -e ./metricflow-semantics",
   "pip install -e ./dbt-metricflow[snowflake]"
 ]
 
@@ -213,6 +220,7 @@ DBT_ENV_SECRET_CATALOG="memory"
 description = "Dev environment for working with the Trino adapter"
 
 pre-install-commands = [
+  "pip install -e ./metricflow-semantics",
   "pip install -e ./dbt-metricflow[trino]"
 ]
 

tests_metricflow/generate_snapshots.py

@@ -53,7 +53,7 @@
 logger = logging.getLogger(__name__)
 
 
-TEST_DIRECTORY = "tests"
+TEST_DIRECTORY = "tests_metricflow"
 
 
 class MetricFlowTestCredentialSet(FrozenBaseModel):  # noqa: D101