diff --git a/CHANGELOG.md b/CHANGELOG.md index bb71089114..c6c94944d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ that were not yet released. _Unreleased_ +- Bumped `uv` to 0.1.13. #760, #820 + +- Bumped `ruff` to 0.3.0. #821 + - The `init` command now generates a script with the name of the project rather than `hello`. #801 diff --git a/docs/philosophy.md b/docs/philosophy.md index 9850d45cbd..44481d300e 100644 --- a/docs/philosophy.md +++ b/docs/philosophy.md @@ -17,7 +17,7 @@ on my mind when I built it: format and uses [`uv`](https://github.com/astral-sh/uv) and [`pip-tools`](https://github.com/jazzband/pip-tools) behind the scenes. -- **No Pip:** Rye uses pip, but it does not expose it. It manage dependencies in +- **No Pip:** Rye uses pip, but it does not expose it. It manages dependencies in `pyproject.toml` only. - **No System Python:** I can't deal with any more linux distribution weird Python diff --git a/pyproject.toml b/pyproject.toml index 43067e34af..b9abfed6ae 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,3 +30,7 @@ serve-docs = "mkdocs serve" [tool.rye.workspace] members = ["rye-devtools"] + +[tool.ruff] +# the .rye folder is added by the rye github action +exclude = [".rye", ".venv"] diff --git a/rye/src/bootstrap.rs b/rye/src/bootstrap.rs index 3a55016cee..862178ae8e 100644 --- a/rye/src/bootstrap.rs +++ b/rye/src/bootstrap.rs @@ -31,7 +31,7 @@ pub const SELF_PYTHON_TARGET_VERSION: PythonVersionRequest = PythonVersionReques suffix: None, }; -const SELF_VERSION: u64 = 14; +const SELF_VERSION: u64 = 16; const SELF_REQUIREMENTS: &str = r#" build==1.0.3 @@ -50,7 +50,7 @@ twine==4.0.2 unearth==0.14.0 urllib3==2.0.7 virtualenv==20.25.0 -ruff==0.2.2 +ruff==0.3.0 "#; static FORCED_TO_UPDATE: AtomicBool = AtomicBool::new(false); diff --git a/rye/src/sources/generated/uv_downloads.inc b/rye/src/sources/generated/uv_downloads.inc index 516afecfc6..2ef9e336e2 100644 --- a/rye/src/sources/generated/uv_downloads.inc +++ b/rye/src/sources/generated/uv_downloads.inc @@ -2,11 +2,11 @@ // To regenerate, run `rye run uv-downloads > rye/src/generated/uv_downloads.inc` from the root of the repository. use std::borrow::Cow; pub const UV_DOWNLOADS: &[UvDownload] = &[ - UvDownload {arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 0, minor: 1, patch: 11, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.1.11/uv-aarch64-apple-darwin.tar.gz"), sha256: Cow::Borrowed("64e0aeae1d5135684c65e5d41741f1b2eba5c60e574dfef7386712b259066d95") }, - UvDownload {arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 0, minor: 1, patch: 11, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.1.11/uv-aarch64-unknown-linux-gnu.tar.gz"), sha256: Cow::Borrowed("56a7edd9bfadab67100bde6aca3012c9d7d8619405ebb360eae50b88ba2c6dff") }, - UvDownload {arch: Cow::Borrowed("i686"), os: Cow::Borrowed("windows"), major: 0, minor: 1, patch: 11, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.1.11/uv-i686-pc-windows-msvc.zip"), sha256: Cow::Borrowed("75e74c43bf6aeb3cd83a7b7a1f578c2247c48a03fa421317ca7f27f881c0890e") }, - UvDownload {arch: Cow::Borrowed("i686"), os: Cow::Borrowed("linux"), major: 0, minor: 1, patch: 11, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.1.11/uv-i686-unknown-linux-gnu.tar.gz"), sha256: Cow::Borrowed("f8d63781a8a0d3452f7322268a4bfb3a6e06816b76deafde660d53bbc2d790d9") }, - UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 0, minor: 1, patch: 11, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.1.11/uv-x86_64-apple-darwin.tar.gz"), sha256: Cow::Borrowed("62f2c6696fdf8bf394662cad54244411b9e96908de9e52b3743955b0d94bd8d4") }, - UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 0, minor: 1, patch: 11, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.1.11/uv-x86_64-pc-windows-msvc.zip"), sha256: Cow::Borrowed("e3e49f27f032c195f01d33df30dff16c9ce7d6ac60512c1af117fc4597d0e632") }, - UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 0, minor: 1, patch: 11, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.1.11/uv-x86_64-unknown-linux-gnu.tar.gz"), sha256: Cow::Borrowed("8b1d098549f46814ed40975db6e88aba2eb541196bea54753b08f789b6db8384") }, + UvDownload {arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 0, minor: 1, patch: 13, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.1.13/uv-aarch64-apple-darwin.tar.gz"), sha256: Cow::Borrowed("9d7a71dbb75dbabcbaace98d06517caa691ec8dab8ecbda3afee44ac9cb1e1c3") }, + UvDownload {arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 0, minor: 1, patch: 13, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.1.13/uv-aarch64-unknown-linux-gnu.tar.gz"), sha256: Cow::Borrowed("16429c1a00b0a1fb653ae8a104d5af121bc765f047a7b750f356515c50c226c7") }, + UvDownload {arch: Cow::Borrowed("i686"), os: Cow::Borrowed("windows"), major: 0, minor: 1, patch: 13, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.1.13/uv-i686-pc-windows-msvc.zip"), sha256: Cow::Borrowed("5e75f004ece194c6c0bbec894f229bae440556c3c43df6d6a33a93b287a6ef96") }, + UvDownload {arch: Cow::Borrowed("i686"), os: Cow::Borrowed("linux"), major: 0, minor: 1, patch: 13, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.1.13/uv-i686-unknown-linux-gnu.tar.gz"), sha256: Cow::Borrowed("3a74bace4da3dbdc3f36e7720d7f6bc56098716e7c3e949664b301136fdf3dee") }, + UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 0, minor: 1, patch: 13, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.1.13/uv-x86_64-apple-darwin.tar.gz"), sha256: Cow::Borrowed("ad133fc0c67cbe2d578631d77d2f6442626c77a1e144bbda2912b7af9085e91a") }, + UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 0, minor: 1, patch: 13, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.1.13/uv-x86_64-pc-windows-msvc.zip"), sha256: Cow::Borrowed("f61cc5c329abc535248cce0912fe01c20e7c99ae9bead6015842f8c5fd3cdfeb") }, + UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 0, minor: 1, patch: 13, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.1.13/uv-x86_64-unknown-linux-gnu.tar.gz"), sha256: Cow::Borrowed("2bfc6a542a3df6af6f56ccd8ec9f1b0596fff62b11650b0bdb830f10ee4e2d64") }, ]; diff --git a/rye/src/templates/lib/maturin/lib.rs.j2 b/rye/src/templates/lib/maturin/lib.rs.j2 index baf9c5b4fe..e0ee798bdb 100644 --- a/rye/src/templates/lib/maturin/lib.rs.j2 +++ b/rye/src/templates/lib/maturin/lib.rs.j2 @@ -1,4 +1,4 @@ -const LIB_RS_TEMPLATE: &str = r#"use pyo3::prelude::*; +use pyo3::prelude::*; /// Prints a message. #[pyfunction]