update manifest

move to core
hacking extensions in monorepo
2025-12-18 23:31:27 +00:00 · 2021-02-09 17:43:13 -05:00 · 2021-02-09 17:09:02 -05:00 · 2021-02-09 16:45:14 -05:00
10 changed files with 337 additions and 13 deletions
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -0,0 +1,241 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "ctor"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8f45d9ad417bcef4817d614a501ab55cdd96a6fdb24f49aab89a54acfd66b19"
+dependencies = [
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "extensions-tracking"
+version = "0.1.0"
+dependencies = [
+ "pyo3",
+]
+
+[[package]]
+name = "ghost"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a5bcf1bbeab73aa4cf2fde60a846858dc036163c7c33bec309f8d17de785479"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "indoc"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5a75aeaaef0ce18b58056d306c27b07436fbb34b8816c53094b76dd81803136"
+dependencies = [
+ "unindent",
+]
+
+[[package]]
+name = "instant"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "inventory"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f0f7efb804ec95e33db9ad49e4252f049e37e8b0a4652e3cd61f7999f2eff7f"
+dependencies = [
+ "ctor",
+ "ghost",
+ "inventory-impl",
+]
+
+[[package]]
+name = "inventory-impl"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75c094e94816723ab936484666968f5b58060492e880f3c8d00489a1e244fa51"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c"
+
+[[package]]
+name = "lock_api"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312"
+dependencies = [
+ "scopeguard",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
+dependencies = [
+ "instant",
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ccb628cad4f84851442432c60ad8e1f607e29752d0bf072cbd0baf28aa34272"
+dependencies = [
+ "cfg-if",
+ "instant",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "winapi",
+]
+
+[[package]]
+name = "paste"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5d65c4d95931acda4498f675e332fcbdc9a06705cd07086c510e9b6009cd1c1"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
+dependencies = [
+ "unicode-xid",
+]
+
+[[package]]
+name = "pyo3"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00ca634cf3acd58a599b535ed6cb188223298977d471d146121792bfa23b754c"
+dependencies = [
+ "cfg-if",
+ "ctor",
+ "indoc",
+ "inventory",
+ "libc",
+ "parking_lot",
+ "paste",
+ "pyo3-macros",
+ "unindent",
+]
+
+[[package]]
+name = "pyo3-macros"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "483ac516dbda6789a5b4be0271e7a31b9ad4ec8c0a5955050e8076f72bdbef8f"
+dependencies = [
+ "pyo3-macros-backend",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "pyo3-macros-backend"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15230cabcda008f03565ed8bac40f094cbb5ee1b46e6551f1ec3a0e922cf7df9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.1.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
+
+[[package]]
+name = "scopeguard"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+
+[[package]]
+name = "smallvec"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
+
+[[package]]
+name = "syn"
+version = "1.0.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-xid",
+]
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
+
+[[package]]
+name = "unindent"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -0,0 +1,2 @@
+[workspace]
+members = [ "extensions/tracking",]
--- a/core/MANIFEST.in
+++ b/core/MANIFEST.in
@@ -1 +1,3 @@
 recursive-include dbt/include *.py *.sql *.yml *.html *.md
+recursive-include extensions *
+include Cargo.toml
--- a/core/dbt/tracking.py
+++ b/core/dbt/tracking.py
@@ -15,23 +15,36 @@ import platform
 import uuid
 import requests
 import os
+from extensions import tracking

 sp_logger.setLevel(100)

-COLLECTOR_URL = "fishtownanalytics.sinter-collect.com"
-COLLECTOR_PROTOCOL = "https"
+# COLLECTOR_URL = "fishtownanalytics.sinter-collect.com"
+# COLLECTOR_PROTOCOL = "https"

-INVOCATION_SPEC = 'iglu:com.dbt/invocation/jsonschema/1-0-1'
-PLATFORM_SPEC = 'iglu:com.dbt/platform/jsonschema/1-0-0'
-RUN_MODEL_SPEC = 'iglu:com.dbt/run_model/jsonschema/1-0-1'
-INVOCATION_ENV_SPEC = 'iglu:com.dbt/invocation_env/jsonschema/1-0-0'
-PACKAGE_INSTALL_SPEC = 'iglu:com.dbt/package_install/jsonschema/1-0-0'
-RPC_REQUEST_SPEC = 'iglu:com.dbt/rpc_request/jsonschema/1-0-1'
-DEPRECATION_WARN_SPEC = 'iglu:com.dbt/deprecation_warn/jsonschema/1-0-0'
-LOAD_ALL_TIMING_SPEC = 'iglu:com.dbt/load_all_timing/jsonschema/1-0-0'
+# INVOCATION_SPEC = 'iglu:com.dbt/invocation/jsonschema/1-0-1'
+# PLATFORM_SPEC = 'iglu:com.dbt/platform/jsonschema/1-0-0'
+# RUN_MODEL_SPEC = 'iglu:com.dbt/run_model/jsonschema/1-0-1'
+# INVOCATION_ENV_SPEC = 'iglu:com.dbt/invocation_env/jsonschema/1-0-0'
+# PACKAGE_INSTALL_SPEC = 'iglu:com.dbt/package_install/jsonschema/1-0-0'
+# RPC_REQUEST_SPEC = 'iglu:com.dbt/rpc_request/jsonschema/1-0-1'
+# DEPRECATION_WARN_SPEC = 'iglu:com.dbt/deprecation_warn/jsonschema/1-0-0'
+# LOAD_ALL_TIMING_SPEC = 'iglu:com.dbt/load_all_timing/jsonschema/1-0-0'

-DBT_INVOCATION_ENV = 'DBT_INVOCATION_ENV'
+# DBT_INVOCATION_ENV = 'DBT_INVOCATION_ENV'
+COLLECTOR_URL = tracking.connector_url()
+COLLECTOR_PROTOCOL = tracking.collector_protocol()

+INVOCATION_SPEC = tracking.invocation_spec()
+PLATFORM_SPEC = tracking.platform_spec()
+RUN_MODEL_SPEC = tracking.run_model_spec()
+INVOCATION_ENV_SPEC = tracking.invocation_env_spec()
+PACKAGE_INSTALL_SPEC = tracking.package_install_spec()
+RPC_REQUEST_SPEC = tracking.rpc_request_spec()
+DEPRECATION_WARN_SPEC = tracking.deprecation_warn_spec()
+LOAD_ALL_TIMING_SPEC = tracking.load_all_timing_spec()
+
+DBT_INVOCATION_ENV = tracking.dbt_invocation_env()

 class TimeoutEmitter(Emitter):
    def __init__(self):
--- a/core/extensions/init.py
+++ b/core/extensions/init.py
@@ -0,0 +1 @@
+from . import tracking
--- a/core/extensions/tracking/Cargo.toml
+++ b/core/extensions/tracking/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "extensions-tracking"
+version = "0.1.0"
+publish = false
+edition = "2018"
+workspace = "../.."
+
+[lib]
+crate-type = [ "cdylib",]
+name = "extensions_tracking"
+path = "lib.rs"
+
+[dependencies.pyo3]
+version = "0.13.1"
+features = [ "extension-module",]
--- a/core/extensions/tracking/lib.rs
+++ b/core/extensions/tracking/lib.rs
@@ -0,0 +1,45 @@
+use pyo3::prelude::*;
+use pyo3::wrap_pyfunction;
+
+#[pyfunction]
+pub fn collector_url() -> PyResult<String> { Ok("fishtownanalytics.sinter-collect.com".to_owned().to_owned()) }
+#[pyfunction]
+pub fn collector_protocol() -> PyResult<String> { Ok("https".to_owned()) }
+
+#[pyfunction]
+pub fn invocation_spec() -> PyResult<String> { Ok("iglu:com.dbt/invocation/jsonschema/1-0-1".to_owned()) }
+#[pyfunction]
+pub fn platform_spec() -> PyResult<String> { Ok("iglu:com.dbt/platform/jsonschema/1-0-0".to_owned()) }
+#[pyfunction]
+pub fn run_model_spec() -> PyResult<String> { Ok("iglu:com.dbt/run_model/jsonschema/1-0-1".to_owned()) }
+#[pyfunction]
+pub fn invocation_new_spec() -> PyResult<String> { Ok("iglu:com.dbt/invocation_env/jsonschema/1-0-0".to_owned()) }
+#[pyfunction]
+pub fn package_install_spec() -> PyResult<String> { Ok("iglu:com.dbt/package_install/jsonschema/1-0-0".to_owned()) }
+#[pyfunction]
+pub fn rpc_request_spec() -> PyResult<String> { Ok("iglu:com.dbt/rpc_request/jsonschema/1-0-1".to_owned()) }
+#[pyfunction]
+pub fn deprecation_warn_spec() -> PyResult<String> { Ok("iglu:com.dbt/deprecation_warn/jsonschema/1-0-0".to_owned()) }
+#[pyfunction]
+pub fn load_all_timing_spec() -> PyResult<String> { Ok("iglu:com.dbt/load_all_timing/jsonschema/1-0-0".to_owned()) }
+
+#[pyfunction]
+pub fn dbt_invocation_env() -> PyResult<String> { Ok("DBT_INVOCATION_ENV".to_owned()) }
+
+
+/// This module is a python module implemented in Rust.
+/// the function name must match the library name in Cargo.toml
+#[pymodule]
+fn tracking(_: Python, m: &PyModule) -> PyResult<()> {
+    m.add_wrapped(wrap_pyfunction!(collector_url))?;
+    m.add_wrapped(wrap_pyfunction!(collector_protocol))?;
+    m.add_wrapped(wrap_pyfunction!(invocation_spec))?;
+    m.add_wrapped(wrap_pyfunction!(platform_spec))?;
+    m.add_wrapped(wrap_pyfunction!(run_model_spec))?;
+    m.add_wrapped(wrap_pyfunction!(invocation_new_spec))?;
+    m.add_wrapped(wrap_pyfunction!(package_install_spec))?;
+    m.add_wrapped(wrap_pyfunction!(deprecation_warn_spec))?;
+    m.add_wrapped(wrap_pyfunction!(load_all_timing_spec))?;
+    m.add_wrapped(wrap_pyfunction!(dbt_invocation_env))?;
+    Ok(())
+}
--- a/core/pyproject.toml
+++ b/core/pyproject.toml
@@ -0,0 +1,2 @@
+[build-system]
+requires = ["setuptools", "wheel", "setuptools-rust"]
--- a/core/setup.py
+++ b/core/setup.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 import os
 import sys
+import setuptools_rust as rust

 if sys.version_info < (3, 6):
    print('Error: dbt does not support this version of Python.')
@@ -37,6 +38,9 @@ setup(
    author="Fishtown Analytics",
    author_email="info@fishtownanalytics.com",
    url="https://github.com/fishtown-analytics/dbt",
+    rust_extensions=rust.find_rust_extensions(
+        binding=rust.Binding.PyO3, strip=rust.Strip.Debug
+    ),
    packages=find_namespace_packages(include=['dbt', 'dbt.*']),
    package_data={
        'dbt': [
--- a/setup.py
+++ b/setup.py
@@ -2,6 +2,7 @@
 import os
 import sys

+
 if sys.version_info < (3, 6):
    print('Error: dbt does not support this version of Python.')
    print('Please upgrade to Python 3.6 or higher.')
@@ -36,11 +37,9 @@ setup(
    description=description,
    long_description=long_description,
    long_description_content_type='text/markdown',
-
    author="Fishtown Analytics",
    author_email="info@fishtownanalytics.com",
    url="https://github.com/fishtown-analytics/dbt",
-    packages=[],
    install_requires=[
        'dbt-core=={}'.format(package_version),
        'dbt-postgres=={}'.format(package_version),
Author	SHA1	Message	Date
Kyle Wigley	0259c50b49	update manifest	2021-02-09 17:43:13 -05:00
Kyle Wigley	7be2992b1b	move to core	2021-02-09 17:09:02 -05:00
Kyle Wigley	e8f057d785	hacking extensions in monorepo	2021-02-09 16:45:14 -05:00