Skip to content

Commit

Permalink
Merge branch 'main' into bug/job-event-null-pointer-outputs
Browse files Browse the repository at this point in the history
  • Loading branch information
davidsharp7 authored Nov 13, 2024
2 parents 2f4cd2e + 41d9d3d commit 4ccc0b8
Show file tree
Hide file tree
Showing 13 changed files with 26 additions and 22 deletions.
2 changes: 1 addition & 1 deletion CODE_QUALITY_AND_SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ The specific security and analysis methodologies that we employ include but are

For more information about our approach to quality and security, feel free to reach out to the Marquez development team:

- Slack: [Marquezproject.slack.com](https://bit.ly/Marquez_Slack_invite)
- Slack: [Marquezproject.slack.com](https://join.slack.com/t/marquezproject/shared_invite/zt-2iylxasbq-GG_zXNcJdNrhC9uUMr3B7A)
- Twitter: [@MarquezProject](https://twitter.com/MarquezProject)

----
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](https://bit.ly/Marquez_Slack_invite) channel and leave us feedback or help with answering questions from the community
* Join our [slack](https://join.slack.com/t/marquezproject/shared_invite/zt-2iylxasbq-GG_zXNcJdNrhC9uUMr3B7A) 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](https://bit.ly/Marquez_Slack_invite) 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](https://join.slack.com/t/marquezproject/shared_invite/zt-2iylxasbq-GG_zXNcJdNrhC9uUMr3B7A) 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
2 changes: 1 addition & 1 deletion GOVERNANCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ Or a meeting may be at an organization's offices that are required to maintain a

## Marquez on Slack

Marquez uses [a Slack community](https://bit.ly/Marquez_Slack_invite) to provide an ongoing dialogue between members.
Marquez uses [a Slack community](https://join.slack.com/t/marquezproject/shared_invite/zt-2iylxasbq-GG_zXNcJdNrhC9uUMr3B7A) to provide an ongoing dialogue between members.
This creates a recorded discussion of design decisions and discussions that complement the project meetings.

Follow the link above and register with the Slack service using your email address.
Expand Down
4 changes: 2 additions & 2 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)](https://bit.ly/Marquez_Slack_invite)
[![Slack](https://img.shields.io/badge/slack-chat-blue.svg)](https://join.slack.com/t/marquezproject/shared_invite/zt-2iylxasbq-GG_zXNcJdNrhC9uUMr3B7A)
[![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 @@ -179,7 +179,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: [MarquezProject Slack](https://bit.ly/Marquez_Slack_invite)
* Chat: [MarquezProject Slack](https://join.slack.com/t/marquezproject/shared_invite/zt-2iylxasbq-GG_zXNcJdNrhC9uUMr3B7A)
* X: [@MarquezProject](https://twitter.com/MarquezProject)

## Contributing
Expand Down
1 change: 1 addition & 0 deletions clients/python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"six",
"pyrfc3339",
"deprecation",
"pytz",
]

extras_require = {
Expand Down
6 changes: 3 additions & 3 deletions docker/up.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ usage() {
echo " ./up.sh --db-port 2345"
echo
title "ARGUMENTS:"
echo " -a, --api-port int api port (default: 5000)"
echo " -m, --api-admin-port int api admin port (default: 5001)"
echo " -a, --api-port int API port (default: 5000)"
echo " -m, --api-admin-port int API admin port (default: 5001)"
echo " -w, --web-port int web port (default: 3000)"
echo " -d, --db-port int database port (default: 5432)"
echo " -p, --db-port int database port (default: 5432)"
echo " -e, --search-port int search port (default: 9200)"
echo " -t, --tag string docker image tag (default: ${VERSION})"
echo " --args string docker arguments"
Expand Down
2 changes: 1 addition & 1 deletion docs/v2/docs/quickstart/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -150,4 +150,4 @@ In this simple example, we showed you how to write sample lineage metadata to a

## Feedback {#feedback}

What did you think of this guide? You can reach out to us on [slack](https://bit.ly/Marquez_Slack_invite) and leave us feedback, or [open a pull request](https://github.com/MarquezProject/marquez/blob/main/CONTRIBUTING.md#submitting-a-pull-request) with your suggestions!
What did you think of this guide? You can reach out to us on [slack](https://join.slack.com/t/marquezproject/shared_invite/zt-2iylxasbq-GG_zXNcJdNrhC9uUMr3B7A) and leave us feedback, or [open a pull request](https://github.com/MarquezProject/marquez/blob/main/CONTRIBUTING.md#submitting-a-pull-request) with your suggestions!
2 changes: 1 addition & 1 deletion docs/v2/docusaurus.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ const config = {
items: [
{
label: 'Slack',
href: 'https://bit.ly/Marquez_Slack_invite',
href: 'https://join.slack.com/t/marquezproject/shared_invite/zt-2iylxasbq-GG_zXNcJdNrhC9uUMr3B7A',
},
{
label: 'YouTube',
Expand Down
2 changes: 1 addition & 1 deletion docs/v2/src/pages/about/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,5 @@ We're excited you're interested in contributing to Marquez! We'd love your help,

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](https://bit.ly/Marquez_Slack_invite) 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](https://join.slack.com/t/marquezproject/shared_invite/zt-2iylxasbq-GG_zXNcJdNrhC9uUMr3B7A) 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!

2 changes: 1 addition & 1 deletion docs/v2/src/pages/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ function HomepageHeader() {
</Link>
<Link
className="button button--secondary button--md margin-left--md"
href="https://bit.ly/Marquez_Slack_invite">
href="https://join.slack.com/t/marquezproject/shared_invite/zt-2iylxasbq-GG_zXNcJdNrhC9uUMr3B7A">
<img
className={styles.btn_logos}
src="img/slack.svg"
Expand Down
2 changes: 1 addition & 1 deletion docs/v2/src/pages/resources/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ template: basepage

---

If you would like your blog post, video, or resource to be included on this list, please reach out to us on [Marquez Slack](https://bit.ly/MarquezSlack)
If you would like your blog post, video, or resource to be included on this list, please reach out to us on [Marquez Slack](https://join.slack.com/t/marquezproject/shared_invite/zt-2iylxasbq-GG_zXNcJdNrhC9uUMr3B7A)
2 changes: 1 addition & 1 deletion proposals/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Once your proposal has been _`accepted`_, and has been associated with a milesto

## Questions?

If you need help with the proposal process, please reach out to us on our [slack](https://bit.ly/Marquez_Slack_invite) channel.
If you need help with the proposal process, please reach out to us on our [slack](https://join.slack.com/t/marquezproject/shared_invite/zt-2iylxasbq-GG_zXNcJdNrhC9uUMr3B7A) channel.

----
SPDX-License-Identifier: Apache-2.0
Expand Down
17 changes: 10 additions & 7 deletions web/src/components/jobs/RunInfo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ type RunInfoProps = {

const RunInfo: FunctionComponent<RunInfoProps> = (props) => {
const { run, jobFacets, fetchJobFacets, resetFacets } = props
const i18next = require('i18next')

useEffect(() => {
fetchJobFacets(run.id)
Expand All @@ -65,16 +64,20 @@ const RunInfo: FunctionComponent<RunInfoProps> = (props) => {
language={(jobFacets.sourceCode as SourceCodeFacet)?.language}
/>
)}
{jobFacets && (
<Box mt={2}>
<Box mb={1}>
<MqText subheading>JOB FACETS</MqText>
</Box>
<MqJsonView data={jobFacets} aria-label={'Job facets'} aria-required='true' />
</Box>
)}
{run.facets && (
<Box mt={2}>
<Box mb={1}>
<MqText subheading>{i18next.t('jobs.runinfo_subhead')}</MqText>
<MqText subheading>RUN FACETS</MqText>
</Box>
<MqJsonView
data={run.facets}
aria-label={i18next.t('jobs.facets_subhead_aria')}
aria-required='true'
/>
<MqJsonView data={run.facets} aria-label={'Run facets'} aria-required='true' />
</Box>
)}
</Box>
Expand Down

0 comments on commit 4ccc0b8

Please sign in to comment.