coiled 1.128.3.dev6__py3-none-any.whl → 1.129.5.dev7__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- coiled/capture_environment.py +45 -77
- coiled/cli/setup/azure.py +50 -1
- coiled/context.py +2 -2
- coiled/filestore.py +1 -1
- coiled/pypi_conda_map.py +22 -96
- coiled/software_utils.py +8 -2
- coiled/v2/cluster.py +0 -1
- {coiled-1.128.3.dev6.dist-info → coiled-1.129.5.dev7.dist-info}/METADATA +1 -1
- {coiled-1.128.3.dev6.dist-info → coiled-1.129.5.dev7.dist-info}/RECORD +12 -12
- {coiled-1.128.3.dev6.dist-info → coiled-1.129.5.dev7.dist-info}/WHEEL +1 -1
- {coiled-1.128.3.dev6.dist-info → coiled-1.129.5.dev7.dist-info}/entry_points.txt +0 -0
- {coiled-1.128.3.dev6.dist-info → coiled-1.129.5.dev7.dist-info}/licenses/LICENSE +0 -0
coiled/capture_environment.py
CHANGED
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
import asyncio
|
|
2
1
|
import contextlib
|
|
3
|
-
import logging
|
|
4
2
|
import platform
|
|
5
3
|
import sys
|
|
6
4
|
import typing
|
|
@@ -69,49 +67,52 @@ async def approximate_packages(
|
|
|
69
67
|
architecture: ArchitectureTypesEnum = ArchitectureTypesEnum.X86_64,
|
|
70
68
|
pip_check_errors: Optional[Dict[str, List[str]]] = None,
|
|
71
69
|
gpu_enabled: bool = False,
|
|
70
|
+
use_uv_installer: bool = True,
|
|
72
71
|
) -> typing.List[ResolvedPackageInfo]:
|
|
73
72
|
user_conda_installed_python = next((p for p in packages if p["name"] == "python"), None)
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
if not user_conda_installed_pip:
|
|
79
|
-
# This means pip was installed by pip, or the system
|
|
80
|
-
# package manager
|
|
81
|
-
# Insert a conda version of pip to be installed first, it will
|
|
82
|
-
# then be used to install the users version of pip
|
|
83
|
-
pip = next(
|
|
84
|
-
(p for p in packages if p["name"] == "pip" and p["source"] == "pip"),
|
|
73
|
+
# Only add pip if we need it
|
|
74
|
+
if not use_uv_installer:
|
|
75
|
+
user_conda_installed_pip = next(
|
|
76
|
+
(i for i, p in enumerate(packages) if p["name"] == "pip" and p["source"] == "conda"),
|
|
85
77
|
None,
|
|
86
78
|
)
|
|
87
|
-
if not
|
|
88
|
-
#
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
"
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
79
|
+
if not user_conda_installed_pip:
|
|
80
|
+
# This means pip was installed by pip, or the system
|
|
81
|
+
# package manager
|
|
82
|
+
# Insert a conda version of pip to be installed first, it will
|
|
83
|
+
# then be used to install the users version of pip
|
|
84
|
+
pip = next(
|
|
85
|
+
(p for p in packages if p["name"] == "pip" and p["source"] == "pip"),
|
|
86
|
+
None,
|
|
87
|
+
)
|
|
88
|
+
if not pip:
|
|
89
|
+
# insert a modern version and hope it does not introduce conflicts
|
|
90
|
+
packages.append({
|
|
91
|
+
"name": "pip",
|
|
92
|
+
"path": None,
|
|
93
|
+
"source": "conda",
|
|
94
|
+
"channel_url": "https://conda.anaconda.org/conda-forge/",
|
|
95
|
+
"channel": "conda-forge",
|
|
96
|
+
"subdir": "noarch",
|
|
97
|
+
"conda_name": "pip",
|
|
98
|
+
"version": "22.3.1",
|
|
99
|
+
"wheel_target": None,
|
|
100
|
+
"requested": False,
|
|
101
|
+
})
|
|
102
|
+
else:
|
|
103
|
+
# insert the users pip version and hope it exists on conda-forge
|
|
104
|
+
packages.append({
|
|
105
|
+
"name": "pip",
|
|
106
|
+
"path": None,
|
|
107
|
+
"source": "conda",
|
|
108
|
+
"channel_url": "https://conda.anaconda.org/conda-forge/",
|
|
109
|
+
"channel": "conda-forge",
|
|
110
|
+
"subdir": "noarch",
|
|
111
|
+
"conda_name": "pip",
|
|
112
|
+
"version": pip["version"],
|
|
113
|
+
"wheel_target": None,
|
|
114
|
+
"requested": True,
|
|
115
|
+
})
|
|
115
116
|
coiled_selected_python = None
|
|
116
117
|
if not user_conda_installed_python:
|
|
117
118
|
# insert a special python package
|
|
@@ -208,6 +209,7 @@ async def create_environment_approximation(
|
|
|
208
209
|
progress: Optional[Progress] = None,
|
|
209
210
|
architecture: ArchitectureTypesEnum = ArchitectureTypesEnum.X86_64,
|
|
210
211
|
gpu_enabled: bool = False,
|
|
212
|
+
use_uv_installer: bool = True,
|
|
211
213
|
) -> typing.List[ResolvedPackageInfo]:
|
|
212
214
|
packages = await scan_prefix(progress=progress)
|
|
213
215
|
pip_check_errors = await check_pip_happy(progress)
|
|
@@ -237,6 +239,7 @@ async def create_environment_approximation(
|
|
|
237
239
|
architecture=architecture,
|
|
238
240
|
pip_check_errors=pip_check_errors,
|
|
239
241
|
gpu_enabled=gpu_enabled,
|
|
242
|
+
use_uv_installer=use_uv_installer,
|
|
240
243
|
)
|
|
241
244
|
return result
|
|
242
245
|
|
|
@@ -306,6 +309,7 @@ async def scan_and_create(
|
|
|
306
309
|
architecture=architecture,
|
|
307
310
|
gpu_enabled=gpu_enabled,
|
|
308
311
|
conda_extras=package_sync_conda_extras,
|
|
312
|
+
use_uv_installer=use_uv_installer,
|
|
309
313
|
)
|
|
310
314
|
|
|
311
315
|
if not package_sync_only:
|
|
@@ -427,39 +431,3 @@ If you use pip, venv, uv, pixi, etc. create a new environment and then:
|
|
|
427
431
|
|
|
428
432
|
See https://docs.coiled.io/user_guide/software/package_sync_best_practices.html
|
|
429
433
|
for more best practices. If that doesn't solve your issue, please contact support@coiled.io.""")
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
if __name__ == "__main__":
|
|
433
|
-
from logging import basicConfig
|
|
434
|
-
|
|
435
|
-
basicConfig(level=logging.INFO)
|
|
436
|
-
|
|
437
|
-
from rich.console import Console
|
|
438
|
-
from rich.table import Table
|
|
439
|
-
|
|
440
|
-
async def run():
|
|
441
|
-
async with CloudV2(asynchronous=True) as cloud:
|
|
442
|
-
return await create_environment_approximation(
|
|
443
|
-
cloud=cloud,
|
|
444
|
-
priorities={
|
|
445
|
-
("dask", "conda"): PackageLevelEnum.CRITICAL,
|
|
446
|
-
("twisted", "conda"): PackageLevelEnum.IGNORE,
|
|
447
|
-
("graphviz", "conda"): PackageLevelEnum.LOOSE,
|
|
448
|
-
("icu", "conda"): PackageLevelEnum.LOOSE,
|
|
449
|
-
},
|
|
450
|
-
)
|
|
451
|
-
|
|
452
|
-
result = asyncio.run(run())
|
|
453
|
-
|
|
454
|
-
table = Table(title="Packages")
|
|
455
|
-
keys = ("name", "source", "include", "client_version", "specifier", "error", "note")
|
|
456
|
-
|
|
457
|
-
for key in keys:
|
|
458
|
-
table.add_column(key)
|
|
459
|
-
|
|
460
|
-
for pkg in result:
|
|
461
|
-
row_values = [str(pkg.get(key, "")) for key in keys]
|
|
462
|
-
table.add_row(*row_values)
|
|
463
|
-
console = Console()
|
|
464
|
-
console.print(table)
|
|
465
|
-
console.print(table)
|
coiled/cli/setup/azure.py
CHANGED
|
@@ -175,8 +175,21 @@ coiled curl -X POST "${SETUP_ENDPOINT}" --json --data "{\\"credentials\\": {\\"t
|
|
|
175
175
|
"service principal for Coiled to use."
|
|
176
176
|
),
|
|
177
177
|
)
|
|
178
|
+
@click.option(
|
|
179
|
+
"--refresh-for-app-id", default=None, help="Refresh the secret key used by Coiled for specified Application ID."
|
|
180
|
+
)
|
|
178
181
|
@click.command(context_settings=CONTEXT_SETTINGS)
|
|
179
|
-
def azure_setup(
|
|
182
|
+
def azure_setup(
|
|
183
|
+
subscription,
|
|
184
|
+
resource_group,
|
|
185
|
+
region,
|
|
186
|
+
account,
|
|
187
|
+
iam_user,
|
|
188
|
+
keep_existing_access,
|
|
189
|
+
save_script,
|
|
190
|
+
ship_token,
|
|
191
|
+
refresh_for_app_id,
|
|
192
|
+
):
|
|
180
193
|
print(
|
|
181
194
|
"Coiled on Azure is currently in [bold]public beta[/bold], "
|
|
182
195
|
"please contact [link]support@coiled.io[/link] if you have any questions or problems."
|
|
@@ -264,6 +277,17 @@ def azure_setup(subscription, resource_group, region, account, iam_user, keep_ex
|
|
|
264
277
|
f"with [green]{region}[/green] as the default region\n"
|
|
265
278
|
)
|
|
266
279
|
|
|
280
|
+
if refresh_for_app_id:
|
|
281
|
+
refresh_app_creds(
|
|
282
|
+
app_id=refresh_for_app_id,
|
|
283
|
+
coiled_account=coiled_account,
|
|
284
|
+
sub_id=sub_id,
|
|
285
|
+
rg_name=rg_name,
|
|
286
|
+
region=region,
|
|
287
|
+
keep_existing_keys=True,
|
|
288
|
+
)
|
|
289
|
+
return
|
|
290
|
+
|
|
267
291
|
if ship_token:
|
|
268
292
|
enable_providers(creds, sub_id)
|
|
269
293
|
ship_token_creds(
|
|
@@ -378,6 +402,31 @@ def setup_with_service_principal(
|
|
|
378
402
|
return True
|
|
379
403
|
|
|
380
404
|
|
|
405
|
+
def refresh_app_creds(app_id, keep_existing_keys, coiled_account, sub_id, rg_name, region):
|
|
406
|
+
print(f" [bright_black]Resetting/retrieving credentials for {app_id}...")
|
|
407
|
+
cred_reset_opts = "--append" if keep_existing_keys else ""
|
|
408
|
+
app_creds_json = az_cli_wrapper(f"az ad app credential reset --id {app_id} {cred_reset_opts}")
|
|
409
|
+
app_creds = json.loads(app_creds_json)
|
|
410
|
+
|
|
411
|
+
creds_to_submit = {
|
|
412
|
+
"tenant_id": app_creds["tenant"],
|
|
413
|
+
"client_id": app_creds["appId"],
|
|
414
|
+
"client_secret": app_creds["password"],
|
|
415
|
+
}
|
|
416
|
+
|
|
417
|
+
print("Sending Azure credentials to Coiled... ", end="")
|
|
418
|
+
submit_azure_credentials(
|
|
419
|
+
coiled_account=coiled_account,
|
|
420
|
+
sub_id=sub_id,
|
|
421
|
+
rg_name=rg_name,
|
|
422
|
+
region=region,
|
|
423
|
+
creds_to_submit=creds_to_submit,
|
|
424
|
+
)
|
|
425
|
+
print(f"Azure credentials have been updated for {coiled_account} using Azure app {app_id} and {rg_name}!")
|
|
426
|
+
|
|
427
|
+
coiled.add_interaction(action="RefreshCloudCredentials", success=True)
|
|
428
|
+
|
|
429
|
+
|
|
381
430
|
def submit_azure_credentials(coiled_account, sub_id, rg_name, region, creds_to_submit, check_after: bool = False):
|
|
382
431
|
with coiled.Cloud(account=coiled_account) as cloud:
|
|
383
432
|
setup_endpoint = f"/api/v2/cloud-credentials/{coiled_account}/azure"
|
coiled/context.py
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
from __future__ import annotations
|
|
2
2
|
|
|
3
|
-
import asyncio
|
|
4
3
|
import functools
|
|
4
|
+
import inspect
|
|
5
5
|
import random
|
|
6
6
|
import string
|
|
7
7
|
from contextlib import contextmanager, nullcontext
|
|
@@ -103,7 +103,7 @@ def get_trace_context(func: Union[SyncFuncType, AsyncFuncType]):
|
|
|
103
103
|
|
|
104
104
|
|
|
105
105
|
def track_context(func: F) -> F:
|
|
106
|
-
if
|
|
106
|
+
if inspect.iscoroutinefunction(func):
|
|
107
107
|
|
|
108
108
|
@functools.wraps(func)
|
|
109
109
|
async def async_wrapper(*args: Any, **kwargs: Any) -> Any:
|
coiled/filestore.py
CHANGED
|
@@ -422,7 +422,7 @@ class FilestoreManagerWithoutHttp:
|
|
|
422
422
|
for chunk in response.iter_bytes(chunk_size=8192):
|
|
423
423
|
f.write(chunk)
|
|
424
424
|
return # Success, exit function
|
|
425
|
-
except (httpx.RemoteProtocolError, httpx.ReadTimeout, httpx.ConnectError) as e:
|
|
425
|
+
except (httpx.RemoteProtocolError, httpx.ReadTimeout, httpx.ConnectError, httpx.HTTPStatusError) as e:
|
|
426
426
|
if attempt < max_retries - 1:
|
|
427
427
|
wait_time = 2**attempt # Exponential backoff: 1s, 2s, 4s
|
|
428
428
|
if verbose:
|
coiled/pypi_conda_map.py
CHANGED
|
@@ -1,58 +1,41 @@
|
|
|
1
1
|
# This file was auto-generated by scripts/update_pypi_conda_mapping.py
|
|
2
2
|
# DO NOT MANUALLY EDIT
|
|
3
3
|
PYPI_TO_CONDA = {
|
|
4
|
-
"Boruta": "boruta_py",
|
|
5
|
-
"Flask-Cors": "flask_cors",
|
|
6
|
-
"Flask-JSON": "flask_json",
|
|
7
|
-
"SoundFile": "pysoundfile",
|
|
8
|
-
"aiohttp_cors": "aiohttp-cors",
|
|
9
4
|
"annoy": "python-annoy",
|
|
10
5
|
"arrakis": "arrakis-python",
|
|
11
6
|
"art": "ascii-art",
|
|
12
7
|
"asana": "python-asana",
|
|
13
8
|
"backtrace": "python-backtrace",
|
|
14
|
-
"
|
|
9
|
+
"bash-completion": "py-bash-completion",
|
|
15
10
|
"bilby-pipe": "bilby_pipe",
|
|
16
11
|
"blis": "cython-blis",
|
|
12
|
+
"boruta": "boruta_py",
|
|
17
13
|
"build": "python-build",
|
|
18
14
|
"captest": "pvcaptest",
|
|
19
15
|
"cdo": "python-cdo",
|
|
20
|
-
"click_config_file": "click-config-file",
|
|
21
16
|
"cockroachdb": "cockroachdb-python",
|
|
22
|
-
"conda_lock": "conda-lock",
|
|
23
|
-
"conda_mirror": "conda-mirror",
|
|
24
17
|
"confluent-kafka": "python-confluent-kafka",
|
|
25
18
|
"coreapi": "python-coreapi",
|
|
26
19
|
"coreschema": "python-coreschema",
|
|
27
|
-
"cryptography_vectors": "cryptography-vectors",
|
|
28
20
|
"cufflinks": "python-cufflinks",
|
|
29
21
|
"dashing": "python-dashing",
|
|
30
22
|
"dask": "dask-core",
|
|
31
|
-
"data-morph-ai": "data-morph-ai",
|
|
32
|
-
"dataclasses": "dataclasses",
|
|
33
23
|
"datadotworld": "datadotworld-py",
|
|
34
|
-
"
|
|
35
|
-
"delegator.py": "delegator",
|
|
24
|
+
"delegator-py": "delegator",
|
|
36
25
|
"dftd3": "dftd3-python",
|
|
37
26
|
"dftd4": "dftd4-python",
|
|
38
|
-
"dials_data": "dials-data",
|
|
39
27
|
"docker": "docker-py",
|
|
40
28
|
"duckdb": "python-duckdb",
|
|
41
|
-
"dye_score": "dye-score",
|
|
42
29
|
"eccodes": "python-eccodes",
|
|
43
|
-
"empyrical_dist": "empyrical-dist",
|
|
44
|
-
"enum34": "enum34",
|
|
45
30
|
"esprima": "esprima-python",
|
|
46
|
-
"et_xmlfile": "et-xmlfile",
|
|
47
31
|
"evalml": "evaml-core",
|
|
48
|
-
"exceptiongroup": "exceptiongroup",
|
|
49
32
|
"extract-msg": "msg-extractor",
|
|
50
33
|
"fastjsonschema": "python-fastjsonschema",
|
|
51
34
|
"flair": "python-flair",
|
|
52
|
-
"
|
|
35
|
+
"flask-cors": "flask_cors",
|
|
36
|
+
"flask-json": "flask_json",
|
|
53
37
|
"flatbuffers": "python-flatbuffers",
|
|
54
38
|
"flex": "flex-swagger",
|
|
55
|
-
"flit_core": "flit-core",
|
|
56
39
|
"gnupg": "gnupg-py",
|
|
57
40
|
"google": "googlesearch",
|
|
58
41
|
"google-cloud-bigquery": "google-cloud-bigquery-core",
|
|
@@ -63,47 +46,32 @@ PYPI_TO_CONDA = {
|
|
|
63
46
|
"hdfs": "python-hdfs",
|
|
64
47
|
"hjson": "hjson-py",
|
|
65
48
|
"htcondor": "python-htcondor",
|
|
66
|
-
"
|
|
67
|
-
"ib_insync": "ib-insync",
|
|
68
|
-
"import_metadata": "import_metadata",
|
|
69
|
-
"importlib_metadata": "importlib-metadata",
|
|
49
|
+
"import-metadata": "import_metadata",
|
|
70
50
|
"installer": "python-installer",
|
|
71
51
|
"intake-astro": "intake-accumulo",
|
|
72
|
-
"intake_geopandas": "intake-geopandas",
|
|
73
|
-
"ioos_tools": "ioos-tools",
|
|
74
52
|
"jsii": "python-jsii",
|
|
75
53
|
"jupyter-client": "jupyter_client",
|
|
76
|
-
"jupyter_jaeger": "jupyter-jaeger",
|
|
77
|
-
"jupyterlab_git": "jupyterlab-git",
|
|
78
|
-
"jupyterlab_latex": "jupyterlab-latex",
|
|
79
54
|
"kaleido": "python-kaleido",
|
|
80
55
|
"kubernetes": "python-kubernetes",
|
|
81
56
|
"libaio": "python-libaio",
|
|
82
57
|
"libnacl": "libnacl-python-bindings",
|
|
83
58
|
"lmdb": "python-lmdb",
|
|
84
59
|
"matplotlib": "matplotlib-base",
|
|
85
|
-
"md_toc": "md-toc",
|
|
86
|
-
"message_ix": "message-ix",
|
|
87
60
|
"msgpack": "msgpack-python",
|
|
88
61
|
"mss": "python-mss",
|
|
89
|
-
"nbconvert_utils": "nbconvert-utils",
|
|
90
|
-
"ndarray_listener": "ndarray-listener",
|
|
91
62
|
"neo": "python-neo",
|
|
92
63
|
"neo4j": "neo4j-python-driver",
|
|
93
|
-
"nest_asyncio": "nest-asyncio",
|
|
94
64
|
"node-semver": "python-node-semver",
|
|
95
65
|
"nvidia-ml-py3": "nvidia-ml",
|
|
96
66
|
"opencv-python": "opencv",
|
|
97
67
|
"opencv-python-headless": "opencv",
|
|
98
68
|
"ortools": "ortools-python",
|
|
99
69
|
"p-astro": "p_astro",
|
|
100
|
-
"pandas_flavor": "pandas-flavor",
|
|
101
70
|
"paragraph": "python-paragraph",
|
|
102
71
|
"prince": "prince-factor-analysis",
|
|
103
72
|
"pvlib": "pvlib-python",
|
|
104
73
|
"pyqt4": "pyqt",
|
|
105
74
|
"pyqt5": "pyqt",
|
|
106
|
-
"pytest_check_links": "pytest-check-links",
|
|
107
75
|
"python-datamatrix": "datamatrix",
|
|
108
76
|
"python-fileinspector": "fileinspector",
|
|
109
77
|
"python-opencv": "opencv",
|
|
@@ -113,16 +81,12 @@ PYPI_TO_CONDA = {
|
|
|
113
81
|
"python-qnotifications": "qnotifications",
|
|
114
82
|
"pywin32": "pywin32-on-windows",
|
|
115
83
|
"quantum-grove": "grove",
|
|
116
|
-
"radio_beam": "radio-beam",
|
|
117
84
|
"redis": "redis-py",
|
|
118
85
|
"rocketpyalpha": "rocketpy",
|
|
119
|
-
"
|
|
120
|
-
"
|
|
121
|
-
"sagemaker_mxnet_training": "sagemaker_mxnet_container",
|
|
122
|
-
"scikit-build": "scikit-build",
|
|
123
|
-
"scikit-learn": "scikit-learn",
|
|
124
|
-
"setuptools_scm": "setuptools-scm",
|
|
86
|
+
"sagemaker-inference": "sagemaker-inference-toolkit",
|
|
87
|
+
"sagemaker-mxnet-training": "sagemaker_mxnet_container",
|
|
125
88
|
"sounddevice": "python-sounddevice",
|
|
89
|
+
"soundfile": "pysoundfile",
|
|
126
90
|
"spherical-functions": "spherical_functions",
|
|
127
91
|
"sphinx-rtd-theme": "sphinx_rtd_theme",
|
|
128
92
|
"stjudecloud-oliver": "oliver",
|
|
@@ -133,54 +97,37 @@ PYPI_TO_CONDA = {
|
|
|
133
97
|
"termstyle": "python-termstyle",
|
|
134
98
|
"torch": "pytorch",
|
|
135
99
|
"torch-cluster": "pytorch_cluster",
|
|
100
|
+
"torch-geometric": "pytorch_geometric",
|
|
136
101
|
"torch-sparse": "pytorch_sparse",
|
|
137
|
-
"torch_geometric": "pytorch_geometric",
|
|
138
102
|
"trino": "trino-python-client",
|
|
139
|
-
"typing": "typing",
|
|
140
103
|
"typing-extensions": "typing_extensions",
|
|
141
|
-
"
|
|
104
|
+
"usedave": "dave",
|
|
142
105
|
"vsts": "vsts-python-api",
|
|
143
106
|
"xtb": "xtb-python",
|
|
144
107
|
"xxhash": "python-xxhash",
|
|
145
108
|
}
|
|
146
109
|
|
|
147
110
|
CONDA_TO_PYPI = {
|
|
148
|
-
"aiohttp-cors": "aiohttp_cors",
|
|
149
111
|
"arrakis-python": "arrakis",
|
|
150
112
|
"ascii-art": "art",
|
|
151
113
|
"bilby_pipe": "bilby-pipe",
|
|
152
|
-
"boruta_py": "
|
|
153
|
-
"click-config-file": "click_config_file",
|
|
114
|
+
"boruta_py": "boruta",
|
|
154
115
|
"cockroachdb-python": "cockroachdb",
|
|
155
|
-
"conda-lock": "conda_lock",
|
|
156
|
-
"conda-mirror": "conda_mirror",
|
|
157
|
-
"cryptography-vectors": "cryptography_vectors",
|
|
158
116
|
"cython-blis": "blis",
|
|
159
117
|
"dask-core": "dask",
|
|
160
|
-
"data-morph-ai": "data-morph-ai",
|
|
161
|
-
"dataclasses": "dataclasses",
|
|
162
118
|
"datadotworld-py": "datadotworld",
|
|
163
|
-
"datalad-container": "datalad_container",
|
|
164
119
|
"datamatrix": "python-datamatrix",
|
|
165
|
-
"dave": "
|
|
166
|
-
"delegator": "delegator
|
|
120
|
+
"dave": "usedave",
|
|
121
|
+
"delegator": "delegator-py",
|
|
167
122
|
"dftd3-python": "dftd3",
|
|
168
123
|
"dftd4-python": "dftd4",
|
|
169
|
-
"dials-data": "dials_data",
|
|
170
124
|
"docker-py": "docker",
|
|
171
|
-
"dye-score": "dye_score",
|
|
172
|
-
"empyrical-dist": "empyrical_dist",
|
|
173
|
-
"enum34": "enum34",
|
|
174
125
|
"esprima-python": "esprima",
|
|
175
|
-
"et-xmlfile": "et_xmlfile",
|
|
176
126
|
"evaml-core": "evalml",
|
|
177
|
-
"exceptiongroup": "exceptiongroup",
|
|
178
127
|
"fileinspector": "python-fileinspector",
|
|
179
|
-
"
|
|
180
|
-
"
|
|
181
|
-
"flask_json": "Flask-JSON",
|
|
128
|
+
"flask_cors": "flask-cors",
|
|
129
|
+
"flask_json": "flask-json",
|
|
182
130
|
"flex-swagger": "flex",
|
|
183
|
-
"flit-core": "flit_core",
|
|
184
131
|
"gnupg-py": "gnupg",
|
|
185
132
|
"google-cloud-bigquery-core": "google-cloud-bigquery",
|
|
186
133
|
"googlesearch": "google",
|
|
@@ -188,43 +135,28 @@ CONDA_TO_PYPI = {
|
|
|
188
135
|
"h2o-py": "h2o",
|
|
189
136
|
"h3-py": "h3",
|
|
190
137
|
"hjson-py": "hjson",
|
|
191
|
-
"
|
|
192
|
-
"ib-insync": "ib_insync",
|
|
193
|
-
"import_metadata": "import_metadata",
|
|
194
|
-
"importlib-metadata": "importlib_metadata",
|
|
138
|
+
"import_metadata": "import-metadata",
|
|
195
139
|
"intake-accumulo": "intake-astro",
|
|
196
|
-
"intake-geopandas": "intake_geopandas",
|
|
197
|
-
"ioos-tools": "ioos_tools",
|
|
198
|
-
"jupyter-jaeger": "jupyter_jaeger",
|
|
199
140
|
"jupyter_client": "jupyter-client",
|
|
200
|
-
"jupyterlab-git": "jupyterlab_git",
|
|
201
|
-
"jupyterlab-latex": "jupyterlab_latex",
|
|
202
141
|
"libnacl-python-bindings": "libnacl",
|
|
203
142
|
"matplotlib-base": "matplotlib",
|
|
204
|
-
"md-toc": "md_toc",
|
|
205
|
-
"message-ix": "message_ix",
|
|
206
143
|
"msg-extractor": "extract-msg",
|
|
207
144
|
"msgpack-python": "msgpack",
|
|
208
|
-
"nbconvert-utils": "nbconvert_utils",
|
|
209
|
-
"ndarray-listener": "ndarray_listener",
|
|
210
145
|
"neo4j-python-driver": "neo4j",
|
|
211
|
-
"nest-asyncio": "nest_asyncio",
|
|
212
146
|
"nvidia-ml": "nvidia-ml-py3",
|
|
213
147
|
"oliver": "stjudecloud-oliver",
|
|
214
148
|
"opencv": "python-opencv",
|
|
215
149
|
"ortools-python": "ortools",
|
|
216
150
|
"p_astro": "p-astro",
|
|
217
|
-
"pandas-flavor": "pandas_flavor",
|
|
218
151
|
"prince-factor-analysis": "prince",
|
|
219
152
|
"pseudorandom": "python-pseudorandom",
|
|
220
153
|
"pvcaptest": "captest",
|
|
221
154
|
"pvlib-python": "pvlib",
|
|
222
|
-
"py-bash-completion": "
|
|
155
|
+
"py-bash-completion": "bash-completion",
|
|
223
156
|
"pygaze": "python-pygaze",
|
|
224
157
|
"pyqt": "pyqt5",
|
|
225
|
-
"pysoundfile": "
|
|
158
|
+
"pysoundfile": "soundfile",
|
|
226
159
|
"pytables": "tables",
|
|
227
|
-
"pytest-check-links": "pytest_check_links",
|
|
228
160
|
"python-annoy": "annoy",
|
|
229
161
|
"python-asana": "asana",
|
|
230
162
|
"python-backtrace": "backtrace",
|
|
@@ -261,25 +193,19 @@ CONDA_TO_PYPI = {
|
|
|
261
193
|
"python-xxhash": "xxhash",
|
|
262
194
|
"pytorch": "torch",
|
|
263
195
|
"pytorch_cluster": "torch-cluster",
|
|
264
|
-
"pytorch_geometric": "
|
|
196
|
+
"pytorch_geometric": "torch-geometric",
|
|
265
197
|
"pytorch_sparse": "torch-sparse",
|
|
266
198
|
"pywin32-on-windows": "pywin32",
|
|
267
199
|
"qdatamatrix": "python-qdatamatrix",
|
|
268
200
|
"qnotifications": "python-qnotifications",
|
|
269
|
-
"radio-beam": "radio_beam",
|
|
270
201
|
"redis-py": "redis",
|
|
271
202
|
"rocketpy": "rocketpyalpha",
|
|
272
|
-
"
|
|
273
|
-
"
|
|
274
|
-
"sagemaker_mxnet_container": "sagemaker_mxnet_training",
|
|
275
|
-
"scikit-build": "scikit-build",
|
|
276
|
-
"scikit-learn": "scikit-learn",
|
|
277
|
-
"setuptools-scm": "setuptools_scm",
|
|
203
|
+
"sagemaker-inference-toolkit": "sagemaker-inference",
|
|
204
|
+
"sagemaker_mxnet_container": "sagemaker-mxnet-training",
|
|
278
205
|
"spherical_functions": "spherical-functions",
|
|
279
206
|
"sphinx_rtd_theme": "sphinx-rtd-theme",
|
|
280
207
|
"tblite-python": "tblite",
|
|
281
208
|
"trino-python-client": "trino",
|
|
282
|
-
"typing": "typing",
|
|
283
209
|
"typing_extensions": "typing-extensions",
|
|
284
210
|
"vsts-python-api": "vsts",
|
|
285
211
|
"xtb-python": "xtb",
|
coiled/software_utils.py
CHANGED
|
@@ -572,6 +572,9 @@ def get_mamba_auth_dict(home_dir: Path | None = None) -> dict[str, tuple[str, st
|
|
|
572
572
|
if auth_file.exists():
|
|
573
573
|
with auth_file.open("r") as f:
|
|
574
574
|
auth_data = json.load(f)
|
|
575
|
+
if not isinstance(auth_data, dict):
|
|
576
|
+
logger.debug(f"Mamba auth file {auth_file} does not contain a dictionary at top level")
|
|
577
|
+
return domain_auth
|
|
575
578
|
for domain, auth in auth_data.items():
|
|
576
579
|
auth_type = auth.get("type")
|
|
577
580
|
if auth_type == "CondaToken":
|
|
@@ -634,6 +637,9 @@ def get_rattler_auth_dict(home_dir: Path | None = None) -> dict[str, tuple[str,
|
|
|
634
637
|
if auth_file.exists():
|
|
635
638
|
with auth_file.open("r") as f:
|
|
636
639
|
auth_data = json.load(f)
|
|
640
|
+
if not isinstance(auth_data, dict):
|
|
641
|
+
logger.debug(f"Rattler auth file {auth_file} does not contain a dictionary at top level")
|
|
642
|
+
return domain_auth
|
|
637
643
|
for domain, auth in auth_data.items():
|
|
638
644
|
parsed_auth = _parse_rattler_auth_data(auth)
|
|
639
645
|
if parsed_auth:
|
|
@@ -880,8 +886,8 @@ def set_auth_for_url(url: Url | str) -> str:
|
|
|
880
886
|
or (get_conda_auth(no_auth_url) if use_conda_auth else None)
|
|
881
887
|
# mamba could have URL stored by netloc/path or netloc
|
|
882
888
|
or ((get_mamba_auth(f"{netloc}{path}") or get_mamba_auth(netloc)) if use_mamba_auth else None)
|
|
883
|
-
# rattler/pixi
|
|
884
|
-
or (get_rattler_auth(netloc) if use_rattler_auth else None)
|
|
889
|
+
# rattler/pixi could store netloc or *.netloc in keyring or a fallback file
|
|
890
|
+
or ((get_rattler_auth(netloc) or get_rattler_auth(f"*.{netloc}")) if use_rattler_auth else None)
|
|
885
891
|
)
|
|
886
892
|
if auth_parts is not None:
|
|
887
893
|
username, password = auth_parts
|
coiled/v2/cluster.py
CHANGED
|
@@ -3,23 +3,23 @@ coiled/__main__.py,sha256=4XILBmm4ChZYo7h3JzgslFU0tjQVzdX0XtYcQLhCv0w,171
|
|
|
3
3
|
coiled/analytics.py,sha256=96CeL8KVnm3-76lvT4fNkgML0lHebaLea-YP3wW-KqM,7486
|
|
4
4
|
coiled/auth.py,sha256=go7vWtCwBbwtWyNrNBxg28xBrdjrETbE-mn3KaN5Yl8,1867
|
|
5
5
|
coiled/batch.py,sha256=QH-BMlMKkjdToPbw6q0I1W1TTJIDHu24B363mUGDL2c,7102
|
|
6
|
-
coiled/capture_environment.py,sha256=
|
|
6
|
+
coiled/capture_environment.py,sha256=YYNk_T4xOcw8vmFIOcy19d5-ptDvoes3RWa7fRy0sB4,17750
|
|
7
7
|
coiled/cluster.py,sha256=wwK9-SefbFBUEHJjYHXlWN3YvPcvR6XD2J-RdPCGhgc,5049
|
|
8
8
|
coiled/coiled.yaml,sha256=z70xzNUy0E8b8Yt12tYYmjJDDmp-U63oUD61ccuu5N0,1037
|
|
9
9
|
coiled/compatibility.py,sha256=pZAPgTnqPaPpuZ6ZmCXgm0TJNenZPLBnIq4CaohwMY4,762
|
|
10
10
|
coiled/config.py,sha256=O_dIj_PJ5qIA3MGJZRvqli4ztE3oLZQ-3xnhJlAD-Ts,196
|
|
11
|
-
coiled/context.py,sha256=
|
|
11
|
+
coiled/context.py,sha256=BKJ26u-eNpe1dVDL69Q4ZJAkPzptNKRuQ94ZciT-PAY,4754
|
|
12
12
|
coiled/core.py,sha256=Cu6hKBXRWSztbpF8huAyU_1glnt1gacnO9vExvG-Cwo,110796
|
|
13
13
|
coiled/errors.py,sha256=5aXhNXgidMm0VgPYT3MZMwlHhRE57MeSmqAJFHYaa8Y,305
|
|
14
14
|
coiled/exceptions.py,sha256=jUXgmfO0LitGe8ztSmAlzb9eQV3X5c0kNO2BwtEDTYg,3099
|
|
15
|
-
coiled/filestore.py,sha256=
|
|
15
|
+
coiled/filestore.py,sha256=39WJu-6vtjK2IA5Z9xMm5fuCzdk-_6R-iW2WhMVOlMk,17975
|
|
16
16
|
coiled/function.py,sha256=pONtcTUDRr0dykhVV73AWXqU_pb-4-lvOA0tR3i_PlA,21654
|
|
17
17
|
coiled/plugins.py,sha256=w03H2Sck54QmwrVOM1BVscNiVeQsHyGm1yWNzPPPWKs,3424
|
|
18
18
|
coiled/prefect.py,sha256=j1EOg7Xuw82TNRonAGEoZ3ANlwN8GM5aDXRYSjC0lnA,1497
|
|
19
|
-
coiled/pypi_conda_map.py,sha256=
|
|
19
|
+
coiled/pypi_conda_map.py,sha256=4HBqiqd4xVwe7W2zOuxV8StJqLh5WiMnVTtdk2rnBZA,7153
|
|
20
20
|
coiled/scan.py,sha256=ghAo7TKAG7E013HJpYWbic-Kp_UUf8iu533GaBpYnS8,25760
|
|
21
21
|
coiled/software.py,sha256=eh3kZ8QBuIt_SPvTy_x6TXEv87SGqOJkO4HW-LCSsas,8701
|
|
22
|
-
coiled/software_utils.py,sha256=
|
|
22
|
+
coiled/software_utils.py,sha256=zXqhIopDtB-xp_eJJje1W9nfXjqmvVPMIfQUs1XSu0I,40783
|
|
23
23
|
coiled/spans.py,sha256=Aq2MOX6JXaJ72XiEmymPcsefs-kID85MEw6t-kOdPWI,2078
|
|
24
24
|
coiled/spark.py,sha256=kooZCZT4dLMG_AQEOlaf6gj86G3UdowDfbw-Eiq94MU,9059
|
|
25
25
|
coiled/types.py,sha256=xJh5t_Kk7S-LeZnZ5C4oTtl1_el3mZuQeITz1QfPHjA,14619
|
|
@@ -75,7 +75,7 @@ coiled/cli/notebook/notebook.py,sha256=i_XD03RK2cYeYn_TVl20Uv-kJ_2x-0Oe5iRUTm6w1
|
|
|
75
75
|
coiled/cli/setup/__init__.py,sha256=BiGnIH9vXGhCFOEPuSUkitcrwAA97wTsfcwMXC0DkYg,837
|
|
76
76
|
coiled/cli/setup/amp.py,sha256=_zlZtqsd_LkSF5C_G8qDm0To-t30C0Z6XKMdDzrm7qg,5039
|
|
77
77
|
coiled/cli/setup/aws.py,sha256=MS4Au1AGoALeVO_VuTdq_RRzL3JzOGgpTgcM69avXU0,65885
|
|
78
|
-
coiled/cli/setup/azure.py,sha256=
|
|
78
|
+
coiled/cli/setup/azure.py,sha256=TPYs1LPMf7MvUP9n2KiCLICVwspH-mxusMH-kVEjJoM,26739
|
|
79
79
|
coiled/cli/setup/entry.py,sha256=2PKtvH_ARWt5c5qjeb7dfmJOcFTqRGoskPidNoQTiOg,2425
|
|
80
80
|
coiled/cli/setup/gcp.py,sha256=i67kFRJJpDORrqkVfDu1jFseN80iDbKe1vswk6jxRI8,38817
|
|
81
81
|
coiled/cli/setup/prometheus.py,sha256=ZW16-vFhdYkbbVWqO-jiY2GtpD-EREEa7bm4S8TTg1k,2256
|
|
@@ -88,7 +88,7 @@ coiled/extensions/prefect/__init__.py,sha256=cZp1mqX29FrnINoQsuH6pz4z4uuOACs0mgi
|
|
|
88
88
|
coiled/extensions/prefect/runners.py,sha256=AcaGS1637TnqFPKnjmmLHpdzjwAsxBLDKrOF7OpfEwM,987
|
|
89
89
|
coiled/extensions/prefect/workers.py,sha256=Z2VuAhTm5AjWEKyCniMZrTxqtkn3uJp3sO3bFeR2Rr0,1642
|
|
90
90
|
coiled/v2/__init__.py,sha256=KaCULaAqatcsYbTbj_SQtTLocbSKZa-uQXiyCICKFRM,805
|
|
91
|
-
coiled/v2/cluster.py,sha256=
|
|
91
|
+
coiled/v2/cluster.py,sha256=5-dq9Vfs7R28MEzeZW4nNxmhlNLvASDQXNglKFVtkF4,148111
|
|
92
92
|
coiled/v2/cluster_comms.py,sha256=UcJWLeZlc68S0uaNd9lLKbF5uaDhYqqkdTsA0CBXYRI,2643
|
|
93
93
|
coiled/v2/core.py,sha256=Bf5A_rzK3tuUqqMVAgN5vix-tX_F8AEWR2pICnG3YcA,71615
|
|
94
94
|
coiled/v2/cwi_log_link.py,sha256=d4k6wRYhcdDVdhWYZIX6WL1g0lscXY0yq__H1sPUNWk,1883
|
|
@@ -97,8 +97,8 @@ coiled/v2/widgets/__init__.py,sha256=Bt3GHTTyri-kFUaqGRVydDM-sCg5NdNujDg2RyvgV8U
|
|
|
97
97
|
coiled/v2/widgets/interface.py,sha256=YeMQ5qdRbbpM04x9qIg2LE1xwxyRxFbdDYnkrwHazPk,301
|
|
98
98
|
coiled/v2/widgets/rich.py,sha256=3rU5-yso92NdeEh3uSvEE-GwPNyp6i0Nb5PE5czXCik,28974
|
|
99
99
|
coiled/v2/widgets/util.py,sha256=Y8qpGqwNzqfCzgyRFRy7vcscBoXqop-Upi4HLPpXLgg,3120
|
|
100
|
-
coiled-1.
|
|
101
|
-
coiled-1.
|
|
102
|
-
coiled-1.
|
|
103
|
-
coiled-1.
|
|
104
|
-
coiled-1.
|
|
100
|
+
coiled-1.129.5.dev7.dist-info/METADATA,sha256=JPyDWkopi4Uv6B-VYE1zBszkd_P4CBhRLxN7TRTLNB0,2181
|
|
101
|
+
coiled-1.129.5.dev7.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
|
|
102
|
+
coiled-1.129.5.dev7.dist-info/entry_points.txt,sha256=C8dz1ST_bTlTO-kNvuHBJQma9PyJPotg0S4xpPt5aHY,47
|
|
103
|
+
coiled-1.129.5.dev7.dist-info/licenses/LICENSE,sha256=ZPwVR73Biwm3sK6vR54djCrhaRiM4cAD2zvOQZV8Xis,3859
|
|
104
|
+
coiled-1.129.5.dev7.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|