Skip to content

Commit

Permalink
Bumping artifact versions for v1 (#4191)
Browse files Browse the repository at this point in the history
* Bumping artifact versions for v1

* Adding schema in Changelog

* Update CHANGELOG.md

* Update changelog entry

Co-authored-by: Jeremy Cohen <jeremy@dbtlabs.com>
  • Loading branch information
leahwicz and jtcohen6 authored Nov 4, 2021
1 parent 40ae6b6 commit 95d087b
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 11 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@
### Features
- Allow nullable `error_after` in source freshness ([#3874](https://github.com/dbt-labs/dbt-core/issues/3874), [#3955](https://github.com/dbt-labs/dbt-core/pull/3955))
- Increase performance of graph subset selection ([#4135](https://github.com/dbt-labs/dbt-core/issues/4135),[#4155](https://github.com/dbt-labs/dbt-core/pull/4155))

### Fixes
- Changes unit tests using `assertRaisesRegexp` to `assertRaisesRegex`

### Under the hood
- Bump artifact schema versions for 1.0.0: manifest v4, run results v4, sources v3. Notable changes: schema test + data test nodes are renamed to generic test + singular test nodes; freshness threshold default values ([#4191](https://github.com/dbt-labs/dbt-core/pull/4191))

Contributors:
- [@kadero](https://github.com/kadero) ([3955](https://github.com/dbt-labs/dbt-core/pull/3955))
- [@frankcash](https://github.com/frankcash) ([4136](https://github.com/dbt-labs/dbt-core/pull/4136))
Expand Down
2 changes: 1 addition & 1 deletion core/dbt/contracts/graph/manifest.py
Original file line number Diff line number Diff line change
Expand Up @@ -1072,7 +1072,7 @@ def __init__(self, macros):


@dataclass
@schema_version('manifest', 3)
@schema_version('manifest', 4)
class WritableManifest(ArtifactMixin):
nodes: Mapping[UniqueID, ManifestNode] = field(
metadata=dict(description=(
Expand Down
4 changes: 2 additions & 2 deletions core/dbt/contracts/results.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ def write(self, path: str):


@dataclass
@schema_version('run-results', 3)
@schema_version('run-results', 4)
class RunResultsArtifact(ExecutionResult, ArtifactMixin):
results: Sequence[RunResultOutput]
args: Dict[str, Any] = field(default_factory=dict)
Expand Down Expand Up @@ -369,7 +369,7 @@ def from_node_results(


@dataclass
@schema_version('sources', 2)
@schema_version('sources', 3)
class FreshnessExecutionResultArtifact(
ArtifactMixin,
VersionedSchema,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -644,7 +644,7 @@ def expected_seeded_manifest(self, model_database=None, quote_model=False):
)

return {
'dbt_schema_version': 'https://schemas.getdbt.com/dbt/manifest/v3.json',
'dbt_schema_version': 'https://schemas.getdbt.com/dbt/manifest/v4.json',
'dbt_version': dbt.version.__version__,
'nodes': {
'model.test.model': {
Expand Down Expand Up @@ -1231,7 +1231,7 @@ def expected_postgres_references_manifest(self, model_database=None):
snapshot_path = self.dir('snapshot/snapshot_seed.sql')

return {
'dbt_schema_version': 'https://schemas.getdbt.com/dbt/manifest/v3.json',
'dbt_schema_version': 'https://schemas.getdbt.com/dbt/manifest/v4.json',
'dbt_version': dbt.version.__version__,
'nodes': {
'model.test.ephemeral_copy': {
Expand Down Expand Up @@ -1812,7 +1812,7 @@ def verify_manifest(self, expected_manifest):
elif key == 'metadata':
metadata = manifest['metadata']
self.verify_metadata(
metadata, 'https://schemas.getdbt.com/dbt/manifest/v3.json')
metadata, 'https://schemas.getdbt.com/dbt/manifest/v4.json')
assert 'project_id' in metadata and metadata[
'project_id'] == '098f6bcd4621d373cade4e832627b4f6'
assert 'send_anonymous_usage_stats' in metadata and metadata[
Expand Down Expand Up @@ -1952,7 +1952,7 @@ def verify_run_results(self, expected_run_results):
run_results = _read_json('./target/run_results.json')
assert 'metadata' in run_results
self.verify_metadata(
run_results['metadata'], 'https://schemas.getdbt.com/dbt/run-results/v3.json')
run_results['metadata'], 'https://schemas.getdbt.com/dbt/run-results/v4.json')
self.assertIn('elapsed_time', run_results)
self.assertGreater(run_results['elapsed_time'], 0)
self.assertTrue(
Expand Down
2 changes: 1 addition & 1 deletion test/integration/042_sources_test/test_sources.py
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ def _assert_freshness_results(self, path, state):
assert isinstance(data['elapsed_time'], float)
self.assertBetween(data['metadata']['generated_at'],
self.freshness_start_time)
assert data['metadata']['dbt_schema_version'] == 'https://schemas.getdbt.com/dbt/sources/v2.json'
assert data['metadata']['dbt_schema_version'] == 'https://schemas.getdbt.com/dbt/sources/v3.json'
assert data['metadata']['dbt_version'] == dbt.version.__version__
assert data['metadata']['invocation_id'] == dbt.tracking.active_user.invocation_id
key = 'key'
Expand Down
6 changes: 3 additions & 3 deletions test/unit/test_manifest.py
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ def test__no_nodes(self):
'child_map': {},
'metadata': {
'generated_at': '2018-02-14T09:15:13Z',
'dbt_schema_version': 'https://schemas.getdbt.com/dbt/manifest/v3.json',
'dbt_schema_version': 'https://schemas.getdbt.com/dbt/manifest/v4.json',
'dbt_version': dbt.version.__version__,
'env': {ENV_KEY_NAME: 'value'},
# invocation_id is None, so it will not be present
Expand Down Expand Up @@ -418,7 +418,7 @@ def test_no_nodes_with_metadata(self, mock_user):
'docs': {},
'metadata': {
'generated_at': '2018-02-14T09:15:13Z',
'dbt_schema_version': 'https://schemas.getdbt.com/dbt/manifest/v3.json',
'dbt_schema_version': 'https://schemas.getdbt.com/dbt/manifest/v4.json',
'dbt_version': dbt.version.__version__,
'project_id': '098f6bcd4621d373cade4e832627b4f6',
'user_id': 'cfc9500f-dc7f-4c83-9ea7-2c581c1b38cf',
Expand Down Expand Up @@ -659,7 +659,7 @@ def test__no_nodes(self):
'child_map': {},
'metadata': {
'generated_at': '2018-02-14T09:15:13Z',
'dbt_schema_version': 'https://schemas.getdbt.com/dbt/manifest/v3.json',
'dbt_schema_version': 'https://schemas.getdbt.com/dbt/manifest/v4.json',
'dbt_version': dbt.version.__version__,
'invocation_id': '01234567-0123-0123-0123-0123456789ab',
'env': {ENV_KEY_NAME: 'value'},
Expand Down

0 comments on commit 95d087b

Please sign in to comment.