diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml new file mode 100644 index 0000000000..4def4d08e5 --- /dev/null +++ b/.github/workflows/release.yaml @@ -0,0 +1,189 @@ +name: Release + +on: + create: + tags: + - v* + +jobs: + macos: + runs-on: macos-latest + strategy: + matrix: + python-version: ['3.7', '3.8', '3.9', '3.10'] + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + - name: Install Rust toolchain + uses: actions-rs/toolchain@v1 + with: + toolchain: stable + target: aarch64-apple-darwin + profile: minimal + default: true + - name: Build + run: cargo build --release + - name: Tests + run: cargo test --no-default-features --release + - name: Build wheels - x86_64 + uses: messense/maturin-action@v1 + with: + target: x86_64 + args: -i python --release --out dist --sdist + - name: Install built wheel - x86_64 + run: | + pip install ruff --no-index --find-links dist --force-reinstall + - name: Build wheels - universal2 + if: ${{ matrix.python-version >= '3.8' || matrix.python-version == '3.10' }} + uses: messense/maturin-action@v1 + with: + args: -i python --release --universal2 --out dist + - name: Install built wheel - universal2 + if: ${{ matrix.python-version >= '3.8' }} + run: | + pip install ruff --no-index --find-links dist --force-reinstall + - name: Upload wheels + uses: actions/upload-artifact@v2 + with: + name: wheels + path: dist + + windows: + runs-on: windows-latest + strategy: + matrix: + python-version: ['3.7', '3.8', '3.9', '3.10'] + target: [x64, x86] + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + architecture: ${{ matrix.target }} + - name: Update rustup + run: rustup self update + - name: Install Rust toolchain + uses: actions-rs/toolchain@v1 + with: + toolchain: stable + profile: minimal + default: true + - name: Build + if: matrix.target == 'x64' + run: cargo build --release + - name: Tests + if: matrix.target == 'x64' + run: cargo test --no-default-features --release + - name: Build wheels + uses: messense/maturin-action@v1 + with: + target: ${{ matrix.target }} + args: -i python --release --out dist + - name: Install built wheel + run: | + pip install ruff --no-index --find-links dist --force-reinstall + - name: Upload wheels + uses: actions/upload-artifact@v2 + with: + name: wheels + path: dist + + linux: + runs-on: ubuntu-latest + strategy: + matrix: + python-version: ['3.7', '3.8', '3.9', '3.10'] + target: [x86_64, i686] + steps: + - uses: actions/checkout@v2 + - name: Install Rust toolchain + uses: actions-rs/toolchain@v1 + with: + toolchain: stable + profile: minimal + default: true + - name: Build + run: cargo build --release + - name: Tests + run: cargo test --no-default-features --release + - uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + - name: Build Wheels + uses: messense/maturin-action@v1 + with: + target: ${{ matrix.target }} + manylinux: auto + args: -i ${{ matrix.python-version }} --release --out dist + - name: Install built wheel + if: matrix.target == 'x86_64' + run: | + pip install ruff --no-index --find-links dist --force-reinstall + - name: Upload wheels + uses: actions/upload-artifact@v2 + with: + name: wheels + path: dist + + linux-cross: + runs-on: ubuntu-latest + strategy: + matrix: + python-version: ['3.7', '3.8', '3.9', '3.10'] + target: [aarch64, armv7, s390x, ppc64le] + steps: + - uses: actions/checkout@v2 + - name: Build Wheels + uses: messense/maturin-action@v1 + with: + target: ${{ matrix.target }} + manylinux: auto + args: -i ${{ matrix.python-version }} --release --out dist + - uses: uraimo/run-on-arch-action@v2.2.0 + name: Install built wheel + with: + arch: ${{ matrix.target }} + distro: ubuntu20.04 + githubToken: ${{ github.token }} + # Mount the dist directory as /artifacts in the container + dockerRunArgs: | + --volume "${PWD}/dist:/artifacts" + install: | + apt-get update + apt-get install -y --no-install-recommends python3 python3-venv software-properties-common + add-apt-repository ppa:deadsnakes/ppa + apt-get update + apt-get install -y curl python3.7-venv python3.9-venv python3.10-venv + run: | + ls -lrth /artifacts + PYTHON=python${{ matrix.python-version }} + $PYTHON -m venv venv + venv/bin/pip install -U pip + venv/bin/pip install ruff --no-index --find-links /artifacts --force-reinstall + - name: Upload wheels + uses: actions/upload-artifact@v2 + with: + name: wheels + path: dist + + release: + name: Release + runs-on: ubuntu-latest + if: "startsWith(github.ref, 'refs/tags/')" + needs: [ macos, windows, linux, linux-cross ] + steps: + - uses: actions/download-artifact@v2 + with: + name: wheels + - uses: actions/setup-python@v2 + with: + python-version: '3.10' + - name: Publish to PyPi + env: + TWINE_USERNAME: __token__ + TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }} + run: | + pip install --upgrade wheel pip setuptools twine + twine upload --skip-existing * \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index ba14b226ce..c87ab9b2a4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1713,6 +1713,7 @@ dependencies = [ "common-path", "dirs 4.0.0", "fern", + "filetime", "log", "notify", "pyo3", diff --git a/Cargo.toml b/Cargo.toml index c1210c3876..097141711f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,6 +17,7 @@ colored = { version = "2.0.0" } common-path = { version = "1.0.0" } dirs = { version = "4.0.0" } fern = { version = "0.6.1" } +filetime = { version = "0.2.17" } log = { version = "0.4.17" } notify = { version = "4.0.17" } pyo3 = { version = "0.17.1", features = ["auto-initialize"] } diff --git a/README.md b/README.md index c196ec4489..dfde1d14ce 100644 --- a/README.md +++ b/README.md @@ -6,10 +6,7 @@ An extremely fast Python linter, written in Rust.

- - - Bar chart with benchmark results - + Bar chart with benchmark results

@@ -18,7 +15,7 @@ An extremely fast Python linter, written in Rust. Major features: -- 10-100x faster than your current linter (parallelized by-default). +- 10-100x faster than your current linter. - Installable via `pip`. - Python 3.10 compatibility. - [ESLint](https://eslint.org/docs/latest/user-guide/command-line-interface#caching)-inspired cache semantics. diff --git a/publish/Dockerfile b/publish/Dockerfile new file mode 100644 index 0000000000..515fd24c08 --- /dev/null +++ b/publish/Dockerfile @@ -0,0 +1,5 @@ +FROM python:3.10.6-buster + +RUN pip install ruff +RUN touch foo.py +RUN ruff foo.py diff --git a/pyproject.toml b/pyproject.toml index 84de25e3a7..6b22b50cba 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,6 +21,7 @@ author = "Charlie Marsh" author_email = "charlie.r.marsh@gmail.com" url = "https://github.com/charliermarsh/ruff" description = "An extremely fast Python linter, written in Rust." +requires-python = ">=3.7" [build-system] requires = ["maturin>=0.13,<0.14"] @@ -28,3 +29,5 @@ build-backend = "maturin" [tool.maturin] bindings = "bin" +sdist-include = ["Cargo.lock"] +strip = true diff --git a/src/cache.rs b/src/cache.rs index 6f07ed83e4..1c522594f0 100644 --- a/src/cache.rs +++ b/src/cache.rs @@ -1,9 +1,9 @@ use std::collections::hash_map::DefaultHasher; use std::hash::{Hash, Hasher}; -use std::os::unix::fs::MetadataExt; use std::path::Path; use cacache::Error::EntryNotFound; +use filetime::FileTime; use log::error; use serde::{Deserialize, Serialize}; @@ -14,7 +14,6 @@ const VERSION: &str = env!("CARGO_PKG_VERSION"); #[derive(Serialize, Deserialize)] struct CacheMetadata { - size: u64, mtime: i64, } @@ -90,7 +89,7 @@ pub fn get(path: &Path, settings: &Settings, mode: &Mode) -> Option Ok(encoded) => match path.metadata() { Ok(m) => match bincode::deserialize::(&encoded[..]) { Ok(CheckResult { metadata, messages }) => { - if m.size() == metadata.size && m.mtime() == metadata.mtime { + if FileTime::from_last_modification_time(&m).unix_seconds() == metadata.mtime { return Some(messages); } } @@ -112,8 +111,7 @@ pub fn set(path: &Path, settings: &Settings, messages: &[Message], mode: &Mode) if let Ok(metadata) = path.metadata() { let check_result = CheckResultRef { metadata: &CacheMetadata { - size: metadata.size(), - mtime: metadata.mtime(), + mtime: FileTime::from_last_modification_time(&metadata).unix_seconds(), }, messages, };