revert unnecesary changes

more simplification

revert linting

more simplification

fix

don’t need it

Author: emmyoop

.github/workflows/schema-check.yml

@@ -22,7 +22,7 @@ on:
       target_branch:
         description: "The branch to check against"
         type: string
-        default: "main"
+        default: 'main'
         required: true
 
 # no special access is needed
@@ -48,8 +48,8 @@ jobs:
       - name: Checkout dbt repo
         uses: actions/checkout@v4
         with:
-          path: ${{ env.DBT_REPO_DIRECTORY }}
-          ref: ${{ inputs.target_branch }}
+            path: ${{ env.DBT_REPO_DIRECTORY }}
+            ref: ${{ inputs.target_branch }}
 
       - name: Check for changes in core/dbt/artifacts
         # https://github.com/marketplace/actions/paths-changes-filter
@@ -72,7 +72,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: dbt-labs/schemas.getdbt.com
-          ref: "main"
+          ref: 'main'
           path: ${{ env.SCHEMA_REPO_DIRECTORY }}
 
       - name: Generate current schema
@@ -82,7 +82,7 @@ jobs:
           python3 -m venv env
           source env/bin/activate
           pip install --upgrade pip
-          pip install -r dev-requirements.txt
+          pip install -r dev-requirements.txt -r editable-requirements.txt
           python scripts/collect-artifact-schema.py --path ${{ env.LATEST_SCHEMA_PATH }}
 
       # Copy generated schema files into the schemas.getdbt.com repo
@@ -99,5 +99,5 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ failure() && steps.check_artifact_changes.outputs.artifacts_changed == 'true' }}
         with:
-          name: "schema_changes.txt"
-          path: "${{ env.SCHEMA_DIFF_ARTIFACT }}"
+          name: 'schema_changes.txt'
+          path: '${{ env.SCHEMA_DIFF_ARTIFACT }}'

CONTRIBUTING.md

@@ -121,10 +121,9 @@ make dev
 ```
 or, alternatively:
 ```sh
-pip install -r editable-requirements.txt -r dev-requirements.txt
+pip install -r dev-requirements.txt -r editable-requirements.txt
 pre-commit install
 ```
-The `dev` extra now pins the versions that pre-commit runs locally. When installing directly (outside this requirements file), be sure to quote the extra in shells like `zsh`, for example: `pip install -e 'core[dev]'`.
 
 When installed in this way, any changes you make to your local copy of the source code will be reflected immediately in your next `dbt` run.
 

Makefile

@@ -30,7 +30,7 @@ CI_FLAGS =\
 .PHONY: dev_req
 dev_req: ## Installs dbt-* packages in develop mode along with only development dependencies.
 	@\
-	pip install -r editable-requirements.txt -r dev-requirements.txt
+	pip install -r dev-requirements.txt -r editable-requirements.txt
 
 .PHONY: dev
 dev: dev_req ## Installs dbt-* packages in develop mode along with development dependencies and pre-commit.

core/MANIFEST.in

@@ -1,5 +1,4 @@
-recursive-include dbt/include *
-recursive-exclude dbt/include __pycache__ *.pyc *.pyo
+recursive-include dbt/include *.py *.sql *.yml *.html *.md .gitkeep .gitignore
 include dbt/py.typed
 recursive-include dbt/task/docs *.html
 recursive-include dbt/jsonschemas *.json

core/pyproject.toml

@@ -13,19 +13,18 @@ include = [
 # this needs to match MANIFEST.in for the wheels
 [tool.setuptools.package-data]
 "dbt" = [
-    "include/**/*",
+    "include/**/*.py",
+    "include/**/*.sql",
+    "include/**/*.yml",
+    "include/**/*.html",
+    "include/**/*.md",
+    "include/**/.gitkeep",
+    "include/**/.gitignore",
     "task/docs/**/*.html",
     "jsonschemas/**/*.json",
     "py.typed",
 ]
 
-[tool.setuptools.exclude-package-data]
-"dbt" = [
-    "include/__pycache__/*",
-    "include/**/*.pyc",
-    "include/**/*.pyo",
-]
-
 [project]
 name = "dbt-core"
 version = "1.11.0b4"

dev-requirements.txt

@@ -1,9 +1,7 @@
-# Dev dependencies with git URLs (excluded from package METADATA to avoid PyPI rejection)
-dbt-adapters @ git+https://github.com/dbt-labs/dbt-adapters.git@main#subdirectory=dbt-adapters
-dbt-tests-adapter @ git+https://github.com/dbt-labs/dbt-adapters.git@main#subdirectory=dbt-tests-adapter
-dbt-common @ git+https://github.com/dbt-labs/dbt-common.git@main
-dbt-postgres @ git+https://github.com/dbt-labs/dbt-adapters.git@main#subdirectory=dbt-postgres
-# black must match what's in .pre-commit-config.yaml to be sure local env matches CI
+git+https://github.com/dbt-labs/dbt-adapters.git@main#subdirectory=dbt-adapters
+git+https://github.com/dbt-labs/dbt-adapters.git@main#subdirectory=dbt-tests-adapter
+git+https://github.com/dbt-labs/dbt-common.git@main
+git+https://github.com/dbt-labs/dbt-adapters.git@main#subdirectory=dbt-postgres
 black==24.3.0
 bumpversion
 ddtrace==2.21.3

editable-requirements.txt

@@ -1 +1 @@
--e core
+-e ./core

pyproject.toml

@@ -7,32 +7,6 @@
 files = 'core/dbt'
 mypy_path = "third-party-stubs/"
 namespace_packages = true
-ignore_missing_imports = true
-
-[[tool.mypy.overrides]]
-module = [
-    "dbtlabs.*",
-    "dbt_semantic_interfaces.*",
-    "dbt_common.*",
-    "click.parser",
-]
-ignore_missing_imports = true
-
-[[tool.mypy.overrides]]
-# Mirror legacy mypy behaviour by excluding modules previously unchecked in the pre-commit mirror environment.
-module = [
-    "dbt.events.types",
-    "dbt.events.core_types_pb2",
-    "dbt.jsonschemas.jsonschemas",
-    "dbt.cli.option_types",
-    "dbt.cli.options",
-    "dbt.cli.flags",
-    "dbt.utils.utils",
-    "dbt.env_vars",
-    "dbt.context.providers",
-    "dbt.artifacts.resources.v1.semantic_layer_components",
-]
-ignore_errors = true
 
 [tool.black]
 line-length = 99

requirements.txt

@@ -1 +1 @@
-core
+./core

scripts/build-dist.sh

@@ -14,6 +14,7 @@ rm -rf "$DBT_PATH"/dist
 rm -rf "$DBT_PATH"/build
 rm -rf "$DBT_PATH"/core/dist
 rm -rf "$DBT_PATH"/core/build
+
 mkdir -p "$DBT_PATH"/dist
 
 # Copy License.md to core/ for inclusion in distribution (required by Apache 2.0)
@@ -27,5 +28,4 @@ $PYTHON_BIN -m build --outdir "$DBT_PATH/dist"
 # Clean up License.md that was copied to core/ for build
 rm -f "$DBT_PATH/core/License.md"
 
-
 set +x