Skip to content

Commit

Permalink
Merge branch 'master' into bump_kubernetes_module_for_cve_2020_1747
Browse files Browse the repository at this point in the history
  • Loading branch information
Gregory-Pereira committed Apr 25, 2022
2 parents a93ecc8 + 2d2053f commit c04d715
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 32 deletions.
21 changes: 7 additions & 14 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
repos:
- repo: https://github.com/Lucas-C/pre-commit-hooks
rev: v1.1.9
rev: v1.1.13
hooks:
- id: remove-tabs

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.4.0
rev: v4.1.0
hooks:
- id: trailing-whitespace
- id: check-merge-conflict
Expand All @@ -23,39 +23,32 @@ repos:
- id: debug-statements

- repo: https://github.com/pycqa/pydocstyle.git
rev: 5.1.1
rev: 6.1.1
hooks:
- id: pydocstyle

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.4.0
rev: v4.1.0
hooks:
- id: check-toml
- id: check-yaml
- id: end-of-file-fixer
- id: trailing-whitespace

- repo: https://github.com/pre-commit/mirrors-mypy
rev: v0.800
hooks:
- id: mypy
exclude: '^(docs|tasks|tests)|setup\.py'
args: [--ignore-missing-imports]

- repo: https://github.com/psf/black
rev: 20.8b1
rev: 22.3.0
hooks:
- id: black

- repo: https://gitlab.com/PyCQA/flake8
rev: '3.8.4'
rev: '3.9.2'
hooks:
- id: flake8
additional_dependencies: ['pep8-naming']
# Ignore all format-related checks as Black takes care of those.
args: ['--ignore', 'E2,W5', '--select', 'E,W,F,N', '--max-line-length=120']

- repo: https://github.com/mgedmin/check-manifest
rev: '0.46'
rev: '0.48'
hooks:
- id: check-manifest
4 changes: 2 additions & 2 deletions .prow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ presubmits:
context: aicoe-ci/prow/pre-commit
spec:
containers:
- image: quay.io/thoth-station/thoth-precommit-py38:v0.12.5
- image: quay.io/thoth-station/thoth-precommit-py38:v0.14.3
command:
- "pre-commit"
- "run"
Expand All @@ -26,7 +26,7 @@ presubmits:
context: aicoe-ci/prow/pytest
spec:
containers:
- image: quay.io/thoth-station/thoth-pytest-py38:v0.12.9
- image: quay.io/thoth-station/thoth-pytest-py38:v0.14.3
command:
- "/bin/run-pytest"
resources:
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# Changelog for the Thoth common module

## Release 0.36.2 (2022-04-12T14:30:11)
* f60c5ce Replace slash with dash in repo slug [scheduling mi workflows] (#1249)
* cc06aad Moving out the mypy as separate check
* d2b808b Update mypy config python version to 3.8
* 54c810c Fix pre-commit version to be ==2.15.0
* 53b4441 Update prow image tags
* 9c87ab5 Autoupdate pre-commit
* 11c303f :arrow_up: Automatic update of dependencies by Kebechet for the ubi8 environment
* e0dc247 Send messages based on template defaults, do not hardcode (#1231)

## Release 0.36.1 (2022-03-14T15:17:12)
* Remove rfc5424-logging-handler from dependencies
* Remove venv import
Expand Down
4 changes: 2 additions & 2 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ daiquiri = "*"
requests = "*"
sentry-sdk = "*"
kubernetes = ">=12.0.1" # required pyyaml>=5.3.1
openshift = "==0.12.0"
openshift = "~=0.12.0"
attrs = "*"
pyyaml = ">=5.3.1"
flexmock = "*"
Expand All @@ -23,7 +23,7 @@ pylint = "*"
coala = "*"
pytest-mypy = "*"
mypy = "*"
pre-commit = "==2.0.1"
pre-commit = "==2.15.0"

[requires]
python_version = "3.8"
14 changes: 3 additions & 11 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion mypy.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[mypy]
python_version = 3.6
python_version = 3.8
warn_unused_configs = true
disallow_subclassing_any = true
disallow_any_generics = true
Expand Down
2 changes: 1 addition & 1 deletion thoth/common/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
from .workflows import WorkflowManager

__name__ = "thoth-common"
__version__ = "0.36.1"
__version__ = "0.36.2"


__all__ = [
Expand Down
2 changes: 1 addition & 1 deletion thoth/common/openshift.py
Original file line number Diff line number Diff line change
Expand Up @@ -1492,7 +1492,7 @@ def schedule_mi_workflow(
"""
prefixes = []
if repository:
prefixes.append(repository)
prefixes.append("-".join(repository.split("/")))
if create_knowledge:
prefixes.append("analysis")
if mi_merge:
Expand Down

0 comments on commit c04d715

Please sign in to comment.