update dependencies

This commit is contained in:
Henning Jacobs
2022-05-20 11:17:25 +02:00
parent cb44d184a7
commit 1d09479a6a
5 changed files with 830 additions and 913 deletions

View File

@@ -17,17 +17,17 @@ repos:
# formatters # formatters
- repo: https://github.com/asottile/reorder_python_imports - repo: https://github.com/asottile/reorder_python_imports
rev: v2.2.0 rev: v3.1.0
hooks: hooks:
- id: reorder-python-imports - id: reorder-python-imports
- repo: https://github.com/ambv/black - repo: https://github.com/ambv/black
rev: 19.10b0 rev: 22.3.0
hooks: hooks:
- id: black - id: black
- repo: https://github.com/asottile/pyupgrade - repo: https://github.com/asottile/pyupgrade
rev: v2.3.0 rev: v2.32.1
hooks: hooks:
- id: pyupgrade - id: pyupgrade
stages: [push] stages: [push]
@@ -35,14 +35,14 @@ repos:
# linters # linters
- repo: https://github.com/PyCQA/bandit - repo: https://github.com/PyCQA/bandit
rev: 1.6.2 rev: 1.7.4
hooks: hooks:
- id: bandit - id: bandit
args: ["-x", "tests"] args: ["-x", "tests"]
stages: [push] stages: [push]
- repo: https://github.com/PyCQA/pydocstyle - repo: https://github.com/PyCQA/pydocstyle
rev: 5.0.2 rev: 6.1.1
hooks: hooks:
- id: pydocstyle - id: pydocstyle
args: ["--ignore=D10,D21,D202"] args: ["--ignore=D10,D21,D202"]
@@ -68,15 +68,21 @@ repos:
stages: [push] stages: [push]
- repo: https://github.com/adrienverge/yamllint - repo: https://github.com/adrienverge/yamllint
rev: v1.23.0 rev: v1.26.3
hooks: hooks:
- id: yamllint - id: yamllint
args: ["--strict", "-d", "{rules: {line-length: {max: 180}}}"] args: ["--strict", "-d", "{rules: {line-length: {max: 180}}}"]
- repo: https://github.com/pre-commit/mirrors-mypy - repo: https://github.com/pre-commit/mirrors-mypy
rev: v0.770 rev: v0.950
hooks: hooks:
- id: mypy - id: mypy
additional_dependencies: ["types-requests", "types-PyYAML", "types-redis"]
- repo: https://gitlab.com/pycqa/flake8
rev: 3.9.2
hooks:
- id: flake8
- repo: https://github.com/pryorda/dockerfilelint-precommit-hooks - repo: https://github.com/pryorda/dockerfilelint-precommit-hooks
rev: v0.1.0 rev: v0.1.0
@@ -87,14 +93,12 @@ repos:
# miscellaneous # miscellaneous
- repo: https://github.com/pre-commit/pre-commit-hooks - repo: https://github.com/pre-commit/pre-commit-hooks
rev: v2.5.0 rev: v4.2.0
hooks: hooks:
- id: check-added-large-files - id: check-added-large-files
- id: check-docstring-first - id: check-docstring-first
- id: debug-statements - id: debug-statements
- id: end-of-file-fixer - id: end-of-file-fixer
- id: flake8
additional_dependencies: ["flake8-bugbear"]
- id: trailing-whitespace - id: trailing-whitespace
- id: check-ast - id: check-ast
- id: check-builtin-literals - id: check-builtin-literals
@@ -104,7 +108,7 @@ repos:
args: ["--django"] args: ["--django"]
- repo: https://github.com/pre-commit/pygrep-hooks - repo: https://github.com/pre-commit/pygrep-hooks
rev: v1.5.1 rev: v1.9.0
hooks: hooks:
# - id: rst-backticks # - id: rst-backticks
- id: python-use-type-annotations - id: python-use-type-annotations
@@ -117,6 +121,6 @@ repos:
# http://jorisroovers.com/gitlint/#using-gitlint-through-pre-commit # http://jorisroovers.com/gitlint/#using-gitlint-through-pre-commit
- repo: https://github.com/jorisroovers/gitlint - repo: https://github.com/jorisroovers/gitlint
rev: v0.13.1 rev: v0.17.0
hooks: hooks:
- id: gitlint - id: gitlint

View File

@@ -16,7 +16,7 @@ def expo(n: int, base=2, factor=1, max_value=None):
of max_value will forever after be yielded. of max_value will forever after be yielded.
""" """
a = factor * base ** n a = factor * base**n
if max_value is None or a < max_value: if max_value is None or a < max_value:
return a return a
else: else:

View File

@@ -168,9 +168,9 @@ class RedisStore(AbstractStore):
def redeem_screen_token(self, token: str, remote_addr: str): def redeem_screen_token(self, token: str, remote_addr: str):
"""Validate the given token and bind it to the IP.""" """Validate the given token and bind it to the IP."""
redis_key = "screen-tokens:{}".format(token) redis_key = "screen-tokens:{}".format(token)
data = self._redis.get(redis_key) data_binary = self._redis.get(redis_key)
if not data: if not data_binary:
raise ValueError("Invalid token") raise ValueError("Invalid token")
data = json.loads(data.decode("utf-8")) data = json.loads(data_binary.decode("utf-8"))
data = check_token(token, remote_addr, data) data = check_token(token, remote_addr, data)
self._redis.set(redis_key, json.dumps(data)) self._redis.set(redis_key, json.dumps(data))

1696
poetry.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -6,7 +6,7 @@ description = "Kubernetes Operational View - read-only system dashboard for mult
authors = ["Henning Jacobs <henning@jacobs1.de>"] authors = ["Henning Jacobs <henning@jacobs1.de>"]
[tool.poetry.dependencies] [tool.poetry.dependencies]
python = ">=3.7" python = ">=3.10,<4"
click = "*" click = "*"
flask = "*" flask = "*"
flask-dance = "*" flask-dance = "*"
@@ -15,13 +15,10 @@ json-delta = ">=2.0"
pykube-ng = "*" pykube-ng = "*"
redlock-py = "*" redlock-py = "*"
requests = "*" requests = "*"
# for Python 3.10 support
urllib3 = ">=1.26"
stups-tokens = ">=1.1.19" stups-tokens = ">=1.1.19"
[tool.poetry.dev-dependencies] [tool.poetry.dev-dependencies]
coveralls = "*"
flake8 = "*"
pytest = "*"
pytest-cov = "*" pytest-cov = "*"
black = "^19.10b0" pre-commit = "^2.9.2"
mypy = "^0.761"
pre-commit = "^1.21.0"