Skip to content

Commit

Permalink
create a uv workspace
Browse files Browse the repository at this point in the history
  • Loading branch information
jplumail committed Sep 3, 2024
1 parent f9ed1ad commit ed236a7
Show file tree
Hide file tree
Showing 9 changed files with 495 additions and 83 deletions.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ This is the main repository of the `spfluo-app`.

`spfluo-app` is built on top of a fork [Scipion](https://scipion.i2pc.es/), so that it runs on Windows.

nvidia gpu compatibility: https://docs.nvidia.com/deploy/cuda-compatibility/#cuda-11-and-later-defaults-to-minor-version-compatibility
## Install

## Run
Go to `spfluo-app` [installation page](https://spfluo.icube.unistra.fr/en/usage/installation.html) and follow the instructions.

## Install for developement

Run with uv:
```sh
Expand Down
20 changes: 10 additions & 10 deletions packages/napari-bbox/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,6 @@ dependencies = [
"Source Code" = "https://github.com/bauerdavid/napari-bbox"
"User Support" = "https://github.com/bauerdavid/napari-bbox/issues"

[project.optional-dependencies]
testing = [
"tox",
"pytest",
"pytest-cov",
"pytest-qt",
"napari",
"pyqt5",
]

[tool.setuptools]
package-dir = {"" = "src"}
include-package-data = true
Expand All @@ -70,3 +60,13 @@ line-length = 79
[tool.isort]
profile = "black"
line_length = 79

[tool.uv]
dev-dependencies = [
"tox",
"pytest",
"pytest-cov",
"pytest-qt",
"napari",
"pyqt5",
]
20 changes: 10 additions & 10 deletions packages/napari-spfluo/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,6 @@ dependencies = [
"spfluo[ab-initio-reconstruction]",
]

[project.optional-dependencies]
testing = [
"napari",
"pyqt5",
"pytest",
"pytest-cov",
"pytest-qt",
]

[project.entry-points."napari.manifest"]
napari-spfluo = "napari_spfluo:napari.yaml"

Expand All @@ -58,5 +49,14 @@ Homepage = "https://github.com/jplumail/napari-spfluo"
line-length = 79
target-version = ['py39', 'py310', 'py311']

[tool.uv]
dev-dependencies = [
"napari",
"pyqt5",
"pytest",
"pytest-cov",
"pytest-qt",
]

[tool.uv.sources]
spfluo = {path = "../spfluo"}
spfluo = {workspace = true}
2 changes: 1 addition & 1 deletion packages/scipion-app/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ guiplugin = "scipion.guiplugin"
"scipion" = ["templates/*.template", "templates/*.json"]

[tool.uv.sources]
scipion-fluo = {path = "../scipion-fluo"}
scipion-fluo = {workspace = true}
8 changes: 4 additions & 4 deletions packages/scipion-fluo-singleparticle/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Repository = "https://github.com/jplumail/scipion-fluo-singleparticle"
singleparticle = "singleparticle"

[tool.uv.sources]
scipion-pyworkflow = {path="../scipion-pyworkflow"}
scipion-fluo = {path="../scipion-fluo"}
spfluo = {path="../spfluo"}
napari-spfluo = {path="../napari-spfluo"}
scipion-pyworkflow = {workspace=true}
scipion-fluo = {workspace=true}
spfluo = {workspace=true}
napari-spfluo = {workspace=true}
2 changes: 1 addition & 1 deletion packages/scipion-fluo/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ scipion-fluo = "pwfluo.__main__:main"
pwfluo = "pwfluo"

[tool.uv.sources]
scipion-pyworkflow = {path = "../scipion-pyworkflow"}
scipion-pyworkflow = {workspace = true}
24 changes: 14 additions & 10 deletions packages/spfluo/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,6 @@ classifiers = [
]

[project.optional-dependencies]
dev = [
"pytest",
"pytest-mock",
"hypothesis",
"pyfigtree",
"scikit-image[data]",
"pytest-qt",
]
array-api-strict = ["array-api-strict"]
manual-picking = [
"spfluo[visualisation]"
]
Expand Down Expand Up @@ -72,5 +63,18 @@ markers = [
"slow: marks tests as slow (deselect with '-m \"not slow\"')",
]

[tool.uv]
dev-dependencies = [
"pytest",
"pytest-mock",
"hypothesis",
"pyfigtree",
"scikit-image[data]",
"pytest-qt",
"pyqt5",
"array-api-strict",
"spfluo[all]",
]

[tool.uv.sources]
napari-bbox = {path = "../napari-bbox"}
napari-bbox = {workspace = true}
9 changes: 6 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ source = "vcs"
packages = ["src/spfluo_app"]

[tool.uv.sources]
scipion-fluo-singleparticle = { path = "packages/scipion-fluo-singleparticle" }
scipion-app = { path = "packages/scipion-app" }
spfluo = { path = "packages/spfluo" }
scipion-fluo-singleparticle = { workspace = true }
scipion-app = { workspace = true }
spfluo = { workspace = true }

[tool.uv.workspace]
members = ["packages/*"]
487 changes: 445 additions & 42 deletions uv.lock

Large diffs are not rendered by default.

0 comments on commit ed236a7

Please sign in to comment.