build: streamline gradle setup (#5)

acryldata · Nov 10, 2022 · b962d9d · b962d9d
1 parent d9af4f7
commit b962d9d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/datahub-classify/build.gradle b/datahub-classify/build.gradle
@@ -24,7 +24,7 @@ ext {
 }
 
 task checkPythonVersion(type: Exec) {
-  commandLine python_executable, '-c', 'import sys; assert sys.version_info >= (3, 6)'
+  commandLine python_executable, '-c', 'import sys; assert sys.version_info >= (3, 7)'
 }
 
 task environmentSetup(type: Exec, dependsOn: checkPythonVersion) {
@@ -50,12 +50,7 @@ task installDev(type: Exec, dependsOn: [install]) {
 }
 
 task lint(type: Exec, dependsOn: installDev) {
-  /*
-    The find/sed combo below is a temporary work-around for the following mypy issue with airflow 2.2.0:
-   "venv/lib/python3.8/site-packages/airflow/_vendor/connexion/spec.py:169: error: invalid syntax".
-   */
   commandLine 'bash', '-x', '-c',
-    "find ${venv_name}/lib -path *airflow/_vendor/connexion/spec.py -exec sed -i.bak -e '169,169s/  # type: List\\[str\\]//g' {} \\; && " +
     "source ${venv_name}/bin/activate && black --check --diff src/ tests/ && isort --check --diff src/ tests/ && flake8 --count --statistics src/ tests/ && mypy src/ tests/"
 }
 task lintFix(type: Exec, dependsOn: installDev) {
@@ -87,13 +82,13 @@ task installDevTest(type: Exec, dependsOn: [installDev]) {
 def testFile = hasProperty('testFile') ? testFile : 'unknown'
 task testSingle(dependsOn: [installDevTest]) {
   doLast {
-  if (testFile != 'unknown')  {
-  exec {
-    commandLine 'bash', '-x', '-c',
-     "source ${venv_name}/bin/activate && pytest ${testFile}"
-    }
-  } else {
-   throw new GradleException("No file provided. Use -PtestFile=<test_file>")
+    if (testFile != 'unknown')  {
+    exec {
+      commandLine 'bash', '-x', '-c',
+      "source ${venv_name}/bin/activate && pytest ${testFile}"
+      }
+    } else {
+      throw new GradleException("No file provided. Use -PtestFile=<test_file>")
     }
   }
 }

diff --git a/datahub-classify/scripts/release.sh b/datahub-classify/scripts/release.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Copyright 2021 Acryl Data, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,7 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#!/bin/bash
 set -euxo pipefail
 
 if [[ ! ${RELEASE_SKIP_TEST:-} ]]; then