From 937c83d57fcdd010857aa3f525f2bc4c7eae7da4 Mon Sep 17 00:00:00 2001 From: Charlie Marsh Date: Thu, 3 Nov 2022 09:19:54 -0400 Subject: [PATCH] Remove crates subdirectory (#563) --- .github/workflows/flake8-to-ruff.yaml | 16 ++++++++-------- Cargo.toml | 2 +- .../flake8_to_ruff => flake8_to_ruff}/Cargo.lock | 0 .../flake8_to_ruff => flake8_to_ruff}/Cargo.toml | 2 +- .../flake8_to_ruff => flake8_to_ruff}/README.md | 0 .../pyproject.toml | 0 .../src/converter.rs | 0 .../flake8_to_ruff => flake8_to_ruff}/src/lib.rs | 0 .../src/main.rs | 0 .../src/parser.rs | 0 10 files changed, 10 insertions(+), 10 deletions(-) rename {crates/flake8_to_ruff => flake8_to_ruff}/Cargo.lock (100%) rename {crates/flake8_to_ruff => flake8_to_ruff}/Cargo.toml (89%) rename {crates/flake8_to_ruff => flake8_to_ruff}/README.md (100%) rename {crates/flake8_to_ruff => flake8_to_ruff}/pyproject.toml (100%) rename {crates/flake8_to_ruff => flake8_to_ruff}/src/converter.rs (100%) rename {crates/flake8_to_ruff => flake8_to_ruff}/src/lib.rs (100%) rename {crates/flake8_to_ruff => flake8_to_ruff}/src/main.rs (100%) rename {crates/flake8_to_ruff => flake8_to_ruff}/src/parser.rs (100%) diff --git a/.github/workflows/flake8-to-ruff.yaml b/.github/workflows/flake8-to-ruff.yaml index 718c4dfe7c..37b85355c0 100644 --- a/.github/workflows/flake8-to-ruff.yaml +++ b/.github/workflows/flake8-to-ruff.yaml @@ -30,7 +30,7 @@ jobs: uses: messense/maturin-action@v1 with: target: x86_64 - args: --release --out dist --sdist -m ./crates/${{ env.CRATE_NAME }}/Cargo.toml + args: --release --out dist --sdist -m ./${{ env.CRATE_NAME }}/Cargo.toml maturin-version: "v0.13.0" - name: Install built wheel - x86_64 run: | @@ -57,7 +57,7 @@ jobs: - name: Build wheels - universal2 uses: messense/maturin-action@v1 with: - args: --release --universal2 --out dist -m ./crates/${{ env.CRATE_NAME }}/Cargo.toml + args: --release --universal2 --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml maturin-version: "v0.13.0" - name: Install built wheel - universal2 run: | @@ -89,7 +89,7 @@ jobs: uses: messense/maturin-action@v1 with: target: ${{ matrix.target }} - args: --release --out dist -m ./crates/${{ env.CRATE_NAME }}/Cargo.toml + args: --release --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml maturin-version: "v0.13.0" - name: Install built wheel shell: bash @@ -117,7 +117,7 @@ jobs: with: target: ${{ matrix.target }} manylinux: auto - args: --release --out dist -m ./crates/${{ env.CRATE_NAME }}/Cargo.toml + args: --release --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml maturin-version: "v0.13.0" - name: Install built wheel if: matrix.target == 'x86_64' @@ -144,7 +144,7 @@ jobs: with: target: ${{ matrix.target }} manylinux: auto - args: --no-default-features --release --out dist -m ./crates/${{ env.CRATE_NAME }}/Cargo.toml + args: --no-default-features --release --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml maturin-version: "v0.13.0" - uses: uraimo/run-on-arch-action@v2.0.5 if: matrix.target != 'ppc64' @@ -183,7 +183,7 @@ jobs: with: target: ${{ matrix.target }} manylinux: musllinux_1_2 - args: --release --out dist -m ./crates/${{ env.CRATE_NAME }}/Cargo.toml + args: --release --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml maturin-version: "v0.13.0" - name: Install built wheel if: matrix.target == 'x86_64-unknown-linux-musl' @@ -219,7 +219,7 @@ jobs: with: target: ${{ matrix.platform.target }} manylinux: musllinux_1_2 - args: --release --out dist -m ./crates/${{ env.CRATE_NAME }}/Cargo.toml + args: --release --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml maturin-version: "v0.13.0" - uses: uraimo/run-on-arch-action@master name: Install built wheel @@ -261,7 +261,7 @@ jobs: maturin-version: "v0.13.0" target: ${{ matrix.target }} manylinux: auto - args: --release --out dist -i pypy${{ matrix.python-version }} -m ./crates/${{ env.CRATE_NAME }}/Cargo.toml + args: --release --out dist -i pypy${{ matrix.python-version }} -m ./${{ env.CRATE_NAME }}/Cargo.toml - name: Install built wheel if: matrix.target == 'x86_64' run: | diff --git a/Cargo.toml b/Cargo.toml index 7426bb758b..650a4786e2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [workspace] members = [ - "crates/flake8_to_ruff", + "flake8_to_ruff", ] [package] diff --git a/crates/flake8_to_ruff/Cargo.lock b/flake8_to_ruff/Cargo.lock similarity index 100% rename from crates/flake8_to_ruff/Cargo.lock rename to flake8_to_ruff/Cargo.lock diff --git a/crates/flake8_to_ruff/Cargo.toml b/flake8_to_ruff/Cargo.toml similarity index 89% rename from crates/flake8_to_ruff/Cargo.toml rename to flake8_to_ruff/Cargo.toml index 8cb93d918e..c045adeb3b 100644 --- a/crates/flake8_to_ruff/Cargo.toml +++ b/flake8_to_ruff/Cargo.toml @@ -12,7 +12,7 @@ clap = { version = "4.0.1", features = ["derive"] } configparser = { version = "3.0.2" } once_cell = { version = "1.13.1" } regex = { version = "1.6.0" } -ruff = { path = "../..", default-features = false } +ruff = { path = "..", default-features = false } serde = { version = "1.0.143", features = ["derive"] } serde_json = { version = "1.0.83" } toml = { version = "0.5.9" } diff --git a/crates/flake8_to_ruff/README.md b/flake8_to_ruff/README.md similarity index 100% rename from crates/flake8_to_ruff/README.md rename to flake8_to_ruff/README.md diff --git a/crates/flake8_to_ruff/pyproject.toml b/flake8_to_ruff/pyproject.toml similarity index 100% rename from crates/flake8_to_ruff/pyproject.toml rename to flake8_to_ruff/pyproject.toml diff --git a/crates/flake8_to_ruff/src/converter.rs b/flake8_to_ruff/src/converter.rs similarity index 100% rename from crates/flake8_to_ruff/src/converter.rs rename to flake8_to_ruff/src/converter.rs diff --git a/crates/flake8_to_ruff/src/lib.rs b/flake8_to_ruff/src/lib.rs similarity index 100% rename from crates/flake8_to_ruff/src/lib.rs rename to flake8_to_ruff/src/lib.rs diff --git a/crates/flake8_to_ruff/src/main.rs b/flake8_to_ruff/src/main.rs similarity index 100% rename from crates/flake8_to_ruff/src/main.rs rename to flake8_to_ruff/src/main.rs diff --git a/crates/flake8_to_ruff/src/parser.rs b/flake8_to_ruff/src/parser.rs similarity index 100% rename from crates/flake8_to_ruff/src/parser.rs rename to flake8_to_ruff/src/parser.rs