From 0997260b8ce2851953c616542033e0387f73e889 Mon Sep 17 00:00:00 2001 From: Charlie Marsh Date: Tue, 30 Jan 2024 19:27:24 -0500 Subject: [PATCH] Use publicly available Apple Silicon runners --- .github/workflows/release.yaml | 152 ++++++++++++++++----------------- README.md | 8 +- package-lock.json | 4 +- package.json | 2 +- pyproject.toml | 4 +- requirements-dev.txt | 36 ++++---- requirements.txt | 36 ++++---- 7 files changed, 121 insertions(+), 121 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 62d0f21..997bc50 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -65,7 +65,7 @@ jobs: - os: macos-latest target: x86_64-apple-darwin code-target: darwin-x64 - - os: macos-latest-xlarge + - os: macos-14 target: aarch64-apple-darwin code-target: darwin-arm64 - os: ubuntu-20.04 @@ -165,78 +165,78 @@ jobs: name: dist-${{ matrix.target }} path: ./dist - # Phase 3: Publish the built extension to the Marketplace. - publish: - name: "Publish" - needs: ["build"] - runs-on: ubuntu-latest - steps: - - name: Install Nodejs - uses: actions/setup-node@v3 - with: - node-version: 18 - - - name: Checkout repository - uses: actions/checkout@v3 - with: - fetch-depth: ${{ env.FETCH_DEPTH }} - - # Download all built artifacts. - - uses: actions/download-artifact@v3 - with: - name: dist-aarch64-apple-darwin - path: dist - - uses: actions/download-artifact@v3 - with: - name: dist-x86_64-apple-darwin - path: dist - - uses: actions/download-artifact@v3 - with: - name: dist-x86_64-unknown-linux-gnu - path: dist - - uses: actions/download-artifact@v3 - with: - name: dist-aarch64-unknown-linux-gnu - path: dist - - uses: actions/download-artifact@v3 - with: - name: dist-arm-unknown-linux-gnueabihf - path: dist - - uses: actions/download-artifact@v3 - with: - name: dist-x86_64-pc-windows-msvc - path: dist - - uses: actions/download-artifact@v3 - with: - name: dist-aarch64-pc-windows-msvc - path: dist - - uses: actions/download-artifact@v3 - with: - name: dist-x86_64-unknown-linux-musl - path: dist - - uses: actions/download-artifact@v3 - with: - name: dist-aarch64-unknown-linux-musl - path: dist - - run: ls -al ./dist - - # Install Node dependencies. - - run: npm ci - - # Publish to the Code Marketplace. - - name: Publish Extension (Code Marketplace, release) - if: "startsWith(github.ref, 'refs/tags/')" - run: npx vsce publish --pat ${{ secrets.MARKETPLACE_TOKEN }} --packagePath ./dist/ruff-*.vsix - - name: Publish Extension (Code Marketplace, nightly) - if: "!startsWith(github.ref, 'refs/tags/')" - run: npx vsce publish --pat ${{ secrets.MARKETPLACE_TOKEN }} --packagePath ./dist/ruff-*.vsix --pre-release - - # Publish to OpenVSX. - - name: Publish Extension (OpenVSX, release) - if: "startsWith(github.ref, 'refs/tags/')" - run: npx ovsx publish --pat ${{ secrets.OPENVSX_TOKEN }} --packagePath ./dist/ruff-*.vsix - timeout-minutes: 2 - - name: Publish Extension (OpenVSX, nightly) - if: "!startsWith(github.ref, 'refs/tags/')" - run: npx ovsx publish --pat ${{ secrets.OPENVSX_TOKEN }} --packagePath ./dist/ruff-*.vsix --pre-release - timeout-minutes: 2 +# # Phase 3: Publish the built extension to the Marketplace. +# publish: +# name: "Publish" +# needs: ["build"] +# runs-on: ubuntu-latest +# steps: +# - name: Install Nodejs +# uses: actions/setup-node@v3 +# with: +# node-version: 18 +# +# - name: Checkout repository +# uses: actions/checkout@v3 +# with: +# fetch-depth: ${{ env.FETCH_DEPTH }} +# +# # Download all built artifacts. +# - uses: actions/download-artifact@v3 +# with: +# name: dist-aarch64-apple-darwin +# path: dist +# - uses: actions/download-artifact@v3 +# with: +# name: dist-x86_64-apple-darwin +# path: dist +# - uses: actions/download-artifact@v3 +# with: +# name: dist-x86_64-unknown-linux-gnu +# path: dist +# - uses: actions/download-artifact@v3 +# with: +# name: dist-aarch64-unknown-linux-gnu +# path: dist +# - uses: actions/download-artifact@v3 +# with: +# name: dist-arm-unknown-linux-gnueabihf +# path: dist +# - uses: actions/download-artifact@v3 +# with: +# name: dist-x86_64-pc-windows-msvc +# path: dist +# - uses: actions/download-artifact@v3 +# with: +# name: dist-aarch64-pc-windows-msvc +# path: dist +# - uses: actions/download-artifact@v3 +# with: +# name: dist-x86_64-unknown-linux-musl +# path: dist +# - uses: actions/download-artifact@v3 +# with: +# name: dist-aarch64-unknown-linux-musl +# path: dist +# - run: ls -al ./dist +# +# # Install Node dependencies. +# - run: npm ci +# +# # Publish to the Code Marketplace. +# - name: Publish Extension (Code Marketplace, release) +# if: "startsWith(github.ref, 'refs/tags/')" +# run: npx vsce publish --pat ${{ secrets.MARKETPLACE_TOKEN }} --packagePath ./dist/ruff-*.vsix +# - name: Publish Extension (Code Marketplace, nightly) +# if: "!startsWith(github.ref, 'refs/tags/')" +# run: npx vsce publish --pat ${{ secrets.MARKETPLACE_TOKEN }} --packagePath ./dist/ruff-*.vsix --pre-release +# +# # Publish to OpenVSX. +# - name: Publish Extension (OpenVSX, release) +# if: "startsWith(github.ref, 'refs/tags/')" +# run: npx ovsx publish --pat ${{ secrets.OPENVSX_TOKEN }} --packagePath ./dist/ruff-*.vsix +# timeout-minutes: 2 +# - name: Publish Extension (OpenVSX, nightly) +# if: "!startsWith(github.ref, 'refs/tags/')" +# run: npx ovsx publish --pat ${{ secrets.OPENVSX_TOKEN }} --packagePath ./dist/ruff-*.vsix --pre-release +# timeout-minutes: 2 diff --git a/README.md b/README.md index 6c87717..3577acf 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ # Ruff extension for Visual Studio Code [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff) -[![image](https://img.shields.io/pypi/v/ruff/0.1.14.svg)](https://pypi.python.org/pypi/ruff) -[![image](https://img.shields.io/pypi/l/ruff/0.1.14.svg)](https://pypi.python.org/pypi/ruff) -[![image](https://img.shields.io/pypi/pyversions/ruff/0.1.14.svg)](https://pypi.python.org/pypi/ruff) +[![image](https://img.shields.io/pypi/v/ruff/0.1.15.svg)](https://pypi.python.org/pypi/ruff) +[![image](https://img.shields.io/pypi/l/ruff/0.1.15.svg)](https://pypi.python.org/pypi/ruff) +[![image](https://img.shields.io/pypi/pyversions/ruff/0.1.15.svg)](https://pypi.python.org/pypi/ruff) [![Actions status](https://github.com/astral-sh/ruff-vscode/workflows/CI/badge.svg)](https://github.com/astral-sh/ruff-vscode/actions) A Visual Studio Code extension for [Ruff](https://github.com/astral-sh/ruff), an extremely fast @@ -12,7 +12,7 @@ Python linter and code formatter, written in Rust. Available on the [Visual Stud Ruff can be used to replace Flake8 (plus dozens of plugins), Black, isort, pyupgrade, and more, all while executing tens or hundreds of times faster than any individual tool. -The extension ships with `ruff==0.1.14`. +The extension ships with `ruff==0.1.15`. (Interested in using [Ruff](https://github.com/astral-sh/ruff) with another editor? Check out [`ruff-lsp`](https://github.com/astral-sh/ruff-lsp).) diff --git a/package-lock.json b/package-lock.json index 3f902e0..b1979b8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ruff", - "version": "2024.4.0", + "version": "2024.5.0-dev", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "ruff", - "version": "2024.4.0", + "version": "2024.5.0-dev", "license": "MIT", "dependencies": { "fs-extra": "^11.1.1", diff --git a/package.json b/package.json index f2e3058..945325c 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": "2024.4.0", + "version": "2024.5.0-dev", "serverInfo": { "name": "Ruff", "module": "ruff" diff --git a/pyproject.toml b/pyproject.toml index 57cedb4..5b56902 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "hatchling.build" [project] name = "ruff-vscode" -version = "2024.4.0" +version = "2024.5.0-dev" description = "A Visual Studio Code extension with support for the Ruff linter." authors = [ { name = "Charlie Marsh", email = "charlie.r.marsh@gmail.com" }, @@ -17,7 +17,7 @@ license = "MIT" dependencies = [ "packaging>=23.1", "ruff-lsp==0.0.50", - "ruff==0.1.14", + "ruff==0.1.15", ] [project.optional-dependencies] diff --git a/requirements-dev.txt b/requirements-dev.txt index d5ee44b..586fa04 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -74,24 +74,24 @@ python-lsp-jsonrpc==1.0.0 \ --hash=sha256:079b143be64b0a378bdb21dff5e28a8c1393fe7e8a654ef068322d754e545fc7 \ --hash=sha256:7bec170733db628d3506ea3a5288ff76aa33c70215ed223abdb0d95e957660bd # via ruff-vscode (./pyproject.toml) -ruff==0.1.14 \ - --hash=sha256:1c8eca1a47b4150dc0fbec7fe68fc91c695aed798532a18dbb1424e61e9b721f \ - --hash=sha256:2270504d629a0b064247983cbc495bed277f372fb9eaba41e5cf51f7ba705a6a \ - --hash=sha256:269302b31ade4cde6cf6f9dd58ea593773a37ed3f7b97e793c8594b262466b67 \ - --hash=sha256:62ce2ae46303ee896fc6811f63d6dabf8d9c389da0f3e3f2bce8bc7f15ef5488 \ - --hash=sha256:653230dd00aaf449eb5ff25d10a6e03bc3006813e2cb99799e568f55482e5cae \ - --hash=sha256:6b3dadc9522d0eccc060699a9816e8127b27addbb4697fc0c08611e4e6aeb8b5 \ - --hash=sha256:7060156ecc572b8f984fd20fd8b0fcb692dd5d837b7606e968334ab7ff0090ab \ - --hash=sha256:722bafc299145575a63bbd6b5069cb643eaa62546a5b6398f82b3e4403329cab \ - --hash=sha256:80258bb3b8909b1700610dfabef7876423eed1bc930fe177c71c414921898efa \ - --hash=sha256:87b3acc6c4e6928459ba9eb7459dd4f0c4bf266a053c863d72a44c33246bfdbf \ - --hash=sha256:96f76536df9b26622755c12ed8680f159817be2f725c17ed9305b472a757cdbb \ - --hash=sha256:a53d8e35313d7b67eb3db15a66c08434809107659226a90dcd7acb2afa55faea \ - --hash=sha256:ab3f71f64498c7241123bb5a768544cf42821d2a537f894b22457a543d3ca7a9 \ - --hash=sha256:ad3f8088b2dfd884820289a06ab718cde7d38b94972212cc4ba90d5fbc9955f3 \ - --hash=sha256:b2027dde79d217b211d725fc833e8965dc90a16d0d3213f1298f97465956661b \ - --hash=sha256:bea9be712b8f5b4ebed40e1949379cfb2a7d907f42921cf9ab3aae07e6fba9eb \ - --hash=sha256:e3d241aa61f92b0805a7082bd89a9990826448e4d0398f0e2bc8f05c75c63d99 +ruff==0.1.15 \ + --hash=sha256:1bab866aafb53da39c2cadfb8e1c4550ac5340bb40300083eb8967ba25481447 \ + --hash=sha256:2417e1cb6e2068389b07e6fa74c306b2810fe3ee3476d5b8a96616633f40d14f \ + --hash=sha256:3837ac73d869efc4182d9036b1405ef4c73d9b1f88da2413875e34e0d6919587 \ + --hash=sha256:5fe8d54df166ecc24106db7dd6a68d44852d14eb0729ea4672bb4d96c320b7df \ + --hash=sha256:6c629cf64bacfd136c07c78ac10a54578ec9d1bd2a9d395efbee0935868bf852 \ + --hash=sha256:6f0bfbb53c4b4de117ac4d6ddfd33aa5fc31beeaa21d23c45c6dd249faf9126f \ + --hash=sha256:6f8ad828f01e8dd32cc58bc28375150171d198491fc901f6f98d2a39ba8e3ff5 \ + --hash=sha256:86811954eec63e9ea162af0ffa9f8d09088bab51b7438e8b6488b9401863c25e \ + --hash=sha256:9405fa9ac0e97f35aaddf185a1be194a589424b8713e3b97b762336ec79ff807 \ + --hash=sha256:9a933dfb1c14ec7a33cceb1e49ec4a16b51ce3c20fd42663198746efc0427360 \ + --hash=sha256:abf4822129ed3a5ce54383d5f0e964e7fef74a41e48eb1dfad404151efc130a2 \ + --hash=sha256:b17b93c02cdb6aeb696effecea1095ac93f3884a49a554a9afa76bb125c114c1 \ + --hash=sha256:c66ec24fe36841636e814b8f90f572a8c0cb0e54d8b5c2d0e300d28a0d7bffec \ + --hash=sha256:ddb87643be40f034e97e97f5bc2ef7ce39de20e34608f3f829db727a93fb82c5 \ + --hash=sha256:e0d432aec35bfc0d800d4f70eba26e23a352386be3a6cf157083d18f6f5881c8 \ + --hash=sha256:f6dfa8c1b21c913c326919056c390966648b680966febcb796cc9d1aaab8564e \ + --hash=sha256:fd4025ac5e87d9b80e1f300207eb2fd099ff8200fa2320d7dc066a3f4622dc6b # via # ruff-lsp # ruff-vscode (./pyproject.toml) diff --git a/requirements.txt b/requirements.txt index dfc3087..6fa7b81 100644 --- a/requirements.txt +++ b/requirements.txt @@ -38,24 +38,24 @@ pygls==1.2.1 \ --hash=sha256:04f9b9c115b622dcc346fb390289066565343d60245a424eca77cb429b911ed8 \ --hash=sha256:7dcfcf12b6f15beb606afa46de2ed348b65a279c340ef2242a9a35c22eeafe94 # via ruff-lsp -ruff==0.1.14 \ - --hash=sha256:1c8eca1a47b4150dc0fbec7fe68fc91c695aed798532a18dbb1424e61e9b721f \ - --hash=sha256:2270504d629a0b064247983cbc495bed277f372fb9eaba41e5cf51f7ba705a6a \ - --hash=sha256:269302b31ade4cde6cf6f9dd58ea593773a37ed3f7b97e793c8594b262466b67 \ - --hash=sha256:62ce2ae46303ee896fc6811f63d6dabf8d9c389da0f3e3f2bce8bc7f15ef5488 \ - --hash=sha256:653230dd00aaf449eb5ff25d10a6e03bc3006813e2cb99799e568f55482e5cae \ - --hash=sha256:6b3dadc9522d0eccc060699a9816e8127b27addbb4697fc0c08611e4e6aeb8b5 \ - --hash=sha256:7060156ecc572b8f984fd20fd8b0fcb692dd5d837b7606e968334ab7ff0090ab \ - --hash=sha256:722bafc299145575a63bbd6b5069cb643eaa62546a5b6398f82b3e4403329cab \ - --hash=sha256:80258bb3b8909b1700610dfabef7876423eed1bc930fe177c71c414921898efa \ - --hash=sha256:87b3acc6c4e6928459ba9eb7459dd4f0c4bf266a053c863d72a44c33246bfdbf \ - --hash=sha256:96f76536df9b26622755c12ed8680f159817be2f725c17ed9305b472a757cdbb \ - --hash=sha256:a53d8e35313d7b67eb3db15a66c08434809107659226a90dcd7acb2afa55faea \ - --hash=sha256:ab3f71f64498c7241123bb5a768544cf42821d2a537f894b22457a543d3ca7a9 \ - --hash=sha256:ad3f8088b2dfd884820289a06ab718cde7d38b94972212cc4ba90d5fbc9955f3 \ - --hash=sha256:b2027dde79d217b211d725fc833e8965dc90a16d0d3213f1298f97465956661b \ - --hash=sha256:bea9be712b8f5b4ebed40e1949379cfb2a7d907f42921cf9ab3aae07e6fba9eb \ - --hash=sha256:e3d241aa61f92b0805a7082bd89a9990826448e4d0398f0e2bc8f05c75c63d99 +ruff==0.1.15 \ + --hash=sha256:1bab866aafb53da39c2cadfb8e1c4550ac5340bb40300083eb8967ba25481447 \ + --hash=sha256:2417e1cb6e2068389b07e6fa74c306b2810fe3ee3476d5b8a96616633f40d14f \ + --hash=sha256:3837ac73d869efc4182d9036b1405ef4c73d9b1f88da2413875e34e0d6919587 \ + --hash=sha256:5fe8d54df166ecc24106db7dd6a68d44852d14eb0729ea4672bb4d96c320b7df \ + --hash=sha256:6c629cf64bacfd136c07c78ac10a54578ec9d1bd2a9d395efbee0935868bf852 \ + --hash=sha256:6f0bfbb53c4b4de117ac4d6ddfd33aa5fc31beeaa21d23c45c6dd249faf9126f \ + --hash=sha256:6f8ad828f01e8dd32cc58bc28375150171d198491fc901f6f98d2a39ba8e3ff5 \ + --hash=sha256:86811954eec63e9ea162af0ffa9f8d09088bab51b7438e8b6488b9401863c25e \ + --hash=sha256:9405fa9ac0e97f35aaddf185a1be194a589424b8713e3b97b762336ec79ff807 \ + --hash=sha256:9a933dfb1c14ec7a33cceb1e49ec4a16b51ce3c20fd42663198746efc0427360 \ + --hash=sha256:abf4822129ed3a5ce54383d5f0e964e7fef74a41e48eb1dfad404151efc130a2 \ + --hash=sha256:b17b93c02cdb6aeb696effecea1095ac93f3884a49a554a9afa76bb125c114c1 \ + --hash=sha256:c66ec24fe36841636e814b8f90f572a8c0cb0e54d8b5c2d0e300d28a0d7bffec \ + --hash=sha256:ddb87643be40f034e97e97f5bc2ef7ce39de20e34608f3f829db727a93fb82c5 \ + --hash=sha256:e0d432aec35bfc0d800d4f70eba26e23a352386be3a6cf157083d18f6f5881c8 \ + --hash=sha256:f6dfa8c1b21c913c326919056c390966648b680966febcb796cc9d1aaab8564e \ + --hash=sha256:fd4025ac5e87d9b80e1f300207eb2fd099ff8200fa2320d7dc066a3f4622dc6b # via # ruff-lsp # ruff-vscode (./pyproject.toml)