From cd2b8ca969eda29fbe0808855ee5957f2bf07611 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 14 Nov 2023 14:22:12 +0000 Subject: [PATCH 1/2] build: update pre-commit hooks --- .pre-commit-config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8a6e50a405..f1677d86c8 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -9,7 +9,7 @@ repos: hooks: - id: check-hooks-apply - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v4.5.0 hooks: - id: check-ast - id: check-json @@ -22,12 +22,12 @@ repos: exclude: \.dot$ - id: debug-statements - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.0.291 + rev: v0.1.6 hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] - repo: https://github.com/pre-commit/mirrors-eslint - rev: v8.50.0 + rev: v8.54.0 hooks: - id: eslint args: [--fix, --color] From 7418e9727cfeaa19ecd923a4f4acb751a79bea9b Mon Sep 17 00:00:00 2001 From: Heinz-Alexander Fuetterer Date: Wed, 15 Nov 2023 15:52:40 +0100 Subject: [PATCH 2/2] chore: fix ruff errors (PGH002, UP032) --- rdmo/projects/utils.py | 5 +---- rdmo/services/providers.py | 8 ++++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/rdmo/projects/utils.py b/rdmo/projects/utils.py index 94b57e0793..d20e641b99 100644 --- a/rdmo/projects/utils.py +++ b/rdmo/projects/utils.py @@ -101,10 +101,7 @@ def save_import_snapshot_values(project, snapshots, checked): for value in snapshot.snapshot_values: if value.attribute: - value_key = '{value.attribute.uri}[{snapshot_index}][{value.set_prefix}][{value.set_index}][{value.collection_index}]'.format( # noqa: E501 - value=value, - snapshot_index=snapshot.snapshot_index - ) + value_key = f"{value.attribute.uri}[{snapshot.snapshot_index}][{value.set_prefix}][{value.set_index}][{value.collection_index}]" # noqa: E501 if value_key in checked: # assert that this is a new value diff --git a/rdmo/services/providers.py b/rdmo/services/providers.py index 41b6530224..ea06629425 100644 --- a/rdmo/services/providers.py +++ b/rdmo/services/providers.py @@ -25,14 +25,14 @@ def get(self, request, url): response = requests.get(url, headers=self.get_authorization_headers(access_token)) if response.status_code == 401: - logger.warn('get forbidden: %s (%s)', response.content, response.status_code) + logger.warning('get forbidden: %s (%s)', response.content, response.status_code) else: try: response.raise_for_status() return self.get_success(request, response) except requests.HTTPError: - logger.warn('get error: %s (%s)', response.content, response.status_code) + logger.warning('get error: %s (%s)', response.content, response.status_code) return render(request, 'core/error.html', { 'title': _('OAuth error'), @@ -53,14 +53,14 @@ def post(self, request, url, data): response = requests.post(url, json=data, headers=self.get_authorization_headers(access_token)) if response.status_code == 401: - logger.warn('post forbidden: %s (%s)', response.content, response.status_code) + logger.warning('post forbidden: %s (%s)', response.content, response.status_code) else: try: response.raise_for_status() return self.post_success(request, response) except requests.HTTPError: - logger.warn('post error: %s (%s)', response.content, response.status_code) + logger.warning('post error: %s (%s)', response.content, response.status_code) return render(request, 'core/error.html', { 'title': _('OAuth error'),