Merge branch 'main' into chart/set-default-http-compliance

MarquezProject · Jun 17, 2023 · e6bea0e · e6bea0e
2 parents 9c35cf5 + ad1a597
commit e6bea0e
Show file tree

Hide file tree

Showing 20 changed files with 182 additions and 39 deletions.
diff --git a/.circleci/api-load-test.sh b/.circleci/api-load-test.sh
@@ -14,7 +14,7 @@
 set -e
 
 # Build version of Marquez
-readonly MARQUEZ_VERSION=0.35.0-SNAPSHOT
+readonly MARQUEZ_VERSION=0.36.0-SNAPSHOT
 # Fully qualified path to marquez.jar
 readonly MARQUEZ_JAR="api/build/libs/marquez-api-${MARQUEZ_VERSION}.jar"
 

diff --git a/.circleci/db-migration.sh b/.circleci/db-migration.sh
@@ -13,7 +13,7 @@
 # Version of PostgreSQL
 readonly POSTGRES_VERSION="12.1"
 # Version of Marquez
-readonly MARQUEZ_VERSION=0.34.0
+readonly MARQUEZ_VERSION=0.35.0
 # Build version of Marquez
 readonly MARQUEZ_BUILD_VERSION="$(git log --pretty=format:'%h' -n 1)" # SHA1
 

diff --git a/.env.example b/.env.example
@@ -1,4 +1,4 @@
 API_PORT=5000
 API_ADMIN_PORT=5001
 WEB_PORT=3000
-TAG=0.34.0
+TAG=0.35.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,15 @@
 # Changelog
 
-## [Unreleased](https://github.com/MarquezProject/marquez/compare/0.34.0...HEAD)
+## [Unreleased](https://github.com/MarquezProject/marquez/compare/0.35.0...HEAD)
+
+## [0.35.0](https://github.com/MarquezProject/marquez/compare/0.34.0...0.35.0) - 2023-06-13
+### Added
+* Web: add pagination to datasets [`#2512`](https://github.com/MarquezProject/marquez/pull/2512) [@merobi-hub](https://github.com/merobi-hub)  
+    *Adds pagination to the datasets route using the same approach employed for events.*
+
+### Fixed
+* Web: handle lineage graph cycles on the client [`#2506`](https://github.com/MarquezProject/marquez/pull/2506) [@jlukenoff](https://github.com/jlukenoff)  
+    *Fixes a bug where we blow the stack on the client-side if the user selects a node that is part of a cycle in the graph.*
 
 ## [0.34.0](https://github.com/MarquezProject/marquez/compare/0.33.0...0.34.0) - 2023-05-18
 

diff --git a/Dockerfile b/Dockerfile
@@ -10,7 +10,6 @@ FROM base AS build
 WORKDIR /usr/src/app
 COPY build.gradle build.gradle
 COPY api ./api
-COPY api/build.gradle ./api/build.gradle
 COPY clients/java ./clients/java
 RUN ./gradlew --no-daemon clean :api:shadowJar
 

diff --git a/README.md b/README.md
@@ -78,9 +78,9 @@ Versions of Marquez are compatible with OpenLineage unless noted otherwise. We e
 
 | **Marquez**                                                                                      | **OpenLineage**                                               | **Status**    |
 |--------------------------------------------------------------------------------------------------|---------------------------------------------------------------|---------------|
-| [`UNRELEASED`](https://github.com/OpenLineage/OpenLineage/blob/main/CHANGELOG.md#unreleased)     | [`1-0-5`](https://openlineage.io/spec/1-0-5/OpenLineage.json) | `CURRENT`     |
-| [`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-5/OpenLineage.json) | `RECOMMENDED` |
-| [`0.33.0`](https://github.com/MarquezProject/marquez/blob/0.33.0/CHANGELOG.md#0330---2023-04-19) | [`1-0-5`](https://openlineage.io/spec/1-0-0/OpenLineage.json) | `MAINTENANCE` |
+| [`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` |
 
 > **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.
 
@@ -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](http://bit.ly/MarquezSlack)
+* Chat: [https://marquezproject.slack.com](https://bit.ly/MqzSlack)
 * Twitter: [@MarquezProject](https://twitter.com/MarquezProject)
 
 ## Contributing

diff --git a/chart/Chart.yaml b/chart/Chart.yaml
@@ -29,4 +29,4 @@ name: marquez
 sources:
   - https://github.com/MarquezProject/marquez
   - https://marquezproject.github.io/marquez/
-version: 0.34.0
+version: 0.35.0
diff --git a/chart/values.yaml b/chart/values.yaml
@@ -17,7 +17,7 @@ marquez:
   image:
     registry: docker.io
     repository: marquezproject/marquez
-    tag: 0.34.0
+    tag: 0.35.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.
@@ -75,7 +75,7 @@ web:
   image:
     registry: docker.io
     repository: marquezproject/marquez-web
-    tag: 0.34.0
+    tag: 0.35.0
     pullPolicy: IfNotPresent
   ## Marquez website will run on this port
   ##

diff --git a/clients/java/README.md b/clients/java/README.md
@@ -10,14 +10,14 @@ Maven:
 <dependency>
     <groupId>io.github.marquezproject</groupId>
     <artifactId>marquez-java</artifactId>
-    <version>0.34.0</version>
+    <version>0.35.0</version>
 </dependency>
 ```
 
 or Gradle:
 
 ```groovy
-implementation 'io.github.marquezproject:marquez-java:0.34.0
+implementation 'io.github.marquezproject:marquez-java:0.35.0
 ```
 
 ## Usage

diff --git a/clients/python/marquez_client/__init__.py b/clients/python/marquez_client/__init__.py
@@ -4,7 +4,7 @@
 # -*- coding: utf-8 -*-
 
 __author__ = """Marquez Project"""
-__version__ = "0.35.0"
+__version__ = "0.36.0"
 
 from marquez_client.client import MarquezClient              # noqa: F401
 from marquez_client.clients import Clients                   # noqa: F401
diff --git a/clients/python/setup.cfg b/clients/python/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.35.0
+current_version = 0.36.0
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(?P<rc>.*)

diff --git a/clients/python/setup.py b/clients/python/setup.py
@@ -24,7 +24,7 @@
 
 setup(
     name="marquez-python",
-    version="0.35.0",
+    version="0.36.0",
     description="Marquez Python Client",
     long_description=readme,
     long_description_content_type="text/markdown",

diff --git a/docker/metadata.json b/docker/metadata.json
@@ -3,7 +3,7 @@
     "eventType": "START",
     "eventTime": "2020-02-22T22:42:42.000Z",
     "run": {
-      "runId": "d46e465b-d358-4d32-83d4-df660ff614dd",
+      "runId": "4d3b8069-69b6-4708-ade0-3275112c9f04",
       "facets": {
         "nominalTime": {
           "_producer": "https://github.com/MarquezProject/marquez/blob/main/docker/metadata.json",
@@ -84,7 +84,7 @@
     "eventType": "COMPLETE",
     "eventTime": "2020-02-22T22:45:52.000Z",
     "run": {
-      "runId": "d46e465b-d358-4d32-83d4-df660ff614dd"
+      "runId": "4d3b8069-69b6-4708-ade0-3275112c9f04"
     },
     "job": {
       "namespace": "food_delivery",
@@ -1840,4 +1840,4 @@
     },
     "producer": "https://github.com/MarquezProject/marquez/blob/main/docker/metadata.json"
   }
-]
+]
diff --git a/docker/up.sh b/docker/up.sh
@@ -8,9 +8,9 @@
 set -e
 
 # Version of Marquez
-readonly VERSION=0.34.0
+readonly VERSION=0.35.0
 # Build version of Marquez
-readonly BUILD_VERSION=0.34.0
+readonly BUILD_VERSION=0.35.0
 
 title() {
   echo -e "\033[1m${1}\033[0m"

diff --git a/docs/openapi.html b/docs/openapi.html
diff --git a/gradle.properties b/gradle.properties
@@ -7,4 +7,4 @@ org.gradle.jvmargs=--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAME
   --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
   --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
 
-version=0.35.0-SNAPSHOT
+version=0.36.0-SNAPSHOT
diff --git a/spec/openapi.yml b/spec/openapi.yml
@@ -3,7 +3,7 @@
 openapi: 3.0.2
 info:
   title: Marquez
-  version: 0.35.0-SNAPSHOT
+  version: 0.36.0-SNAPSHOT
   description: Marquez is an open source **metadata service** for the **collection**, **aggregation**,
     and **visualization** of a data ecosystem's metadata.
   license:

diff --git a/web/src/__tests__/components/DatasetsPagination.test.tsx b/web/src/__tests__/components/DatasetsPagination.test.tsx
@@ -0,0 +1,21 @@
+import * as React from 'react'
+import { mount } from 'enzyme'
+import Datasets from '../../routes/datasets/Datasets'
+import { Tooltip } from '@material-ui/core'
+import IconButton from '@material-ui/core/IconButton'
+
+test.skip('DatasetsPagination Component', () => {
+
+    const wrapper = mount(<Datasets />)
+
+    it('should render', () => {
+        expect(wrapper.exists()).toBe(true)
+    })
+
+    it('should find Tooltip elements containing IconButton elements', () => {
+        expect(
+          wrapper
+            .find(Tooltip)
+        ).toContain(IconButton)
+    })
+})