Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] main from mitsuhiko:main #30

Merged
merged 3 commits into from
Feb 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ _Unreleased_

- Fixed `rye config --show-path` abort with an error. #706

- Bumped `uv` to 0.1.6. #719
- Bumped `uv` to 0.1.7. #719, #740

- Bumped `ruff` to 0.2.2. #700

Expand Down
2 changes: 1 addition & 1 deletion docs/philosophy.md
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ allows much easier cross-python version testing via tox or CI.

Today there are a ton of different resolvers in the Python ecosystem. Pip has two, poetry
has one, pdm has one, different independent Python and Rust resolvers exist on top of that.
Resolvers are important, but unfortunately are are both too many and too many issues with
Resolvers are important, but unfortunately, there are both too many and too many issues with
the existing ones. Here is what I believe a resolver needs to be able to accomplish:

* **Allow resolving across markers:** most resolvers in the Python ecosystem today can only
Expand Down
2 changes: 1 addition & 1 deletion rye/src/bootstrap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ unearth==0.14.0
urllib3==2.0.7
virtualenv==20.25.0
ruff==0.2.2
uv==0.1.6
uv==0.1.7
"#;

static FORCED_TO_UPDATE: AtomicBool = AtomicBool::new(false);
Expand Down
2 changes: 1 addition & 1 deletion rye/src/cli/init.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ pub struct Args {
/// Do not create .python-version file (requires-python will be used)
#[arg(long)]
no_pin: bool,
/// Which build system should be used(defaults to hatchling)?
/// Which build system should be used (defaults to hatchling)?
#[arg(long)]
build_system: Option<BuildSystem>,
/// Which license should be used (SPDX identifier)?
Expand Down
Loading