Skip to content

Commit

Permalink
Merge branch 'rc_2_0_0' into dependabot/pip/jinja2-3.1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
asafgardin authored Jan 30, 2024
2 parents d2d8f26 + 78709a7 commit dbbff5f
Show file tree
Hide file tree
Showing 126 changed files with 2,664 additions and 825 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/integration-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- main
- "rc_*"

env:
POETRY_VERSION: "1.7.1"
Expand Down Expand Up @@ -33,7 +34,7 @@ jobs:
poetry env use ${{ matrix.python-version }}
- name: Install dependencies
run: |
poetry install --no-root --only dev --all-extras
poetry install --only dev --all-extras
- name: Lint Python (Black)
run: |
poetry run inv formatter
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,4 @@ jobs:
uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29
with:
user: __token__
password: ${{ secrets.TEST_PYPI_TOKEN }}
repository_url: https://test.pypi.org/legacy/
password: ${{ secrets.PYPI_API_TOKEN }}
27 changes: 0 additions & 27 deletions .github/workflows/quality-checks.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
python-version: ["3.8", "3.9", "3.10", "3.11"]
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -69,7 +69,7 @@ jobs:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
run: |
poetry run pytest
poetry run pytest tests/unittests/
- name: Upload pytest test results
uses: actions/upload-artifact@v3
with:
Expand Down
157 changes: 51 additions & 106 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,126 +1,93 @@
# yaml-language-server: $schema=https://json.schemastore.org/pre-commit-config.json

minimum_pre_commit_version: 2.20.0
fail_fast: false
default_stages:
- commit
exclude: (.idea|vscode)
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.0.1
rev: v4.4.0
hooks:
- id: check-added-large-files
exclude: (ai21_tokenizer/resources|tests/resources)
- id: check-case-conflict
- id: check-executables-have-shebangs
- id: check-shebang-scripts-are-executable
- id: check-merge-conflict
- id: check-symlinks
- id: detect-private-key
exclude: .gitleaks.toml
- id: no-commit-to-branch
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: mixed-line-ending
exclude: (CHANGELOG.md)
- id: check-json
- id: check-toml
- id: check-xml
- id: pretty-format-json
args:
- --autofix
- --no-sort-keys
- repo: https://github.com/jumanjihouse/pre-commit-hooks
rev: 2.1.5
rev: 3.0.0
hooks:
- id: forbid-binary
exclude: (ai21_tokenizer/resources|tests/resources)
- id: git-check
files: "CHANGELOG.md"
- repo: https://github.com/adrienverge/yamllint
rev: v1.26.3
- repo: https://github.com/commitizen-tools/commitizen
rev: v3.5.3
hooks:
- id: yamllint
name: Lint YAML files
args:
- --strict
- repo: https://github.com/sirosen/check-jsonschema
rev: 0.4.1
- id: commitizen
name: Lint commit message
stages:
- commit-msg
- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.23.3
hooks:
- id: check-jsonschema
name: Validate GitHub Workflows
files: ^\.github/workflows/.*\.yml
types:
- yaml
args:
- --schemafile
- https://json.schemastore.org/github-workflow.json
- id: check-jsonschema
name: Validate GitHub Actions
files: >
(?x)^(
.*/action\.(yml|yaml)|
\.github/actions/.*
)$
types:
- yaml
args:
- --schemafile
- https://json.schemastore.org/github-action
- id: check-jsonschema
name: Validate DependaBot
files: ^\.github/dependabot\.yml
types:
- yaml
args:
- --schemafile
- https://json.schemastore.org/dependabot-2.0.json
- id: check-jsonschema
name: Validate MarkdownLint
files: .*\.markdownlint\.yaml
name: Validate Pre-commit
files: .*\.pre-commit-config\.yaml
types:
- yaml
args:
- --schemafile
- https://json.schemastore.org/markdownlint.json
- https://json.schemastore.org/pre-commit-config.json
- id: check-jsonschema
name: Validate YamlLint
name: Validate YamlLint configuration
files: .*\.yamllint\.yaml
types:
- yaml
args:
- --schemafile
- https://json.schemastore.org/yamllint.json
- id: check-jsonschema
name: Validate Pre-commit
files: .*\.pre-commit-config\.yaml
name: Validate Prettier configuration
files: .*\.prettierrc\.yaml
types:
- yaml
args:
- --schemafile
- https://json.schemastore.org/pre-commit-config.json
- http://json.schemastore.org/prettierrc
- id: check-jsonschema
name: Validate Docker-Compose
files: .*docker-compose\.yml
name: Validate ArgoWorkflow files
files: ^workflows/template/.*
types:
- yaml
args:
- --verbose
- --schemafile
- https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json
- id: check-jsonschema
name: Validate Renovate
files: ^\.github/renovate\.json
types:
- json
args:
- --schemafile
- https://docs.renovatebot.com/renovate-schema.json
- repo: https://github.com/commitizen-tools/commitizen
rev: v2.18.0
- https://raw.githubusercontent.com/argoproj/argo-workflows/master/api/jsonschema/schema.json
- repo: https://github.com/python-poetry/poetry
rev: 1.5.0
hooks:
- id: commitizen
name: Lint commit message
stages:
- commit-msg
- id: poetry-check
- repo: https://github.com/adrienverge/yamllint
rev: v1.32.0
hooks:
- id: yamllint
name: Lint YAML files
args:
- --format
- parsable
- --strict
- repo: https://github.com/shellcheck-py/shellcheck-py
rev: v0.7.2.1
rev: v0.9.0.5
hooks:
- id: shellcheck
name: Check sh files (and patch)
Expand All @@ -140,45 +107,23 @@ repos:
- yaml
- markdown
- shell
- repo: local
- repo: https://github.com/psf/black
rev: 23.7.0
hooks:
- id: list-files
name: List files
language: system
entry: bash -c 'echo $@'
stages:
- manual
- id: shfmt
name: Format sh files
language: docker_image
entry: mvdan/shfmt:v3.4.0
args:
- -w
- -s
- -i
- "2"
- id: black
types:
- shell
- id: markdownlint
name: Lint Markdown files
language: docker_image
entry: 06kellyjac/markdownlint-cli:0.28.1
- python
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.0.280
hooks:
- id: ruff
args:
- --fix
types:
- markdown
- repo: local
hooks:
- id: hadolint
name: Lint Dockerfiles
language: docker_image
entry: hadolint/hadolint:v2.8.0 hadolint
entry: hadolint/hadolint:v2.10.0 hadolint
types:
- dockerfile
- id: gitleaks
name: Detect hardcoded secrets
language: docker_image
entry: zricethezav/gitleaks:v7.6.1
args:
- --append-repo-config
- --config-path
- .gitleaks.toml
- --verbose
Loading

0 comments on commit dbbff5f

Please sign in to comment.