You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by po...@apache.org on 2021/06/22 19:25:20 UTC
[airflow] 42/47: Cleans up pre-commits a little (#16547)
This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch v2-1-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 4e96c628587e3b38588755788e89f2793f6abf2f
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Sun Jun 20 14:32:11 2021 +0200
Cleans up pre-commits a little (#16547)
Few cleanups of pre-commits:
* moving non-image-dependent pre-commits before image building
* add setuptools as requirement for provider's dependency pre-commit
* force python 3.6 for all image-dependent pre-commits
(cherry picked from commit 1e56420cbfcf05c79f0d40eefd127e6a4f88870e)
---
.pre-commit-config.yaml | 61 ++++++++++++++++++------------
scripts/ci/pre_commit/pre_commit_flake8.sh | 1 +
scripts/ci/pre_commit/pre_commit_mypy.sh | 1 +
scripts/ci/pre_commit/pre_commit_pylint.sh | 1 +
4 files changed, 39 insertions(+), 25 deletions(-)
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index dfe6509..262c230 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -147,19 +147,20 @@ repos:
hooks:
- id: doctoc
name: Add TOC for md files
- files: ^README\.md$|^CONTRIBUTING\.md$|^UPDATING.*\.md$|^dev/.*\.md$|^dev/.*\.rst$
+ files:
+ ^README\.md$|^CONTRIBUTING\.md$|^UPDATING.*\.md$|^chart/UPDATING.*\.md$|^dev/.*\.md$|^dev/.*\.rst$
exclude: ^airflow/_vendor/
args:
- "--maxlevel"
- "2"
- repo: https://github.com/psf/black
- rev: 21.4b2
+ rev: 21.5b1
hooks:
- id: black
args: [--config=./pyproject.toml]
exclude: ^airflow/_vendor/
- repo: https://github.com/pre-commit/pre-commit-hooks
- rev: v3.4.0
+ rev: v4.0.1
hooks:
- id: check-merge-conflict
- id: debug-statements
@@ -181,7 +182,7 @@ repos:
args:
- --remove
- repo: https://github.com/asottile/pyupgrade
- rev: v2.13.0
+ rev: v2.19.0
hooks:
- id: pyupgrade
args: ["--py36-plus"]
@@ -211,7 +212,7 @@ repos:
# To keep consistent with the global isort skip config defined in setup.cfg
exclude: ^build/.*$|^.tox/.*$|^venv/.*$|^airflow/_vendor/
- repo: https://github.com/pycqa/pydocstyle
- rev: 6.0.0
+ rev: 6.1.1
hooks:
- id: pydocstyle
name: Run pydocstyle
@@ -284,9 +285,10 @@ repos:
- id: build-providers-dependencies
name: Build cross-dependencies for providers packages
entry: ./scripts/ci/pre_commit/pre_commit_build_providers_dependencies.sh
- language: system
+ language: python
files: ^airflow/providers/.*\.py$|^tests/providers/.*\.py$
pass_filenames: false
+ additional_dependencies: ['setuptools']
- id: update-extras
name: Update extras in documentation
entry: ./scripts/ci/pre_commit/pre_commit_insert_extras.py
@@ -542,11 +544,11 @@ repos:
require_serial: true
additional_dependencies: ['jsonschema==3.2.0', 'PyYAML==5.3.1', 'requests==2.25.0']
- id: json-schema
- name: Lint JSON Schema files with JSON Schema
+ name: Lint NodePort Service with JSON Schema
entry: ./scripts/ci/pre_commit/pre_commit_json_schema.py
args:
- --spec-url
- - https://raw.githubusercontent.com/instrumenta/kubernetes-json-schema/master/v1.14.9/service-v1.json
+ - https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.18.15-standalone/service-v1.json
language: python
pass_filenames: true
files: scripts/ci/kubernetes/nodeport.yaml
@@ -569,9 +571,10 @@ repos:
args:
- --spec-file
- chart/values_schema.schema.json
+ - chart/values.schema.json
language: python
- pass_filenames: true
- files: chart/values\.schema\.json$
+ pass_filenames: false
+ files: ^chart/values\.schema\.json$|^chart/values_schema\.schema\.json$
require_serial: true
additional_dependencies: ['jsonschema==3.2.0', 'PyYAML==5.3.1', 'requests==2.25.0']
- id: json-schema
@@ -581,9 +584,10 @@ repos:
- --enforce-defaults
- --spec-file
- chart/values.schema.json
+ - chart/values.yaml
language: python
- pass_filenames: true
- files: chart/values\.yaml$
+ pass_filenames: false
+ files: ^chart/values\.yaml$|^chart/values\.schema\.json$
require_serial: true
additional_dependencies: ['jsonschema==3.2.0', 'PyYAML==5.3.1', 'requests==2.25.0']
- id: json-schema
@@ -605,6 +609,26 @@ repos:
additional_dependencies: ['flynt==0.63']
files: \.py$
exclude: ^airflow/_vendor/
+ - id: ui-lint
+ name: ESLint against airflow/ui
+ language: node
+ 'types_or': [javascript, tsx, ts]
+ files: ^airflow/ui/
+ entry: scripts/ci/static_checks/ui_lint.sh
+ pass_filenames: false
+ - id: www-lint
+ name: ESLint against current UI js files
+ language: node
+ 'types_or': [javascript]
+ files: ^airflow/www/static/js/
+ entry: scripts/ci/static_checks/www_lint.sh
+ pass_filenames: false
+ - id: bats-in-container-tests
+ name: Run in container bats tests
+ language: system
+ entry: ./scripts/ci/pre_commit/pre_commit_in_container_bats_test.sh
+ files: ^tests/bats/in_container/.*\.bats$|^scripts/in_container/.*sh
+ pass_filenames: false
## ADD MOST PRE-COMMITS ABOVE THAT LINE
# The below pre-commits are those requiring CI image to be built
- id: build
@@ -661,17 +685,4 @@ repos:
files: \.py$
pass_filenames: true
exclude: ^airflow/_vendor/
- - id: ui-lint
- name: ESLint against airflow/ui
- language: node
- 'types_or': [javascript, tsx, ts]
- files: ^airflow/ui/
- entry: ./scripts/ci/static_checks/eslint.sh
- pass_filenames: false
- - id: bats-in-container-tests
- name: Run in container bats tests
- language: system
- entry: ./scripts/ci/pre_commit/pre_commit_in_container_bats_test.sh
- files: ^tests/bats/in_container/.*\.bats$|^scripts/in_container/.*sh
- pass_filenames: false
## ONLY ADD PRE-COMMITS HERE THAT REQUIRE CI IMAGE
diff --git a/scripts/ci/pre_commit/pre_commit_flake8.sh b/scripts/ci/pre_commit/pre_commit_flake8.sh
index b1a061a..84f50ab 100755
--- a/scripts/ci/pre_commit/pre_commit_flake8.sh
+++ b/scripts/ci/pre_commit/pre_commit_flake8.sh
@@ -15,6 +15,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+export PYTHON_MAJOR_MINOR_VERSION="3.6"
export FORCE_ANSWER_TO_QUESTIONS=${FORCE_ANSWER_TO_QUESTIONS:="quit"}
export REMEMBER_LAST_ANSWER="true"
export PRINT_INFO_FROM_SCRIPTS="false"
diff --git a/scripts/ci/pre_commit/pre_commit_mypy.sh b/scripts/ci/pre_commit/pre_commit_mypy.sh
index 45ee602..8204658 100755
--- a/scripts/ci/pre_commit/pre_commit_mypy.sh
+++ b/scripts/ci/pre_commit/pre_commit_mypy.sh
@@ -15,6 +15,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+export PYTHON_MAJOR_MINOR_VERSION="3.6"
export FORCE_ANSWER_TO_QUESTIONS=${FORCE_ANSWER_TO_QUESTIONS:="quit"}
export REMEMBER_LAST_ANSWER="true"
export PRINT_INFO_FROM_SCRIPTS="false"
diff --git a/scripts/ci/pre_commit/pre_commit_pylint.sh b/scripts/ci/pre_commit/pre_commit_pylint.sh
index 332f36a..163979a 100755
--- a/scripts/ci/pre_commit/pre_commit_pylint.sh
+++ b/scripts/ci/pre_commit/pre_commit_pylint.sh
@@ -15,6 +15,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+export PYTHON_MAJOR_MINOR_VERSION="3.6"
export FORCE_ANSWER_TO_QUESTIONS=${FORCE_ANSWER_TO_QUESTIONS:="quit"}
export REMEMBER_LAST_ANSWER="true"
export PRINT_INFO_FROM_SCRIPTS="false"