Skip to content

Commit 5dbebbc

Browse files
authored
Merge branch 'master' into prefect-source-integration
2 parents 2ba316e + a5e4738 commit 5dbebbc

File tree

333 files changed

+11257
-5186
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

333 files changed

+11257
-5186
lines changed
+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import setuptools
2+
3+
folders = ["./smoke-test/tests"]
4+
5+
for folder in folders:
6+
print(f"Checking folder {folder}")
7+
a = [i for i in setuptools.find_packages(folder) if "cypress" not in i]
8+
b = [i for i in setuptools.find_namespace_packages(folder) if "cypress" not in i]
9+
10+
in_a_not_b = set(a) - set(b)
11+
in_b_not_a = set(b) - set(a)
12+
13+
assert (
14+
len(in_a_not_b) == 0
15+
), f"Found packages in {folder} that are not in namespace packages: {in_a_not_b}"
16+
assert (
17+
len(in_b_not_a) == 0
18+
), f"Found namespace packages in {folder} that are not in packages: {in_b_not_a}"

.github/workflows/docker-unified.yml

+21
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,29 @@ env:
3737
DATAHUB_INGESTION_IMAGE: "acryldata/datahub-ingestion"
3838

3939
jobs:
40+
check_lint:
41+
runs-on: ubuntu-latest
42+
steps:
43+
- name: Check out the repo
44+
uses: hsheth2/sane-checkout-action@v1
45+
- uses: actions/setup-python@v4
46+
with:
47+
python-version: "3.10"
48+
cache: "pip"
49+
- name: Set up JDK 17
50+
uses: actions/setup-java@v3
51+
with:
52+
distribution: "zulu"
53+
java-version: 17
54+
- name: Ensure packages are correct
55+
run: |
56+
python ./.github/scripts/check_python_package.py
57+
- name: Run lint on smoke test
58+
run: |
59+
./gradlew :smoke-test:lint
4060
setup:
4161
runs-on: ubuntu-latest
62+
needs: check_lint
4263
outputs:
4364
tag: ${{ steps.tag.outputs.tag }}
4465
slim_tag: ${{ steps.tag.outputs.slim_tag }}

build.gradle

+8-7
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ buildscript {
3030

3131
ext.junitJupiterVersion = '5.6.1'
3232
// Releases: https://github.com/linkedin/rest.li/blob/master/CHANGELOG.md
33-
ext.pegasusVersion = '29.48.4'
33+
ext.pegasusVersion = '29.51.0'
3434
ext.mavenVersion = '3.6.3'
3535
ext.springVersion = '6.1.2'
3636
ext.springBootVersion = '3.2.1'
@@ -269,13 +269,14 @@ allprojects {
269269
apply plugin: 'eclipse'
270270
// apply plugin: 'org.gradlex.java-ecosystem-capabilities'
271271

272-
tasks.withType(Test).configureEach {
273-
// https://docs.gradle.org/current/userguide/performance.html
274-
maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) ?: 1
272+
tasks.withType(Test).configureEach { task -> if (task.project.name != "metadata-io") {
273+
// https://docs.gradle.org/current/userguide/performance.html
274+
maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) ?: 1
275275

276-
if (project.configurations.getByName("testImplementation").getDependencies()
277-
.any{ it.getName().contains("testng") }) {
278-
useTestNG()
276+
if (project.configurations.getByName("testImplementation").getDependencies()
277+
.any { it.getName().contains("testng") }) {
278+
useTestNG()
279+
}
279280
}
280281
}
281282

buildSrc/build.gradle

-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,4 @@ dependencies {
2525

2626
compileOnly 'org.projectlombok:lombok:1.18.30'
2727
annotationProcessor 'org.projectlombok:lombok:1.18.30'
28-
29-
// pegasus dependency, overrides for tasks
30-
implementation 'com.linkedin.pegasus:gradle-plugins:29.48.4'
3128
}

0 commit comments

Comments
 (0)