Skip to content

Commit 6310613

Browse files
committed
chore: upgrade deps + uv
1 parent d7bd407 commit 6310613

File tree

3 files changed

+1980
-1227
lines changed

3 files changed

+1980
-1227
lines changed

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
rye 0.35.0
1+
uv latest

pyproject.toml

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -7,57 +7,61 @@ authors = [
77
{ name = "Nick Wall", email = "46641379+walln@users.noreply.github.com" },
88
]
99
dependencies = [
10-
"flax>=0.8.4",
11-
"torch>=2.2.2",
10+
"flax>=0.9.1",
11+
"torch>=2.5.1",
1212
"loguru>=0.7.2",
13-
"matplotlib>=3.8.4",
14-
"scikit-learn>=1.4.1.post1",
13+
"matplotlib>=3.9.2",
14+
"scikit-learn>=1.5.2",
1515
"numpy>=1.26.4",
16-
"optax>=0.2.2",
17-
"tqdm>=4.66.2",
18-
"equinox>=0.11.3",
16+
"optax>=0.2.5",
17+
"tqdm>=4.66.6",
18+
"equinox>=0.11.9",
1919
"orbax>=0.1.9",
20-
"wandb>=0.17.2",
21-
"jax-metrics>=0.2.4",
22-
"typer>=0.12.2",
23-
"jaxlib @ https://storage.googleapis.com/jax-releases/cuda12/jaxlib-0.4.26+cuda12.cudnn89-cp312-cp312-manylinux2014_x86_64.whl",
24-
"jax[cuda12_pip]>=0.4.26",
20+
"wandb>=0.18.7",
21+
"jax-metrics>=0.2.5",
22+
"typer>=0.15.1",
23+
"jax>=0.4.35",
24+
"jaxlib>=0.4.35",
2525
"jmp>=0.0.4",
26-
"datasets>=3.0.1",
27-
"torchvision>=0.18.1",
28-
"transformers>=4.42.3",
26+
"datasets>=3.1.0",
27+
"torchvision>=0.20.1",
28+
"transformers>=4.46.3",
2929
]
3030
license = "MIT"
3131
readme = "README.md"
3232
requires-python = ">= 3.12"
3333

34+
[dependency-groups]
35+
cuda = ["jax[cuda12]>=0.4.35"]
36+
metal = ["jax-metal>=0.1.0"]
37+
cpu = ["jax[cpu]>=0.4.35"]
38+
dev = [
39+
"pytest>=8.3.4",
40+
"pre-commit>=4.0.1",
41+
"nvitop>=1.3.2",
42+
"ipykernel>=6.29.5",
43+
"jupyter>=1.1.1",
44+
"ruff>=0.8.4",
45+
]
46+
47+
[tool.uv]
48+
default-groups = ["dev", "cpu"]
49+
conflicts = [[{ group = "cuda" }, { group = "metal" }]]
3450

3551
[build-system]
3652
requires = ["hatchling"]
3753
build-backend = "hatchling.build"
3854

39-
[tool.uv]
40-
managed = true
41-
dev-dependencies = [
42-
"pytest>=8.1.1",
43-
"pre-commit>=3.7.0",
44-
"nvitop>=1.3.2",
45-
"ipykernel>=6.29.4",
46-
"jupyter>=1.0.0",
47-
"ruff>=0.4.10",
48-
]
49-
5055
[tool.hatch.metadata]
5156
allow-direct-references = true
5257

5358
[tool.hatch.build.targets.wheel]
5459
packages = ["src/scratch"]
5560

5661
[tool.ruff]
62+
target-version = "py312"
5763
include = ["src/**", "tests/**"]
58-
59-
[tool.ruff.lint]
60-
pydocstyle.convention = "google"
64+
line-length = 88
6165
select = [
6266
"E", # pycodestyle
6367
"W", # pycodestyle
@@ -67,17 +71,18 @@ select = [
6771
"D", # pydocstyle
6872
"I", # isort
6973
"SIM", # flake8-simplify
70-
"TCH", # flake8-type-checking
7174
"TID", # flake8-tidy-imports
7275
"UP", # pyupgrade
7376
"PT", # flake8-pytest-style
7477
"RUF", # Ruff-specific rules
7578
"FBT001", # flake8-boolean-trap
7679
]
77-
7880
ignore = ["F722"]
7981

80-
[tool.ruff.lint.isort]
82+
[tool.ruff.pydocstyle]
83+
convention = "google"
84+
85+
[tool.ruff.isort]
8186
known-first-party = ["src"]
8287

8388
[tool.pytest.ini_options]
@@ -86,8 +91,3 @@ filterwarnings = [
8691
'ignore:co_lnotab is deprecated, use co_lines instead.',
8792
'ignore:To copy construct from a tensor, it is recommended to use sourceTensor\.clone\(\)\.detach\(\) or sourceTensor\.clone\(\)\.detach\(\)\.requires_grad_\(True\):UserWarning',
8893
]
89-
90-
91-
[tool.mypy]
92-
ignore_missing_imports = true
93-
strict = false

0 commit comments

Comments
 (0)