Skip to content

Commit

Permalink
Merge branch 'main' into fix/issue-2503-display-dataquality-assertiti…
Browse files Browse the repository at this point in the history
…on-facets
  • Loading branch information
sophiely authored Jul 10, 2023
2 parents 0fc788f + 23de0de commit 87915ae
Show file tree
Hide file tree
Showing 24 changed files with 89 additions and 62 deletions.
2 changes: 1 addition & 1 deletion .circleci/api-load-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
set -e

# Build version of Marquez
readonly MARQUEZ_VERSION=0.36.0-SNAPSHOT
readonly MARQUEZ_VERSION=0.37.0-SNAPSHOT
# Fully qualified path to marquez.jar
readonly MARQUEZ_JAR="api/build/libs/marquez-api-${MARQUEZ_VERSION}.jar"

Expand Down
2 changes: 1 addition & 1 deletion .circleci/db-migration.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# Version of PostgreSQL
readonly POSTGRES_VERSION="12.1"
# Version of Marquez
readonly MARQUEZ_VERSION=0.35.0
readonly MARQUEZ_VERSION=0.36.0
# Build version of Marquez
readonly MARQUEZ_BUILD_VERSION="$(git log --pretty=format:'%h' -n 1)" # SHA1

Expand Down
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
API_PORT=5000
API_ADMIN_PORT=5001
WEB_PORT=3000
TAG=0.35.0
TAG=0.36.0
21 changes: 16 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,23 @@
# Changelog

## [Unreleased](https://github.com/MarquezProject/marquez/compare/0.35.0...HEAD)
## [Unreleased](https://github.com/MarquezProject/marquez/compare/0.36.0...HEAD)
### Fixed
* API: remove unnecessary DB updates [`#2531`](https://github.com/MarquezProject/marquez/pull/2531)[@pawel-big-lebowski]( https://github.com/pawel-big-lebowski)
*Prevent updates that are not needed and are deadlock prone.*

## [0.36.0](https://github.com/MarquezProject/marquez/compare/0.35.0...0.36.0) - 2023-06-27
### Added
* UI: add an option for configuring the depth of the lineage graph [`#2525`](https://github.com/MarquezProject/marquez/pull/2525) [@jlukenoff](https://github.com/jlukenoff)
*Makes the lineage UI a bit easier to navigate especially for larger lineage graphs*
### Fixed

*Makes the lineage UI a bit easier to navigate, especially for larger lineage graphs.*

### Fixed
* Docker: generate new `uuid` for `etl_menus` in seed data [`#2519`](https://github.com/MarquezProject/marquez/pull/2519) [@wslulciuc](https://github.com/wslulciuc)
*Fixes a `runID` collision creating an invalid lineage graph when the seed command is used.*
* Docker: remove unnecessary copy command from Dockerfile [`#2516`](https://github.com/MarquezProject/marquez/pull/2516) [@Nisarg-Chokshi](https://github.com/MarquezProject/marquez/pull/2516)
*Deletes redundant copy command.*
* Chart: enable RFC7230_LEGACY http compliance on application connectors by default [`#2524`](https://github.com/MarquezProject/marquez/pull/2524) [@jlukenoff](https://github.com/jlukenoff)
*Adds this configuration to the helm chart by default to fix basic chart installation and ensure that the fix in [`#1419`](https://github.com/MarquezProject/marquez/pull/1419) does not revert.*
* Fixed [`#2503`](https://github.com/MarquezProject/marquez/issues/2503) DataQualityAsset are not dispayed

## [0.35.0](https://github.com/MarquezProject/marquez/compare/0.34.0...0.35.0) - 2023-06-13
Expand Down Expand Up @@ -128,8 +140,7 @@
* Column-lineage endpoints supports point-in-time requests [`#2265`](https://github.com/MarquezProject/marquez/pull/2265) [@pawel-big-lebowski](https://github.com/pawel-big-lebowski)
*Enable requesting `column-lineage` endpoint by a dataset version, job version or dataset field of a specific dataset version.*
* Present column lineage of a dataset [`#2293`](https://github.com/MarquezProject/marquez/pull/2293) [@pawel-big-lebowski](https://github.com/pawel-big-lebowski)
*Column lineage of a dataset with a single level of depth can
be displayed in datase details tab.*
*Column lineage of a dataset with a single level of depth can be displayed in datase details tab.*
* Add point-in-time requests support to column-lineage endpoints [`#2265`](https://github.com/MarquezProject/marquez/pull/2265) [@pawel-big-lebowski](https://github.com/pawel-big-lebowski)
*Enables requesting `column-lineage` endpoint by a dataset version, job version or dataset field of a specific dataset version.*
* Add column lineage point-in-time Java client methods [`#2269`](https://github.com/MarquezProject/marquez/pull/2269) [@pawel-big-lebowski](https://github.com/pawel-big-lebowski)
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
We're excited you're interested in contributing to Marquez! We'd love your help, and there are plenty of ways to contribute:

* Give the repo a star
* Join our [slack](http://bit.ly/MarquezSlack) channel and leave us feedback or help with answering questions from the community
* Join our [slack](http://bit.ly/MqzSlack) channel and leave us feedback or help with answering questions from the community
* Fix or [report](https://github.com/MarquezProject/marquez/issues/new) a bug
* Fix or improve documentation
* For newcomers, pick up a ["good first issue"](https://github.com/MarquezProject/marquez/labels/good%20first%20issue), then send a pull request our way (see the [resources](#resources) section below for helpful links to get started)

We feel that a welcoming community is important and we ask that you follow the [Contributor Covenant Code of Conduct](https://github.com/MarquezProject/marquez/blob/main/CODE_OF_CONDUCT.md) in all interactions with the community.

If you’re interested in using or learning more about Marquez, reach out to us on our [slack](http://bit.ly/MarquezSlack) channel and follow [@MarquezProject](https://twitter.com/MarquezProject) for updates. We also encourage new comers to [join](https://lists.lfaidata.foundation/g/marquez-technical-discuss/ics/invite.ics?repeatid=32038) our monthly community meeting!
If you’re interested in using or learning more about Marquez, reach out to us on our [slack](http://bit.ly/MqzSlack) channel and follow [@MarquezProject](https://twitter.com/MarquezProject) for updates. We also encourage new comers to [join](https://lists.lfaidata.foundation/g/marquez-technical-discuss/ics/invite.ics?repeatid=32038) our monthly community meeting!

# Getting Your Changes Approved

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Marquez is an open source **metadata service** for the **collection**, **aggrega
[![CircleCI](https://circleci.com/gh/MarquezProject/marquez/tree/main.svg?style=shield)](https://circleci.com/gh/MarquezProject/marquez/tree/main)
[![codecov](https://codecov.io/gh/MarquezProject/marquez/branch/main/graph/badge.svg)](https://codecov.io/gh/MarquezProject/marquez/branch/main)
[![status](https://img.shields.io/badge/status-active-brightgreen.svg)](#status)
[![Slack](https://img.shields.io/badge/slack-chat-blue.svg)](http://bit.ly/MarquezSlack)
[![Slack](https://img.shields.io/badge/slack-chat-blue.svg)](http://bit.ly/MqzSlack)
[![license](https://img.shields.io/badge/license-Apache_2.0-blue.svg)](https://raw.githubusercontent.com/MarquezProject/marquez/main/LICENSE)
[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg)](CODE_OF_CONDUCT.md)
[![maven](https://img.shields.io/maven-central/v/io.github.marquezproject/marquez-api.svg)](https://search.maven.org/search?q=g:io.github.marquezproject)
Expand Down Expand Up @@ -79,8 +79,8 @@ Versions of Marquez are compatible with OpenLineage unless noted otherwise. We e
| **Marquez** | **OpenLineage** | **Status** |
|--------------------------------------------------------------------------------------------------|---------------------------------------------------------------|---------------|
| [`UNRELEASED`](https://github.com/MarquezProject/marquez/blob/main/CHANGELOG.md#unreleased) | [`1-0-5`](https://openlineage.io/spec/1-0-5/OpenLineage.json) | `CURRENT` |
| [`0.35.0`](https://github.com/MarquezProject/marquez/blob/0.35.0/CHANGELOG.md#0350---2023-06-13) | [`1-0-5`](https://openlineage.io/spec/1-0-5/OpenLineage.json) | `RECOMMENDED` |
| [`0.34.0`](https://github.com/MarquezProject/marquez/blob/0.34.0/CHANGELOG.md#0340---2023-05-18) | [`1-0-5`](https://openlineage.io/spec/1-0-0/OpenLineage.json) | `MAINTENANCE` |
| [`0.36.0`](https://github.com/MarquezProject/marquez/blob/0.36.0/CHANGELOG.md#0350---2023-06-27) | [`1-0-5`](https://openlineage.io/spec/1-0-5/OpenLineage.json) | `RECOMMENDED` |
| [`0.35.0`](https://github.com/MarquezProject/marquez/blob/0.35.0/CHANGELOG.md#0340---2023-06-13) | [`1-0-5`](https://openlineage.io/spec/1-0-0/OpenLineage.json) | `MAINTENANCE` |

> **Note:** The [`openlineage-python`](https://pypi.org/project/openlineage-python) and [`openlineage-java`](https://central.sonatype.com/artifact/io.openlineage/openlineage-java) libraries will a higher version than the OpenLineage [specification](https://github.com/OpenLineage/OpenLineage/tree/main/spec) as they have different version requirements.
Expand Down Expand Up @@ -160,7 +160,7 @@ Marquez listens on port `8080` for all API calls and port `8081` for the admin i

* Website: https://marquezproject.ai
* Source: https://github.com/MarquezProject/marquez
* Chat: [https://marquezproject.slack.com](https://bit.ly/MqzSlack)
* Chat: [MarquezProject Slack](https://bit.ly/MqzSlackInvite)
* Twitter: [@MarquezProject](https://twitter.com/MarquezProject)

## Contributing
Expand Down
2 changes: 0 additions & 2 deletions api/src/main/java/marquez/db/SourceDao.java
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ public interface SourceDao {
+ ") ON CONFLICT(name) DO UPDATE SET "
+ "type = EXCLUDED.type, "
+ "updated_at = EXCLUDED.updated_at, "
+ "name = EXCLUDED.name, "
+ "connection_url = EXCLUDED.connection_url "
+ "RETURNING *")
SourceRow upsert(UUID uuid, String type, Instant now, String name, String connectionUrl);
Expand All @@ -75,7 +74,6 @@ public interface SourceDao {
+ ") ON CONFLICT(name) DO UPDATE SET "
+ "type = EXCLUDED.type, "
+ "updated_at = EXCLUDED.updated_at, "
+ "name = EXCLUDED.name, "
+ "connection_url = EXCLUDED.connection_url, "
+ "description = EXCLUDED.description "
+ "RETURNING *")
Expand Down
2 changes: 1 addition & 1 deletion chart/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ name: marquez
sources:
- https://github.com/MarquezProject/marquez
- https://marquezproject.github.io/marquez/
version: 0.35.0
version: 0.36.0
4 changes: 2 additions & 2 deletions chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ marquez:
image:
registry: docker.io
repository: marquezproject/marquez
tag: 0.35.0
tag: 0.36.0
pullPolicy: IfNotPresent
## Name of the existing secret containing credentials for the Marquez installation.
## When this is specified, it will take precedence over the values configured in the 'db' section.
Expand Down Expand Up @@ -75,7 +75,7 @@ web:
image:
registry: docker.io
repository: marquezproject/marquez-web
tag: 0.35.0
tag: 0.36.0
pullPolicy: IfNotPresent
## Marquez website will run on this port
##
Expand Down
4 changes: 2 additions & 2 deletions clients/java/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ Maven:
<dependency>
<groupId>io.github.marquezproject</groupId>
<artifactId>marquez-java</artifactId>
<version>0.35.0</version>
<version>0.36.0</version>
</dependency>
```

or Gradle:

```groovy
implementation 'io.github.marquezproject:marquez-java:0.35.0
implementation 'io.github.marquezproject:marquez-java:0.36.0
```

## Usage
Expand Down
2 changes: 1 addition & 1 deletion clients/python/marquez_client/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# -*- coding: utf-8 -*-

__author__ = """Marquez Project"""
__version__ = "0.36.0"
__version__ = "0.37.0"

from marquez_client.client import MarquezClient # noqa: F401
from marquez_client.clients import Clients # noqa: F401
2 changes: 1 addition & 1 deletion clients/python/setup.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.36.0
current_version = 0.37.0
commit = False
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(?P<rc>.*)
Expand Down
2 changes: 1 addition & 1 deletion clients/python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

setup(
name="marquez-python",
version="0.36.0",
version="0.37.0",
description="Marquez Python Client",
long_description=readme,
long_description_content_type="text/markdown",
Expand Down
4 changes: 2 additions & 2 deletions docker/up.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
set -e

# Version of Marquez
readonly VERSION=0.35.0
readonly VERSION=0.36.0
# Build version of Marquez
readonly BUILD_VERSION=0.35.0
readonly BUILD_VERSION=0.36.0

title() {
echo -e "\033[1m${1}\033[0m"
Expand Down
Loading

0 comments on commit 87915ae

Please sign in to comment.