Skip to content

Commit

Permalink
make incremental builds work
Browse files Browse the repository at this point in the history
  • Loading branch information
alafanechere committed Jan 12, 2022
1 parent 6d1444b commit e95abc9
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 13 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ subprojects {
source = fileTree(dir: projectDir)
.include("**/*.py")
.exclude(".venv/**/*.py")
.exclude("airbyte_api_client/**/*.py")
.exclude("**/airbyte_api_client/**/*.py")
.exclude("**/__init__.py")
strictCheck = true
}
Expand Down
1 change: 1 addition & 0 deletions octavia-cli/.dockerignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
build
!build/airbyte_api_client
.venv
octavia_cli.egg-info
1 change: 0 additions & 1 deletion octavia-cli/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
.coverage
.venv
airbyte_api_client/
13 changes: 3 additions & 10 deletions octavia-cli/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,13 @@ airbytePython {
moduleDirectory 'octavia_cli'
}

task generateApiClient(type: GenerateTask) {

def specFile = "$rootDir.absolutePath/airbyte-api/src/main/openapi/config.yaml"
def clientOutputDir = "$rootDir.absolutePath/octavia-cli/airbyte_api_client"

inputs.file specFile
outputs.dir clientOutputDir
task generateApiClient(type: GenerateTask) {
inputSpec = "$rootDir.absolutePath/airbyte-api/src/main/openapi/config.yaml"
outputDir = "$buildDir/airbyte_api_client"

generatorName = "python"
inputSpec = specFile
outputDir = clientOutputDir

packageName = "airbyte_api_client"

}

blackFormat.dependsOn generateApiClient
Expand Down
2 changes: 1 addition & 1 deletion octavia-cli/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"Tracker": "https://github.com/airbytehq/airbyte/issues",
},
packages=find_packages(exclude=("unit_tests", "docs")),
install_requires=["click~=8.0.3", f"airbyte_api_client @ file://{os.getcwd()}/airbyte_api_client"],
install_requires=["click~=8.0.3", f"airbyte_api_client @ file://{os.getcwd()}/build/airbyte_api_client"],
python_requires=">=3.8.12",
extras_require={
"dev": ["MyPy~=0.812", "pytest~=6.2.5", "pytest-cov", "pytest-mock", "requests-mock", "pre-commit"],
Expand Down

0 comments on commit e95abc9

Please sign in to comment.