Skip to content

Commit 3fca195

Browse files
jtfmummjtfmumm
committed
..
1 parent 599e0cf commit 3fca195

File tree

4 files changed

+25
-25
lines changed

4 files changed

+25
-25
lines changed

‎crates/uv/tests/it/lock.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18808,8 +18808,8 @@ fn lock_keyring_credentials() -> Result<()> {
1880818808
----- stdout -----
1880918809

1881018810
----- stderr -----
18811-
Request for public@https://pypi-proxy.fly.dev/basic-auth/simple
18812-
Request for [email protected]
18811+
Keyring request for public@https://pypi-proxy.fly.dev/basic-auth
18812+
Keyring request for [email protected]
1881318813
Resolved 2 packages in [TIME]
1881418814
");
1881518815

@@ -18913,8 +18913,8 @@ fn lock_keyring_explicit_always() -> Result<()> {
1891318913
----- stdout -----
1891418914

1891518915
----- stderr -----
18916-
Request for https://pypi-proxy.fly.dev/basic-auth/simple
18917-
Request for pypi-proxy.fly.dev
18916+
Keyring request for https://pypi-proxy.fly.dev/basic-auth
18917+
Keyring request for pypi-proxy.fly.dev
1891818918
× No solution found when resolving dependencies:
1891918919
╰─▶ Because iniconfig was not found in the package registry and your project depends on iniconfig, we can conclude that your project's requirements are unsatisfiable.
1892018920

@@ -18930,8 +18930,8 @@ fn lock_keyring_explicit_always() -> Result<()> {
1893018930
----- stdout -----
1893118931

1893218932
----- stderr -----
18933-
Request for https://pypi-proxy.fly.dev/basic-auth/simple
18934-
Request for pypi-proxy.fly.dev
18933+
Keyring request for https://pypi-proxy.fly.dev/basic-auth
18934+
Keyring request for pypi-proxy.fly.dev
1893518935
Resolved 2 packages in [TIME]
1893618936
");
1893718937

@@ -18996,8 +18996,8 @@ fn lock_keyring_credentials_always_authenticate_fetches_username() -> Result<()>
1899618996
----- stdout -----
1899718997

1899818998
----- stderr -----
18999-
Request for https://pypi-proxy.fly.dev/basic-auth/simple
19000-
Request for pypi-proxy.fly.dev
18999+
Keyring request for https://pypi-proxy.fly.dev/basic-auth
19000+
Keyring request for pypi-proxy.fly.dev
1900119001
Resolved 2 packages in [TIME]
1900219002
");
1900319003

‎crates/uv/tests/it/pip_install.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5341,8 +5341,8 @@ fn install_package_basic_auth_from_keyring() {
53415341
----- stdout -----
53425342
53435343
----- stderr -----
5344-
Request for public@https://pypi-proxy.fly.dev/basic-auth/simple
5345-
Request for [email protected]
5344+
Keyring request for public@https://pypi-proxy.fly.dev/basic-auth
5345+
Keyring request for [email protected]
53465346
Resolved 3 packages in [TIME]
53475347
Prepared 3 packages in [TIME]
53485348
Installed 3 packages in [TIME]
@@ -5388,8 +5388,8 @@ fn install_package_basic_auth_from_keyring_wrong_password() {
53885388
----- stdout -----
53895389
53905390
----- stderr -----
5391-
Request for public@https://pypi-proxy.fly.dev/basic-auth/simple
5392-
Request for [email protected]
5391+
Keyring request for public@https://pypi-proxy.fly.dev/basic-auth
5392+
Keyring request for [email protected]
53935393
× No solution found when resolving dependencies:
53945394
╰─▶ Because anyio was not found in the package registry and you require anyio, we can conclude that your requirements are unsatisfiable.
53955395
@@ -5431,8 +5431,8 @@ fn install_package_basic_auth_from_keyring_wrong_username() {
54315431
----- stdout -----
54325432
54335433
----- stderr -----
5434-
Request for public@https://pypi-proxy.fly.dev/basic-auth/simple
5435-
Request for [email protected]
5434+
Keyring request for public@https://pypi-proxy.fly.dev/basic-auth
5435+
Keyring request for [email protected]
54365436
× No solution found when resolving dependencies:
54375437
╰─▶ Because anyio was not found in the package registry and you require anyio, we can conclude that your requirements are unsatisfiable.
54385438

‎crates/uv/tests/it/publish.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -276,22 +276,22 @@ fn check_keyring_behaviours() {
276276
.arg("--publish-url")
277277
.arg("https://test.pypi.org/legacy/?ok")
278278
.arg("../../scripts/links/ok-1.0.0-py3-none-any.whl")
279-
.env(EnvVars::PATH, venv_bin_path(&context.venv)), @r###"
279+
.env(EnvVars::PATH, venv_bin_path(&context.venv)), @r"
280280
success: false
281281
exit_code: 2
282282
----- stdout -----
283283
284284
----- stderr -----
285285
Publishing 1 file to https://test.pypi.org/legacy/?ok
286-
Request for dummy@https://test.pypi.org/legacy/?ok
287-
Request for [email protected]
286+
Keyring request for dummy@https://test.pypi.org/legacy/?ok
287+
Keyring request for [email protected]
288288
warning: Keyring has no password for URL `https://test.pypi.org/legacy/?ok` and username `dummy`
289289
Uploading ok-1.0.0-py3-none-any.whl ([SIZE])
290-
Request for dummy@https://test.pypi.org/legacy/?ok
291-
Request for [email protected]
290+
Keyring request for dummy@https://test.pypi.org/legacy/?ok
291+
Keyring request for [email protected]
292292
error: Failed to publish `../../scripts/links/ok-1.0.0-py3-none-any.whl` to https://test.pypi.org/legacy/?ok
293293
Caused by: Upload failed with status code 403 Forbidden. Server says: 403 Username/Password authentication is no longer supported. Migrate to API Tokens or Trusted Publishers instead. See https://test.pypi.org/help/#apitoken and https://test.pypi.org/help/#trusted-publishers
294-
"###
294+
"
295295
);
296296

297297
// Ok: There is a keyring entry for the user dummy.
@@ -305,18 +305,18 @@ fn check_keyring_behaviours() {
305305
.arg("https://test.pypi.org/legacy/?ok")
306306
.arg("../../scripts/links/ok-1.0.0-py3-none-any.whl")
307307
.env(EnvVars::KEYRING_TEST_CREDENTIALS, r#"{"https://test.pypi.org/legacy/?ok": {"dummy": "dummy"}}"#)
308-
.env(EnvVars::PATH, venv_bin_path(&context.venv)), @r###"
308+
.env(EnvVars::PATH, venv_bin_path(&context.venv)), @r"
309309
success: false
310310
exit_code: 2
311311
----- stdout -----
312312
313313
----- stderr -----
314314
Publishing 1 file to https://test.pypi.org/legacy/?ok
315-
Request for dummy@https://test.pypi.org/legacy/?ok
315+
Keyring request for dummy@https://test.pypi.org/legacy/?ok
316316
Uploading ok-1.0.0-py3-none-any.whl ([SIZE])
317317
error: Failed to publish `../../scripts/links/ok-1.0.0-py3-none-any.whl` to https://test.pypi.org/legacy/?ok
318318
Caused by: Upload failed with status code 403 Forbidden. Server says: 403 Username/Password authentication is no longer supported. Migrate to API Tokens or Trusted Publishers instead. See https://test.pypi.org/help/#apitoken and https://test.pypi.org/help/#trusted-publishers
319-
"###
319+
"
320320
);
321321
}
322322

‎scripts/packages/keyring_test_plugin/keyrings/test_keyring.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class KeyringTest(backend.KeyringBackend):
99
priority = 9
1010

1111
def get_password(self, service, username):
12-
print(f"Request for {username}@{service}", file=sys.stderr)
12+
print(f"Keyring request for {username}@{service}", file=sys.stderr)
1313
entries = json.loads(os.environ.get("KEYRING_TEST_CREDENTIALS", "{}"))
1414
return entries.get(service, {}).get(username)
1515

@@ -20,7 +20,7 @@ def delete_password(self, service, username):
2020
raise NotImplementedError()
2121

2222
def get_credential(self, service, username):
23-
print(f"Request for {service}", file=sys.stderr)
23+
print(f"Keyring request for {service}", file=sys.stderr)
2424
entries = json.loads(os.environ.get("KEYRING_TEST_CREDENTIALS", "{}"))
2525
service_entries = entries.get(service, {})
2626
if not service_entries:

0 commit comments

Comments
 (0)