Skip to content

Commit 40fa4a9

Browse files
committed
šŸ› fix(packaging): resolve uv sync extra conflicts and align python support (#1325)
1 parent dd10a63 commit 40fa4a9

8 files changed

Lines changed: 36 additions & 22 deletions

File tree

ā€Ž.gitignoreā€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,4 +181,4 @@ pnnx*
181181
*.rknn
182182

183183
# calibration image
184-
calibration_*.npy!packaging/pyinstaller/specs/*.spec
184+
calibration_*.npy

ā€ŽREADME.mdā€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<a href="./LICENSE"><img src="https://img.shields.io/badge/License-LGPL%20v3-blue.svg"></a>
1313
<a href=""><img src="https://img.shields.io/github/v/release/CVHub520/X-AnyLabeling?color=ffa"></a>
1414
<a href=""><img src="https://img.shields.io/pypi/v/x-anylabeling-cvhub?logo=pypi&logoColor=white"></a>
15-
<a href=""><img src="https://img.shields.io/badge/python-3.10+-aff.svg"></a>
15+
<a href=""><img src="https://img.shields.io/badge/python-3.11+-aff.svg"></a>
1616
<a href=""><img src="https://img.shields.io/badge/os-linux%2C%20win%2C%20mac-pink.svg"></a>
1717
<a href=""><img src="https://img.shields.io/github/downloads/CVHub520/X-AnyLabeling/total?label=downloads"></a>
1818
<a href="https://modelscope.cn/collections/X-AnyLabeling-7b0e1798bcda43"><img src="https://img.shields.io/badge/modelscope-X--AnyLabeling-6750FF?link=https%3A%2F%2Fmodelscope.cn%2Fcollections%2FX-AnyLabeling-7b0e1798bcda43"></a>

ā€ŽREADME_zh-CN.mdā€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<p align="center">
1212
<a href="./LICENSE"><img src="https://img.shields.io/badge/License-LGPL%20v3-blue.svg"></a>
1313
<a href=""><img src="https://img.shields.io/github/v/release/CVHub520/X-AnyLabeling?color=ffa"></a>
14-
<a href=""><img src="https://img.shields.io/badge/python-3.10+-aff.svg"></a>
14+
<a href=""><img src="https://img.shields.io/badge/python-3.11+-aff.svg"></a>
1515
<a href=""><img src="https://img.shields.io/badge/os-linux%2C%20win%2C%20mac-pink.svg"></a>
1616
<a href=""><img src="https://img.shields.io/github/downloads/CVHub520/X-AnyLabeling/total?label=downloads"></a>
1717
<a href="https://modelscope.cn/collections/X-AnyLabeling-7b0e1798bcda43"><img src="https://img.shields.io/badge/modelscope-X--AnyLabeling-6750FF?link=https%3A%2F%2Fmodelscope.cn%2Fcollections%2FX-AnyLabeling-7b0e1798bcda43"></a>

ā€Ždocs/en/cli.mdā€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ System
124124
Disk: 841.6/1006.9 GB
125125
GPU: CUDA:0 (NVIDIA GeForce RTX 3060, 12288MiB)
126126
CUDA: V11.6.124
127-
Python Version: 3.10.10
127+
Python Version: 3.12.10
128128
────────────────────────────────────────────────────────────
129129
Packages
130130
────────────────────────────────────────────────────────────

ā€Ždocs/en/get_started.mdā€Ž

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@ If you are already using Miniconda, follow these steps:
2323

2424
**Step 0.** Download and install Miniconda from the [official website](https://docs.anaconda.com/miniconda/).
2525

26-
**Step 1.** Create a conda environment with Python 3.10 ~ 3.13 (Python 3.12 is recommended) and activate it.
26+
**Step 1.** Create a conda environment with Python 3.11 ~ 3.13 (Python 3.12 is recommended) and activate it.
2727

2828
> [!NOTE]
2929
> Other Python versions require compatibility verification on your own.
3030
3131
```bash
3232
# CPU Environment [Windows/Linux/macOS]
33-
conda create --name x-anylabeling-cpu python=3.10 -y
33+
conda create --name x-anylabeling-cpu python=3.12 -y
3434
conda activate x-anylabeling-cpu
3535

3636
# CUDA 11.x Environment [Windows/Linux]
37-
conda create --name x-anylabeling-cu11 python=3.11 -y
37+
conda create --name x-anylabeling-cu11 python=3.12 -y
3838
conda activate x-anylabeling-cu11
3939

4040
# CUDA 12.x Environment [Windows/Linux]
@@ -48,7 +48,7 @@ You can also use Python's built-in `venv` module to create virtual environments:
4848

4949
```bash
5050
# CPU [Windows/Linux/macOS]
51-
python3.10 -m venv venv-cpu
51+
python3.12 -m venv venv-cpu
5252
source venv-cpu/bin/activate # Linux/macOS
5353
# venv-cpu\Scripts\activate # Windows
5454

@@ -58,7 +58,7 @@ source venv-cu12/bin/activate # Linux
5858
# venv-cu12\Scripts\activate # Windows
5959

6060
# CUDA 11.x [Windows/Linux]
61-
python3.11 -m venv venv-cu11
61+
python3.12 -m venv venv-cu11
6262
source venv-cu11/bin/activate # Linux
6363
# venv-cu11\Scripts\activate # Windows
6464
```
@@ -79,7 +79,7 @@ powershell -c "irm https://astral.sh/uv/install.ps1 | iex"
7979

8080
```bash
8181
# CPU Environment [Windows/Linux/macOS]
82-
uv venv --python 3.10 .venv-cpu
82+
uv venv --python 3.12 .venv-cpu
8383
source .venv-cpu/bin/activate # Linux/macOS/WSL2
8484
# .venv-cpu\Scripts\activate # Windows
8585

@@ -89,7 +89,7 @@ source .venv-cu12/bin/activate # Linux
8989
# .venv-cu12\Scripts\activate # Windows
9090

9191
# CUDA 11.x Environment [Windows/Linux]
92-
uv venv --python 3.11 .venv-cu11
92+
uv venv --python 3.12 .venv-cu11
9393
source .venv-cu11/bin/activate # Linux
9494
# .venv-cu11\Scripts\activate # Windows
9595
```

ā€Ždocs/zh_cn/cli.mdā€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ System
124124
Disk: 841.6/1006.9 GB
125125
GPU: CUDA:0 (NVIDIA GeForce RTX 3060, 12288MiB)
126126
CUDA: V11.6.124
127-
Python Version: 3.10.10
127+
Python Version: 3.12.10
128128
────────────────────────────────────────────────────────────
129129
Packages
130130
────────────────────────────────────────────────────────────

ā€Ždocs/zh_cn/get_started.mdā€Ž

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@ X-AnyLabeling ęä¾›äŗ†å¤šē§å®‰č£…ę–¹ę³•ļ¼Œę‚ØåÆä»„é€ščæ‡ `pip` ē›“ęŽ„å®‰č£…
2323

2424
**ę­„éŖ¤ 0.** 从 [å®˜ę–¹ē½‘ē«™](https://docs.anaconda.com/miniconda/) 下载并安装 Miniconda怂
2525

26-
**ę­„éŖ¤ 1.** åˆ›å»ŗäø€äøŖ Python 3.10 ~ 3.13 ē‰ˆęœ¬ēš„ conda ēŽÆå¢ƒļ¼ˆęŽØč Python 3.12ļ¼‰ļ¼Œå¹¶ęæ€ę“»å®ƒć€‚
26+
**ę­„éŖ¤ 1.** åˆ›å»ŗäø€äøŖ Python 3.11 ~ 3.13 ē‰ˆęœ¬ēš„ conda ēŽÆå¢ƒļ¼ˆęŽØč Python 3.12ļ¼‰ļ¼Œå¹¶ęæ€ę“»å®ƒć€‚
2727

2828
> [!NOTE]
2929
> 其他 Python ē‰ˆęœ¬éœ€č¦č‡Ŗč”ŒéŖŒčÆå…¼å®¹ę€§ć€‚
3030
3131
```bash
3232
# CPU ēŽÆå¢ƒ [Windows/Linux/macOS]
33-
conda create --name x-anylabeling-cpu python=3.10 -y
33+
conda create --name x-anylabeling-cpu python=3.12 -y
3434
conda activate x-anylabeling-cpu
3535

3636
# CUDA 11.x ēŽÆå¢ƒ [Windows/Linux]
37-
conda create --name x-anylabeling-cu11 python=3.11 -y
37+
conda create --name x-anylabeling-cu11 python=3.12 -y
3838
conda activate x-anylabeling-cu11
3939

4040
# CUDA 12.x ēŽÆå¢ƒ [Windows/Linux]
@@ -48,7 +48,7 @@ conda activate x-anylabeling-cu12
4848

4949
```bash
5050
# CPU [Windows/Linux/macOS]
51-
python3.10 -m venv venv-cpu
51+
python3.12 -m venv venv-cpu
5252
source venv-cpu/bin/activate # Linux/macOS
5353
# venv-cpu\Scripts\activate # Windows
5454

@@ -58,7 +58,7 @@ source venv-cu12/bin/activate # Linux
5858
# venv-cu12\Scripts\activate # Windows
5959

6060
# CUDA 11.x [Windows/Linux]
61-
python3.11 -m venv venv-cu11
61+
python3.12 -m venv venv-cu11
6262
source venv-cu11/bin/activate # Linux
6363
# venv-cu11\Scripts\activate # Windows
6464
```
@@ -79,7 +79,7 @@ powershell -c "irm https://astral.sh/uv/install.ps1 | iex"
7979

8080
```bash
8181
# CPU ēŽÆå¢ƒ [Windows/Linux/macOS]
82-
uv venv --python 3.10 .venv-cpu
82+
uv venv --python 3.12 .venv-cpu
8383
source .venv-cpu/bin/activate # Linux/macOS/WSL2
8484
# .venv-cpu\Scripts\activate # Windows
8585

@@ -89,7 +89,7 @@ source .venv-cu12/bin/activate # Linux
8989
# .venv-cu12\Scripts\activate # Windows
9090

9191
# CUDA 11.x ēŽÆå¢ƒ [Windows/Linux]
92-
uv venv --python 3.11 .venv-cu11
92+
uv venv --python 3.12 .venv-cu11
9393
source .venv-cu11/bin/activate # Linux
9494
# .venv-cu11\Scripts\activate # Windows
9595
```

ā€Žpyproject.tomlā€Ž

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ name = "x-anylabeling-cvhub"
3333
dynamic = ["version"]
3434
description = "Advanced Auto Labeling Solution with Added Features"
3535
readme = "README.md"
36-
requires-python = ">=3.10"
36+
requires-python = ">=3.11"
3737
license = { "text" = "GPLv3" }
3838
keywords = ["machine-learning", "deep-learning", "computer-vision", "multi-modal", "auto-labeling", "image-annotation", "AI", "LLM", "VLM", "YOLO", "SAM", "CLIP", "Grounding-DINO", "X-AnyLabeling"]
3939
authors = [
@@ -49,7 +49,6 @@ classifiers = [
4949
"Intended Audience :: Science/Research",
5050
"License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
5151
"Programming Language :: Python :: 3",
52-
"Programming Language :: Python :: 3.10",
5352
"Programming Language :: Python :: 3.11",
5453
"Programming Language :: Python :: 3.12",
5554
"Programming Language :: Python :: 3.13",
@@ -75,7 +74,6 @@ dependencies = [
7574
"lapx>=0.5.5",
7675
"tqdm>=4.64.0",
7776
"scipy>=1.4.1",
78-
"ml_dtypes>=0.5.0",
7977
"PyYAML",
8078
"importlib_metadata",
8179
"json_repair",
@@ -134,6 +132,22 @@ gpu-cu11 = [
134132
[project.scripts]
135133
xanylabeling = "anylabeling.app:main"
136134

135+
[tool.uv]
136+
conflicts = [
137+
[
138+
{ extra = "cpu" },
139+
{ extra = "gpu" },
140+
],
141+
[
142+
{ extra = "cpu" },
143+
{ extra = "gpu-cu11" },
144+
],
145+
[
146+
{ extra = "gpu" },
147+
{ extra = "gpu-cu11" },
148+
],
149+
]
150+
137151
# Tools settings -------------------------------------------------------------------------------------------------------
138152
[tool.setuptools] # configuration specific to the `setuptools` build backend.
139153
packages = { find = { where = ["."], include = ["anylabeling*"], exclude = ["resources*"] } }

0 commit comments

Comments
Ā (0)