From 2b21a4e1343c378636daa96acb1c744635be5aaf Mon Sep 17 00:00:00 2001 From: Charlie Marsh Date: Tue, 20 Jun 2023 17:25:53 -0400 Subject: [PATCH] Bump Ruff version to 0.0.273 (#242) --- package-lock.json | 4 +-- package.json | 2 +- pyproject.toml | 6 ++--- requirements-dev.txt | 42 +++++++++++++++---------------- requirements.txt | 42 +++++++++++++++---------------- tests/test_server.py | 60 ++++++++++++++++++++++++++------------------ 6 files changed, 84 insertions(+), 72 deletions(-) diff --git a/package-lock.json b/package-lock.json index bb8ce14..85f99b6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ruff", - "version": "2023.27.0-dev", + "version": "2023.28.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "ruff", - "version": "2023.27.0-dev", + "version": "2023.28.0", "license": "MIT", "dependencies": { "fs-extra": "^11.1.1", diff --git a/package.json b/package.json index 429290a..b7d3ede 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "ruff", "displayName": "Ruff", "description": "A Visual Studio Code extension with support for the Ruff linter.", - "version": "2023.27.0-dev", + "version": "2023.28.0", "serverInfo": { "name": "Ruff", "module": "ruff" diff --git a/pyproject.toml b/pyproject.toml index b9f32b1..ef965a8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "hatchling.build" [project] name = "ruff-vscode" -version = "2023.27.0-dev" +version = "2023.28.0" description = "A Visual Studio Code extension with support for the Ruff linter." authors = [ { name = "Charlie Marsh", email = "charlie.r.marsh@gmail.com" }, @@ -15,8 +15,8 @@ maintainers = [ requires-python = ">=3.7" license = "MIT" dependencies = [ - "ruff-lsp==0.0.33", - "ruff==0.0.272", + "ruff-lsp==0.0.34", + "ruff==0.0.273", ] [project.optional-dependencies] diff --git a/requirements-dev.txt b/requirements-dev.txt index 2a5ae66..faec0a8 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -116,30 +116,30 @@ python-lsp-jsonrpc==1.0.0 \ --hash=sha256:079b143be64b0a378bdb21dff5e28a8c1393fe7e8a654ef068322d754e545fc7 \ --hash=sha256:7bec170733db628d3506ea3a5288ff76aa33c70215ed223abdb0d95e957660bd # via ruff-vscode (./pyproject.toml) -ruff==0.0.272 \ - --hash=sha256:06b8ee4eb8711ab119db51028dd9f5384b44728c23586424fd6e241a5b9c4a3b \ - --hash=sha256:1609b864a8d7ee75a8c07578bdea0a7db75a144404e75ef3162e0042bfdc100d \ - --hash=sha256:19643d448f76b1eb8a764719072e9c885968971bfba872e14e7257e08bc2f2b7 \ - --hash=sha256:273a01dc8c3c4fd4c2af7ea7a67c8d39bb09bce466e640dd170034da75d14cab \ - --hash=sha256:27b2ea68d2aa69fff1b20b67636b1e3e22a6a39e476c880da1282c3e4bf6ee5a \ - --hash=sha256:48eccf225615e106341a641f826b15224b8a4240b84269ead62f0afd6d7e2d95 \ - --hash=sha256:677284430ac539bb23421a2b431b4ebc588097ef3ef918d0e0a8d8ed31fea216 \ - --hash=sha256:691d72a00a99707a4e0b2846690961157aef7b17b6b884f6b4420a9f25cd39b5 \ - --hash=sha256:86bc788245361a8148ff98667da938a01e1606b28a45e50ac977b09d3ad2c538 \ - --hash=sha256:905ff8f3d6206ad56fcd70674453527b9011c8b0dc73ead27618426feff6908e \ - --hash=sha256:9c4bfb75456a8e1efe14c52fcefb89cfb8f2a0d31ed8d804b82c6cf2dc29c42c \ - --hash=sha256:a37ec80e238ead2969b746d7d1b6b0d31aa799498e9ba4281ab505b93e1f4b28 \ - --hash=sha256:ae9b57546e118660175d45d264b87e9b4c19405c75b587b6e4d21e6a17bf4fdf \ - --hash=sha256:bd2bbe337a3f84958f796c77820d55ac2db1e6753f39d1d1baed44e07f13f96d \ - --hash=sha256:d5a208f8ef0e51d4746930589f54f9f92f84bb69a7d15b1de34ce80a7681bc00 \ - --hash=sha256:dc406e5d756d932da95f3af082814d2467943631a587339ee65e5a4f4fbe83eb \ - --hash=sha256:ee76b4f05fcfff37bd6ac209d1370520d509ea70b5a637bdf0a04d0c99e13dff +ruff==0.0.273 \ + --hash=sha256:0f80fc4e26dc784d515298963a7a102a0d0a9997a0bda6bd3824f747528fa0c2 \ + --hash=sha256:149e96eaab3d9406e27538078a65e7148e245c016b4b953d642cf21d804bf56c \ + --hash=sha256:1c6d86a4bda7beeca1f86d22766c6806a2baf7828b1bc8d85c48d90f6dd76af0 \ + --hash=sha256:2a9e3cf11374c112abbc3f77978505d9b4626bf31ce42b44fcf3b528b630c6d0 \ + --hash=sha256:2d7ab824e5043360c3e4e04847e1af0d658f577c669ae0d8f6e3033f65e2dcdb \ + --hash=sha256:58c61bb4bacde2f812b957c8790ef36553bf8b39ecc3048d14f474183de61856 \ + --hash=sha256:66a70d9bcdd17ad9517ef70eda5d60060d04c6ed7a670abc092a4e55798f5db5 \ + --hash=sha256:7cda52bf892de95d889e37ddead87745128d0579cc706af8b146db120e2de7b4 \ + --hash=sha256:7d6b70c615b141f798437948b46f172592a32543e8f7dfadab30e22c492b8f17 \ + --hash=sha256:8338e8dd941c6a66a50139e1c258a93bb0d1dbc9b08615dac9852079d9f33160 \ + --hash=sha256:925aa6fc25b1de90a064a767dc767b8ca462b8be996e4113cf2fcc1ba1c2f220 \ + --hash=sha256:9c87520bd8803db8c52096edc727e582d08965d4faedda505d390c61bf96a8a3 \ + --hash=sha256:9d81b186ad1d06f890e1d122c2040af6467678ad2efb90a5e0cbf6283d392f18 \ + --hash=sha256:ad54d619cbbe3942fa9b42abbd723ef560230a9aa5a94d591d459d845a524b3e \ + --hash=sha256:b3abd486149e34a7f5683154cac5e58ae7b39c28440945342d1854c72288b761 \ + --hash=sha256:c37edf65794efc724b0c3848bb50977aa0d985a26385550ce7aee0fd1b8a6892 \ + --hash=sha256:e71e8c2541946523cd457e23af0ebffe5f93020d1309e11bd4b62cda4b73bdb5 # via # ruff-lsp # ruff-vscode (./pyproject.toml) -ruff-lsp==0.0.33 \ - --hash=sha256:28a0e47d34ca33b6404d14bb9d9da72b00866ae0213875860bc1032ade7a1d27 \ - --hash=sha256:479fe8dd43ed185f49d57ccbcae5ff2bae0426c6a349f51e0e753edfc0d325ce +ruff-lsp==0.0.34 \ + --hash=sha256:03f77f959cf695ce2a01df6ea212c0cd10e51dcf3b073b0a056f033dc702fbbc \ + --hash=sha256:f336ca3fd4da7a1f4ee69b49a11603b559b441278cb5303ba691298d77280c26 # via ruff-vscode (./pyproject.toml) tomli==2.0.1 \ --hash=sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc \ diff --git a/requirements.txt b/requirements.txt index 93125be..b1c56ca 100644 --- a/requirements.txt +++ b/requirements.txt @@ -34,30 +34,30 @@ pygls==1.0.2 \ --hash=sha256:6d278d29fa6559b0f7a448263c85cb64ec6e9369548b02f1a7944060848b21f9 \ --hash=sha256:888ed63d1f650b4fc64d603d73d37545386ec533c0caac921aed80f80ea946a4 # via ruff-lsp -ruff==0.0.272 \ - --hash=sha256:06b8ee4eb8711ab119db51028dd9f5384b44728c23586424fd6e241a5b9c4a3b \ - --hash=sha256:1609b864a8d7ee75a8c07578bdea0a7db75a144404e75ef3162e0042bfdc100d \ - --hash=sha256:19643d448f76b1eb8a764719072e9c885968971bfba872e14e7257e08bc2f2b7 \ - --hash=sha256:273a01dc8c3c4fd4c2af7ea7a67c8d39bb09bce466e640dd170034da75d14cab \ - --hash=sha256:27b2ea68d2aa69fff1b20b67636b1e3e22a6a39e476c880da1282c3e4bf6ee5a \ - --hash=sha256:48eccf225615e106341a641f826b15224b8a4240b84269ead62f0afd6d7e2d95 \ - --hash=sha256:677284430ac539bb23421a2b431b4ebc588097ef3ef918d0e0a8d8ed31fea216 \ - --hash=sha256:691d72a00a99707a4e0b2846690961157aef7b17b6b884f6b4420a9f25cd39b5 \ - --hash=sha256:86bc788245361a8148ff98667da938a01e1606b28a45e50ac977b09d3ad2c538 \ - --hash=sha256:905ff8f3d6206ad56fcd70674453527b9011c8b0dc73ead27618426feff6908e \ - --hash=sha256:9c4bfb75456a8e1efe14c52fcefb89cfb8f2a0d31ed8d804b82c6cf2dc29c42c \ - --hash=sha256:a37ec80e238ead2969b746d7d1b6b0d31aa799498e9ba4281ab505b93e1f4b28 \ - --hash=sha256:ae9b57546e118660175d45d264b87e9b4c19405c75b587b6e4d21e6a17bf4fdf \ - --hash=sha256:bd2bbe337a3f84958f796c77820d55ac2db1e6753f39d1d1baed44e07f13f96d \ - --hash=sha256:d5a208f8ef0e51d4746930589f54f9f92f84bb69a7d15b1de34ce80a7681bc00 \ - --hash=sha256:dc406e5d756d932da95f3af082814d2467943631a587339ee65e5a4f4fbe83eb \ - --hash=sha256:ee76b4f05fcfff37bd6ac209d1370520d509ea70b5a637bdf0a04d0c99e13dff +ruff==0.0.273 \ + --hash=sha256:0f80fc4e26dc784d515298963a7a102a0d0a9997a0bda6bd3824f747528fa0c2 \ + --hash=sha256:149e96eaab3d9406e27538078a65e7148e245c016b4b953d642cf21d804bf56c \ + --hash=sha256:1c6d86a4bda7beeca1f86d22766c6806a2baf7828b1bc8d85c48d90f6dd76af0 \ + --hash=sha256:2a9e3cf11374c112abbc3f77978505d9b4626bf31ce42b44fcf3b528b630c6d0 \ + --hash=sha256:2d7ab824e5043360c3e4e04847e1af0d658f577c669ae0d8f6e3033f65e2dcdb \ + --hash=sha256:58c61bb4bacde2f812b957c8790ef36553bf8b39ecc3048d14f474183de61856 \ + --hash=sha256:66a70d9bcdd17ad9517ef70eda5d60060d04c6ed7a670abc092a4e55798f5db5 \ + --hash=sha256:7cda52bf892de95d889e37ddead87745128d0579cc706af8b146db120e2de7b4 \ + --hash=sha256:7d6b70c615b141f798437948b46f172592a32543e8f7dfadab30e22c492b8f17 \ + --hash=sha256:8338e8dd941c6a66a50139e1c258a93bb0d1dbc9b08615dac9852079d9f33160 \ + --hash=sha256:925aa6fc25b1de90a064a767dc767b8ca462b8be996e4113cf2fcc1ba1c2f220 \ + --hash=sha256:9c87520bd8803db8c52096edc727e582d08965d4faedda505d390c61bf96a8a3 \ + --hash=sha256:9d81b186ad1d06f890e1d122c2040af6467678ad2efb90a5e0cbf6283d392f18 \ + --hash=sha256:ad54d619cbbe3942fa9b42abbd723ef560230a9aa5a94d591d459d845a524b3e \ + --hash=sha256:b3abd486149e34a7f5683154cac5e58ae7b39c28440945342d1854c72288b761 \ + --hash=sha256:c37edf65794efc724b0c3848bb50977aa0d985a26385550ce7aee0fd1b8a6892 \ + --hash=sha256:e71e8c2541946523cd457e23af0ebffe5f93020d1309e11bd4b62cda4b73bdb5 # via # ruff-lsp # ruff-vscode (./pyproject.toml) -ruff-lsp==0.0.33 \ - --hash=sha256:28a0e47d34ca33b6404d14bb9d9da72b00866ae0213875860bc1032ade7a1d27 \ - --hash=sha256:479fe8dd43ed185f49d57ccbcae5ff2bae0426c6a349f51e0e753edfc0d325ce +ruff-lsp==0.0.34 \ + --hash=sha256:03f77f959cf695ce2a01df6ea212c0cd10e51dcf3b073b0a056f033dc702fbbc \ + --hash=sha256:f336ca3fd4da7a1f4ee69b49a11603b559b441278cb5303ba691298d77280c26 # via ruff-vscode (./pyproject.toml) typeguard==3.0.2 \ --hash=sha256:bbe993854385284ab42fd5bd3bee6f6556577ce8b50696d6cb956d704f286c8e \ diff --git a/tests/test_server.py b/tests/test_server.py index 50b8d34..c68d67e 100644 --- a/tests/test_server.py +++ b/tests/test_server.py @@ -57,45 +57,51 @@ def _handler(params): done.wait(TIMEOUT_SECONDS) expected = { - "uri": uri, "diagnostics": [ { - "range": { - "start": {"line": 0, "character": 7}, - "end": {"line": 0, "character": 10}, + "code": "F401", + "codeDescription": { + "href": "https://beta.ruff.rs/docs/rules/unused-import" }, "data": { "fix": { - "message": "Remove unused import: `sys`", "applicability": "Automatic", "edits": [ { "content": "", - "location": {"row": 1, "column": 0}, - "end_location": {"row": 2, "column": 0}, + "end_location": {"column": 0, "row": 2}, + "location": {"column": 0, "row": 1}, } ], + "message": "Remove unused import: `sys`", }, "noqa_row": 1, }, "message": "`sys` imported but unused", + "range": { + "end": {"character": 10, "line": 0}, + "start": {"character": 7, "line": 0}, + }, "severity": 2, - "code": "F401", "source": "Ruff", "tags": [1], }, { - "range": { - "start": {"line": 2, "character": 6}, - "end": {"line": 2, "character": 7}, + "code": "F821", + "codeDescription": { + "href": "https://beta.ruff.rs/docs/rules/undefined-name" }, "data": {"fix": None, "noqa_row": 3}, "message": "Undefined name `x`", + "range": { + "end": {"character": 7, "line": 2}, + "start": {"character": 6, "line": 2}, + }, "severity": 1, - "code": "F821", "source": "Ruff", }, ], + "uri": uri, } self.maxDiff = None @@ -145,45 +151,51 @@ def _handler(params): done.wait(TIMEOUT_SECONDS) expected = { - "uri": uri, "diagnostics": [ { - "range": { - "start": {"line": 0, "character": 7}, - "end": {"line": 0, "character": 10}, + "code": "F401", + "codeDescription": { + "href": "https://beta.ruff.rs/docs/rules/unused-import" }, "data": { "fix": { - "message": "Remove unused import: `sys`", "applicability": "Automatic", "edits": [ { "content": "", - "location": {"row": 1, "column": 0}, - "end_location": {"row": 2, "column": 0}, + "end_location": {"column": 0, "row": 2}, + "location": {"column": 0, "row": 1}, } ], + "message": "Remove unused import: `sys`", }, "noqa_row": 1, }, "message": "`sys` imported but unused", + "range": { + "end": {"character": 10, "line": 0}, + "start": {"character": 7, "line": 0}, + }, "severity": 2, - "code": "F401", "source": "Ruff", "tags": [1], }, { - "range": { - "start": {"line": 2, "character": 6}, - "end": {"line": 2, "character": 7}, + "code": "F821", + "codeDescription": { + "href": "https://beta.ruff.rs/docs/rules/undefined-name" }, "data": {"fix": None, "noqa_row": 3}, "message": "Undefined name `x`", + "range": { + "end": {"character": 7, "line": 2}, + "start": {"character": 6, "line": 2}, + }, "severity": 1, - "code": "F821", "source": "Ruff", }, ], + "uri": uri, } self.maxDiff = None