Skip to content

Commit

Permalink
Fix conda/pip qt5 conflict (#176)
Browse files Browse the repository at this point in the history
* Fix conda/pip qt5 conflict

* adding qtpy
  • Loading branch information
JoOkuma authored Dec 30, 2024
1 parent fac5514 commit d116ea9
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ dependencies = [
"pydantic >= 2",
"pydot >= 2.0.0",
"qtawesome >= 1.3.1",
"qtpy",
"rich >=13.3.5",
"scikit-image >=0.21.0",
"seaborn >=0.13.0",
Expand All @@ -46,7 +47,6 @@ dependencies = [
"websocket >= 0.2.1",
"websockets >= 12.0",
"zarr >=2.15.0,<3.0.0",
"pyqt5 >=5.15.4",
]

[project.optional-dependencies]
Expand All @@ -69,6 +69,7 @@ test = [
"pytest-qt >=4.2.0",
"pytrackmate @ git+https://github.com/hadim/pytrackmate.git",
"napari[testing] > 0.4.18",
"pyqt5 >=5.15.4",
]

[project.scripts]
Expand Down Expand Up @@ -104,6 +105,7 @@ psygnal = ">=0.9.0"
pydantic = ">=2"
pydot = ">= 2.0.0"
qtawesome = ">= 1.3.1"
qtpy = "*"
rich = ">=13.3.5"
scikit-image = ">=0.21.0"
seaborn = ">=0.13.0"
Expand All @@ -115,7 +117,6 @@ uvicorn = ">= 0.27.0.post1"
websocket = ">= 0.2.1"
websockets = ">= 12.0"
zarr = ">=2.15.0,<3.0.0"
pyqt = ">=5.15.4"

[tool.pixi.feature.cuda]
channels = ["conda-forge", "rapidsai"]
Expand Down

0 comments on commit d116ea9

Please sign in to comment.