4673 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Eric Mark Martin	c49c7bdf97	Implement PEP 440-compliant local version semantics (#8797) ... Implement a full working version of local version semantics. The (AFAIA) major move towards this was implemented in #2430. This added support such that the version specifier `torch==2.1.0+cpu` would install `torch@2.1.0+cpu` and consider `torch@2.1.0+cpu` a valid way to satisfy the requirement `torch==2.1.0` in further dependency resolution. In this feature, we more fully support local version semantics. Namely, we now allow `torch==2.1.0` to install `torch@2.1.0+cpu` regardless of whether `torch@2.1.0` (no local tag) actually exists. We do this by adding an internal-only `Max` value to local versions that compare greater to all other local versions. Then we can translate `torch==2.1.0` into bounds: greater than 2.1.0 with no local tag and less than 2.1.0 with the `Max` local tag. Depends on https://github.com/astral-sh/packse/pull/227.	2024-11-07 14:29:54 -06:00
Zanie Blue	8ef5949294	Discover and respect .python-version files in parent directories (#6370) ... Uses #6369 for test coverage. Updates version file discovery to search up into parent directories. Also refactors Python request determination to avoid duplicating the user request / version file / workspace lookup logic in every command (this supersedes the work started in https://github.com/astral-sh/uv/pull/6372). There is a bit of remaining work here, mostly around documentation. There are some edge-cases where we don't use the refactored request utility, like `uv build` — I'm not sure how I'm going to handle that yet as it needs a separate root directory.	2024-11-07 14:29:54 -06:00
Zanie Blue	fb89b64acf	Make --allow-insecure-host a global option (#8476) ... Not verifying the certificates of certain hosts should be supported for all kinds of HTTPS connections, so we're making it a global option, just like native tls. This fixes the remaining places using a client but were not configuring allow insecure host. Fixes #6983 (i think) Closes #6983 --------- Co-authored-by: Charlie Marsh <charlie.r.marsh@gmail.com>	2024-11-07 14:29:54 -06:00
Charlie Marsh	633467576b	Use base executable to set virtualenv Python path (#8481) ... See extensive discussion in https://github.com/astral-sh/uv/pull/8433#issuecomment-2430472849. This PR brings us into alignment with the standard library by using `sys._base_executable` rather than canonicalizing the executable path. The benefits are primarily for Homebrew, where we'll now resolve to paths like `/opt/homebrew/opt/python@3.12/bin` instead of the undesirable `/opt/homebrew/Cellar/python@3.9/3.9.19_1/Frameworks/Python.framework/Versions/3.9/bin`. Most other users should see no change, though in some cases, nested virtual environments now have slightly different behavior -- namely, they _sometimes_ resolve to the virtual environment Python (at least for Homebrew; not for rtx or uv Pythons though). See [here](https://docs.google.com/spreadsheets/d/1Vw5ClYEjgrBJJhQiwa3cCenIA1GbcRyudYN9NwQaEcM/edit?gid=0#gid=0) for a breakdown. Closes https://github.com/astral-sh/uv/issues/1640. Closes https://github.com/astral-sh/uv/issues/1795.	2024-11-07 14:29:54 -06:00
Zanie Blue	b6c531f4dd	Error when disallowed settings are defined in uv.toml (#8550) ... These settings can only be defined in `pyproject.toml`, since they're project-centric, and not _configuration_. Closes https://github.com/astral-sh/uv/issues/8539. --------- Co-authored-by: Zanie Blue <contact@zanie.dev> Co-authored-by: Charlie Marsh <charlie.r.marsh@gmail.com> Co-authored-by: konsti <konstin@mailbox.org>	2024-11-07 14:29:54 -06:00
Zanie Blue	383d4e774b	Use XDG (i.e. ~/.local/bin) instead of the Cargo home directory in the installer (#8420) ... Reviving https://github.com/astral-sh/uv/pull/2236 Basically implements https://github.com/axodotdev/cargo-dist/issues/287	2024-11-07 14:29:54 -06:00
Zanie Blue	8034de7295	Treat the base Conda environment as a system environment (#7691) ... Closes https://github.com/astral-sh/uv/issues/7124 Closes https://github.com/astral-sh/uv/issues/7137	2024-11-07 14:29:54 -06:00
Zanie Blue	1df8f86c22	Eliminate dependencies on directores and dirs-sys (#8048) ... Migrate all directory related logic to `etcetera`, eliminated two dependecies.	2024-11-07 14:29:54 -06:00
Zanie Blue	4874b32d85	do not imply pre-release when != operator is used (#7974) ... closes #6640 Could you suggest how I should test it? (already tested locally) --------- Co-authored-by: konstin <konstin@mailbox.org> Co-authored-by: Charles Tapley Hoyt <cthoyt@gmail.com> Co-authored-by: Charlie Marsh <charlie.r.marsh@gmail.com>	2024-11-07 14:29:54 -06:00
Aditya Pratap Singh	b622315a6c	Improve interactions between color environment variables and CLI options (#8215) ... closes #8173	2024-11-07 14:29:54 -06:00
Zanie Blue	55502842c0	Use 3.13 in CI (#8014)	2024-11-07 14:29:54 -06:00
Chris Adams	7a247a6533	Add further examples of git+https support (#8841) ... This pull request includes updates to the `docs/guides/tools.md` file to provide more detailed instructions on how to pull from a git repository using different options, using the `git+https` scheme support. It follows [asking a question in the Discord chat](1303270516) and getting some useful guidance that was not in the docs, but makes some very useful features of `uv` easier to discover. ## Summary Tweaks to documentation: * Added instructions on how to pull the latest commit from a specific named branch. * Added instructions on how to pull a specific tag. * Added instructions on how to pull a specific commit.	2024-11-07 14:11:26 -06:00
Charlie Marsh	29e1b15473	Add uv tree --outdated (#8893) ... ## Summary Similar to `pip list --outdated`, but for `uv tree`. ## Test Plan Looks like: ``` foo v0.1.0 └── flask v2.0.0 (latest: v3.0.3) ├── click v8.1.7 ├── itsdangerous v2.2.0 ├── jinja2 v3.1.4 │ └── markupsafe v3.0.2 └── werkzeug v3.1.2 └── markupsafe v3.0.2 ``` With `(latest: v3.0.3)` in bold cyan.	2024-11-07 14:10:46 -06:00
Zanie Blue	88331e756e	Improve Python discovery source messages (#8890) ... e.g. ``` ❯ echo "anyio" | cargo run -q -- pip compile - -v DEBUG uv 0.4.30 (107ab3d71 2024-11-07) DEBUG Starting Python discovery for a default Python DEBUG Looking for exact match for request a default Python DEBUG Searching for default Python interpreter in virtual environments, managed installations, or search path DEBUG Found `cpython-3.12.7-macos-aarch64-none` at `/Users/zb/workspace/uv/.venv/bin/python3` (virtual environment) ``` ``` ❯ cargo run -q -- pip install anyio -v DEBUG uv 0.4.30 (107ab3d71 2024-11-07) DEBUG Searching for default Python interpreter in virtual environments DEBUG Found `cpython-3.12.7-macos-aarch64-none` at `/Users/zb/workspace/uv/.venv/bin/python3` (virtual environment) ``` vs ``` ❯ uv pip install anyio -v DEBUG uv 0.4.30 (61ed2a236 2024-11-04) DEBUG Searching for default Python interpreter in system path DEBUG Found `cpython-3.12.7-macos-aarch64-none` at `/Users/zb/workspace/uv/.venv/bin/python3` (virtual environment) ``` ``` ❯ echo "anyio" | uv pip compile - -v DEBUG uv 0.4.30 (61ed2a236 2024-11-04) DEBUG Starting Python discovery for a default Python DEBUG Looking for exact match for request a default Python DEBUG Searching for default Python interpreter in managed installations or system path DEBUG Found `cpython-3.12.7-macos-aarch64-none` at `/Users/zb/workspace/uv/.venv/bin/python3` (virtual environment) ```	2024-11-07 14:08:49 -06:00
Adam Björnberg	b4fa46bf4f	Add armv8l alias for armv7l to support arm 32-bit compatibility mode (#8881) ... ## Summary `uv` commands like `uv venv` and `uv tool` throw this error when running on arm64 in 32-bit [compatibility mode](https://elixir.bootlin.com/linux/v6.11.6/source/arch/arm64/include/asm/compat.h#L32): ``` unknown variant `armv8l`, expected one of `aarch64`, `arm64`, `armv6l`, `armv7l`, `powerpc64le`, `ppc64le`, `powerpc64`, `ppc64`, `i386`, `i686`, `x86`, `amd64`, `x86_64`, `s390x`, `riscv64` --- stdout: {"result": "success", "markers": {"implementation_name": "cpython", "implementation_version": "3.11.10", "os_name": "posix", "platform_machine": "armv8l", "platform_python_implementation": "CPython", "platform_release": "6.8.0-1015-azure", "platform_system": "Linux", "platform_version": "#17-Ubuntu SMP Mon Sep 2 15:50:42 UTC 2024", "python_full_version": "3.11.10", "python_version": "3.11", "sys_platform": "linux"}, "sys_base_prefix": "/home/pi/.local/share/uv/python/cpython-3.11.10-linux-armv7-gnueabihf", "sys_base_exec_prefix": "/home/pi/.local/share/uv/python/cpython-3.11.10-linux-armv7-gnueabihf", "sys_prefix": "/home/pi/.local/share/uv/python/cpython-3.11.10-linux-armv7-gnueabihf", "sys_base_executable": "/home/pi/.local/share/uv/python/cpython-3.11.10-linux-armv7-gnueabihf/bin/python3.11", "sys_executable": "/home/pi/.local/share/uv/python/cpython-3.11.10-linux-armv7-gnueabihf/bin/python3.11", "sys_path": ["/home/pi/.cache/uv/.tmpvXy34S", "/home/pi/.local/share/uv/python/cpython-3.11.10-linux-armv7-gnueabihf/lib/python311.zip", "/home/pi/.local/share/uv/python/cpython-3.11.10-linux-armv7-gnueabihf/lib/python3.11", "/home/pi/.local/share/uv/python/cpython-3.11.10-linux-armv7-gnueabihf/lib/python3.11/lib-dynload", "/home/pi/.local/share/uv/python/cpython-3.11.10-linux-armv7-gnueabihf/lib/python3.11/site-packages"], "stdlib": "/home/pi/.local/share/uv/python/cpython-3.11.10-linux-armv7-gnueabihf/lib/python3.11", "scheme": {"platlib": "/home/pi/.local/share/uv/python/cpython-3.11.10-linux-armv7-gnueabihf/lib/python3.11/site-packages", "purelib": "/home/pi/.local/share/uv/python/cpython-3.11.10-linux-armv7-gnueabihf/lib/python3.11/site-packages", "include": "/home/pi/.local/share/uv/python/cpython-3.11.10-linux-armv7-gnueabihf/include/python3.11", "scripts": "/home/pi/.local/share/uv/python/cpython-3.11.10-linux-armv7-gnueabihf/bin", "data": "/home/pi/.local/share/uv/python/cpython-3.11.10-linux-armv7-gnueabihf"}, "virtualenv": {"purelib": "lib/python3.11/site-packages", "platlib": "lib/python3.11/site-packages", "include": "include/site/python3.11", "scripts": "bin", "data": ""}, "platform": {"os": {"name": "manylinux", "major": 2, "minor": 31}, "arch": "armv8l"}, "manylinux_compatible": true, "gil_disabled": false, "pointer_size": "32"} --- stderr: --- ``` This is needed when building for 32-bit arm on a arm64 runner. The `platform.machine()` function in python (which uses the `uname` syscall) outputs`armv8l` when running in 32-bit [compatibility mode](https://elixir.bootlin.com/linux/v6.11.6/source/arch/arm64/include/asm/compat.h#L32), which means that the system supports armv7l binaries. ## Test Plan Not tested :)	2024-11-07 11:42:05 -05:00
konsti	107ab3d71c	Build basic source distributions (#8886) ... Very basic source distribution support. What's included: - Include and exclude patterns (hard-coded): Currently, we have globset+walkdir in one part and glob in the other. I'll migrate everything to globset+walkset and some custom perf optimizations to avoid traversing irrelevant directories on top. I'll also pick a glob syntax (or subset), PEP 639 seems like a good candidate since it's consistent with what we already have to support. - Add the `PKG-INFO` file with metadata: Thanks to Code Metadata 2.2, this metadata is reliable and can be read statically by external tools. Example output: ``` $ tar -ztvf dist/dummy-0.1.0.tar.gz -rw-r--r-- 0/0 154 1970-01-01 01:00 dummy-0.1.0/PKG-INFO -rw-rw-r-- 0/0 509 1970-01-01 01:00 dummy-0.1.0/pyproject.toml drwxrwxr-x 0/0 0 1970-01-01 01:00 dummy-0.1.0/src/dummy drwxrwxr-x 0/0 0 1970-01-01 01:00 dummy-0.1.0/src/dummy/submodule -rw-rw-r-- 0/0 30 1970-01-01 01:00 dummy-0.1.0/src/dummy/submodule/impl.py -rw-rw-r-- 0/0 14 1970-01-01 01:00 dummy-0.1.0/src/dummy/submodule/__init__.py -rw-rw-r-- 0/0 12 1970-01-01 01:00 dummy-0.1.0/src/dummy/__init__.py ``` No tests since the source distributions don't build valid wheels yet.	2024-11-07 14:29:54 +01:00
Charlie Marsh	5eba64a641	Add installer variables to environment reference (#8874) ... ## Summary I decided to omit the new URL options from the installer configuration page since they're pretty niche.	2024-11-07 07:45:06 -05:00
Noé Rubinstein	eb8498d92b	docs: document how to mimic --verbose with environment variable RUST_LOG (#8858) ... The doc was unclear to me and I had to dig in the code to understand that RUST_LOG could do the same as adding `--verbose`	2024-11-07 10:24:32 +01:00
konsti	387a709fcf	Add note on private classifier (#8783)	2024-11-07 09:41:46 +01:00
Charlie Marsh	2340d73e33	Upgrade to cargo-dist v0.25.1 (#8873) ... ## Summary This gets us access to `UV_INSTALLER_GITHUB_BASE_URL` and `UV_INSTALLER_GHE_BASE_URL`. See: https://github.com/axodotdev/cargo-dist/releases/tag/v0.25.1.	2024-11-06 21:48:43 -05:00
Charlie Marsh	b98bdc818f	Add support for pip list --outdated (#8872) ... ## Summary Closes https://github.com/astral-sh/uv/issues/2150.	2024-11-07 02:32:30 +00:00
Charlie Marsh	273f453e75	Use no reporter by default in cache clean (#8868)	2024-11-06 17:07:10 +00:00
Jo	738f4245a5	Add docs/configuration/environment.md to code change list (#8859) ... See #8858, the `cargo dev generate-all` step should not be skipped.	2024-11-06 11:44:42 -05:00
Jo	dcd24b7c42	Add progress bar for uv cache clean (#8857) ... ## Summary Closes #8786	2024-11-06 11:43:43 -05:00
Charlie Marsh	987d778631	Respect dynamic version updates in uv lock (#8867) ... ## Summary Closes https://github.com/astral-sh/uv/issues/8866.	2024-11-06 11:40:23 -05:00
Jo	814b4d159c	Add MSRV build to CI (#8855) ... ## Summary Closes #8451	2024-11-06 11:22:13 -05:00
Jo	9f81db7d1d	Use cache in windows clippy job (#8852) ... Place the `Swatinem/rust-cache@v2` step after `setup-dev-drive.ps1` to ensure the correct directories are cached.	2024-11-05 23:05:34 -06:00
Zanie Blue	129c6f61d4	Revert "Using --build-backend in uv init implies --package (#8837)" (#8850) ... This reverts commit 515993c743 from https://github.com/astral-sh/uv/pull/8837 as it was already implemented differently in https://github.com/astral-sh/uv/pull/8593 and I missed it	2024-11-06 01:36:11 +00:00
Udi Oron	8963de26a7	docs: fix uv python install docs to use an exisigin pypy version (#8845) ... The current docs call to install pypy@3.12 that does not exist yet. Change it to install pypy@3.10	2024-11-05 16:13:58 -06:00
Charlie Marsh	26e3511ebd	Respect fork markers in --resolution-mode=lowest-direct (#8839) ... ## Summary Previously, given: ```toml dependencies = [ "pycountry >= 22.1.10", "setuptools >= 50.0.0; python_version>='3.12'" ] ``` We'd solve for the lowest version of setuptools (with _no_ lower-bound constraint) in the `python_version < '3.12'` complement. Closes https://github.com/astral-sh/uv/issues/8819.	2024-11-05 21:09:38 +00:00
Charlie Marsh	d238642d76	Allow semicolons directly after direct URLs (#8836) ... ## Summary Like pip, we now allow the semicolon to directly proceed the URL (but require that it's either preceded or followed by a space): ``` # OK ./test.whl; sys_platform == 'darwin' # OK ./test.whl ;sys_platform == 'darwin' # Error ./test.whl;sys_platform == 'darwin' ``` Closes https://github.com/astral-sh/uv/issues/8831.	2024-11-05 16:07:07 -05:00
Zanie Blue	515993c743	Using --build-backend in uv init implies --package (#8837)	2024-11-05 14:15:55 -06:00
Charlie Marsh	eeb8736448	Show dedicated error for trailing ; on URL and path requirements (#8835) ... ## Summary I think we lost this error in a prior refactor. I've added an end-to-end test too.	2024-11-05 13:29:36 -05:00
Andrew Gallant	fae03a7287	uv-pep440: DRY up VersionSmall implementation (#8834) ... This PR simplifies the VersionSmall implementation a bit by utilizing more constants. That is, if the bit-level format changes, *most* of those changes should be implementable by just changing the constants. Previously, you would need to audit and tweak the code as well. (The exception here is `push_release`. If the release segment bit format is changed, then that function will need to be tweaked. I didn't think it was worth over-complicating things to make its implementation more general.)	2024-11-05 13:26:19 -05:00
Charlie Marsh	23ea5df76a	Warn on failure to query system configuration file (#8829) ... ## Summary See: #8828.	2024-11-05 16:11:38 +00:00
Robert Deaton	177fafceb4	Enable support for arbitrary git transports (#8769)	2024-11-05 08:55:15 +01:00
Charlie Marsh	23afc608b8	Update pip-and-uv strictness example (#8822) ... ## Summary pip now enforces this too! Let's use a different example. Closes https://github.com/astral-sh/uv/issues/8412.	2024-11-04 21:32:45 -05:00
Zanie Blue	61ed2a236a	Bump version to 0.4.30 (#8820)	2024-11-04 18:52:57 -06:00
konsti	c39936e9c8	Publish: Hint at --skip-existing -> --check-url transition (#8803) ... See https://github.com/astral-sh/uv/pull/8531#issuecomment-2442698889, we hint users coming from twine to use `--check-url` instead. > `uv publish` does not support `--skip-existing`, use `--check-url` with the simple index URL instead. --------- Co-authored-by: Zanie Blue <contact@zanie.dev>	2024-11-04 23:21:01 +00:00
Charlie Marsh	f8ec7975c8	Update Packse snapshots (#8795) ... ## Summary The diff here is challenging because it looks like some tests got reordered.	2024-11-04 16:17:43 -05:00
Zanie Blue	fb1d679f69	Improve interactions with existing Python executables during install (#8733) ... Previously, we'd use the `--reinstall` flag to determine if we should replace existing Python executables in the bin directory during an install. There are a few problems with this: - We replace executables we don't manage - We can replace executables from other uv Python installations during reinstall (surprising) - We don't do the "right" thing when installing patch versions e.g. installing `3.12.4` then `3.12.6` would fail without the reinstall flag In `uv tool`, we have separate `--force` and `--reinstall` concepts. Here we separate the flags (`--force` was previously just a `--reinstall` alias) and add inspection of the existing executables to inform a decision on replacement. In brief, we will: - Replace any executables with `--force` - Replace executables for the same installation with `--reinstall` - Replace executables for an older patch version by default	2024-11-04 20:22:44 +00:00
Zanie Blue	6a6b9af466	Fix test case on main (#8816)	2024-11-04 19:50:59 +00:00
Charlie Marsh	a42c09fdfb	Add support for .env and custom env files in uv run (#8811) ... ## Summary This PR pulls in https://github.com/astral-sh/uv/pull/8263 and https://github.com/astral-sh/uv/pull/8463, which were originally merged into the v0.5 tracking branch but can now be committed separately, as we've made `.env` loading opt-in. In summary: - `.env` loading is now opt-in (`--env-file .env`). - `.env` remains supported on `uv run`, so it's meant for providing environment variables to the run command, rather than to uv itself. --------- Co-authored-by: Eduardo González Vaquero <47718648+edugzlez@users.noreply.github.com>	2024-11-04 14:26:05 -05:00
Andrew Gallant	224622b089	uv/tests: make python_version < '0' regression test smaller (#8809) ... Running this test manually on the latest release shows that it still emits a `python_version < '0'` marker: $ uv-0.4.29 pip compile requirements.in -c constraints.txt --annotation-style line --python 3.10 --universal | rg "< '0'" Resolved 151 packages in 97ms apache-airflow-providers-common-sql==1.19.0 ; python_version < '0' # via apache-airflow-providers-sqlite That is, even though this is a smaller test, it's still testing the same bug. This is about twice as fast on my machine. It's probably still worth moving to a packse test, but this was quick to do.	2024-11-04 11:10:17 -05:00
Andrew Gallant	acaed763b7	uv: use ResolverEnvironment instead of ResolverMarkers ... This updates the surrounding code to use the new ResolverEnvironment type. In some cases, this simplifies caller code by removing case analysis. There *shouldn't* be any behavior changes here. Some test snapshots were updated to account for some minor tweaks to error messages. I didn't split this up into separate commits because it would have been too difficult/costly.	2024-11-04 11:09:06 -05:00
Andrew Gallant	44c9ef6aea	uv-resolver: add new ResolverEnvironment type ... This type is intended to replace `ResolverMarkers`. The main difference between them is that this type encapsulates more decision making by un-exporting the different cases. So instead of callers needing to do explicit case analysis depending on the type of resolver environment, callers instead use methods that know how to do the right thing. In the next commit, there are at least a few cases where this greatly simplifies case analysis on the caller side. The motivation for this type is to centralize decision making about forking. In particular, we want to expand forking to include conflicting groups instead of just `MarkerTree`. So to a certain extent, the refactor here is about removing bare use of `MarkerTree` in favor of a more purpose built type that encapsulates the forking logic. The encapsulation is not quite perfect here. I expect to improve on it a bit once we add support for conflicting groups. This is split off from the subsequent commit (that makes use of `ResolverEnvironment`) so that it's a bit easier to review the addition in isolation.	2024-11-04 11:09:06 -05:00
Andrew Gallant	fccd48ce61	uv-normalize: add as_str method ... `ExtraName` did implement `AsRef<str>`, but that should generally only be used in a context with an `AsRef<str>` generic bound. If you just want a `&str` from a concrete `ExtraName`, then a specific method for that purpose should be used.	2024-11-04 11:09:06 -05:00
Zanie Blue	6250b900b7	Allow managed downloads with --python-preference system (#8808) ... Closes https://github.com/astral-sh/uv/issues/8804	2024-11-04 07:45:24 -06:00
Tim de Jager	d82607d038	Extend BaseClient to accept extra middleware (#8807) ... This PR is a revival of #3502, albeit in a much simpler form. This would allow for different middlewares like authentication and such, useful for if you want to deviate from the keychain authentication methods when using uv as a library. @zanieb I hope I made the changes as you noted you wanted to see them :) Happy to add/change anything you need.	2024-11-04 07:04:26 -06:00
Tim de Jager	ef8724c979	Add From for FlatDistributions struct (#8800) ... Co-authored-by: konsti <konstin@mailbox.org>	2024-11-04 08:41:39 +00:00