Skip to content

Commit

Permalink
Merge pull request #10 from nfdi4health/fix/ci
Browse files Browse the repository at this point in the history
Fix a wrong path in the workflow definition
  • Loading branch information
mlentzen authored Jul 25, 2024
2 parents 5d09b06 + 52ddb14 commit 7ad0d39
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 133 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:

- name: Get Version
id: get_version
run: echo "VERSION=$(python .github/scripts/read_version.py)" >> $GITHUB_ENV
run: echo "VERSION=$(python .github/scripts/get_version.py)" >> $GITHUB_ENV

- name: Build & Push Docker Image for mlflow
uses: docker/build-push-action@v2
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -294,3 +294,4 @@ testBase*/
converted_data/
.pyre/
databases/
.utils/
73 changes: 1 addition & 72 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

113 changes: 53 additions & 60 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,18 +1,44 @@
[build-system]
requires = [ "poetry-core",]
build-backend = "poetry.core.masonry.api"

[project]
dependencies = [ "mkdocstrings-python",]

[tool.poetry]
name = "vambn"
version = "1.0.0"
version = "2.0.0"
description = ""
authors = ["Manuel Lentzen <manuel.lentzen@scai.fraunhofer.de>", "Sophia Krix <sophia.krix@scai.fraunhofer.de>", "Diego Valderama <diego.felipe.valderrama.nino@scai.fraunhofer.de", "Tamara Raschka <tamara.raschka@scai.fraunhofer.de>"]
authors = [ "Manuel Lentzen <manuel.lentzen@scai.fraunhofer.de>", "Sophia Krix <sophia.krix@scai.fraunhofer.de>", "Diego Valderama <diego.felipe.valderrama.nino@scai.fraunhofer.de", "Tamara Raschka <tamara.raschka@scai.fraunhofer.de>",]
readme = "README.md"
packages = [{include = "vambn"}]
[[tool.poetry.packages]]
include = "vambn"

[[tool.poetry.source]]
name = "torch"
url = "https://download.pytorch.org/whl"
priority = "explicit"

[tool.commitizen]
name = "cz_conventional_commits"
version = "2.0.0"
tag_format = "v$version"

[tool.ruff]
line-length = 80
fix = true
indent-width = 4
target-version = "py311"
ignore-init-module-imports = true
exclude = [ "**/__init__.py",]

[tool.pytpye]
disable = [ "recursion-error",]

[tool.poetry.dependencies]
python = ">=3.10,<3.12"
optuna = "3.5.0"
scikit-learn = "^1.2.1"
ipykernel = "^6.20.2"
torch = {version = "2.2.0+cu121", source = "torch"}
torchvision = {version = "0.17.0+cu121", source = "torch"}
mlflow = "^2.1.1"
typer = "0.9.0"
plotly = "^5.13.0"
Expand All @@ -24,15 +50,12 @@ sqlalchemy = "1.4.46"
protobuf = "3.20"
plotnine = "^0.12.4"
lightning = "^2.0.1"
rope = "^1.7.0"
kaleido = "0.2.1"
lets-plot = "^4.0.1"
cairosvg = "^2.7.1"
typeguard = "^4.1.5"
setuptools-cuda = "^0.0.6"
torchmetrics = "^1.2.0"
pydantic = "^2.4.2"
pip = "^23.3.1"
jupyter = "^1.0.0"
wandb = "^0.16.0"
tensorboardx = "^2.6.2.2"
Expand All @@ -54,6 +77,25 @@ mkdocstrings = "^0.25.1"
mkdocstrings-python = "^1.10.5"
pymdown-extensions = "^10.8.1"

[tool.ruff.format]
quote-style = "double"

[tool.poetry.dependencies.torch]
version = "2.2.0+cu121"
source = "torch"

[tool.poetry.dependencies.torchvision]
version = "0.17.0+cu121"
source = "torch"

[tool.ruff.lint.pydocstyle]
convention = "google"

[tool.ruff.lint.pycodestyle]
max-line-length = 80
ignore-overlong-task-comments = false
max-doc-length = 80

[tool.poetry.group.dev.dependencies]
mypy = "^0.991"
black = "^22.12.0"
Expand All @@ -68,56 +110,7 @@ autoflake = "^2.2.1"
pytype = "^2023.10.31"
pyre-check = "^0.9.19"
ruff = "^0.1.5"
rope = "^1.11.0"
vulture = "^2.11"
pyright = "^1.1.350"

[tool.commitizen]
name = "cz_conventional_commits"
version = "2.0.0"
tag_format = "v$version"

[build-system]
requires = ["poetry-core"]
build-backend = "poetry.core.masonry.api"

[[tool.poetry.source]]
name = "torch"
url = "https://download.pytorch.org/whl"
priority="explicit"

[tool.ruff]
line-length = 80
fix = true
indent-width = 4
target-version = "py311"
ignore-init-module-imports = true
exclude = ["**/__init__.py"]

[tool.ruff.format]
quote-style = "double"


[tool.ruff.lint.pydocstyle]
convention = "google"



[tool.ruff.lint.pycodestyle]
max-line-length = 80
ignore-overlong-task-comments = false
max-doc-length = 80


[tool.pytpye]
disable=[
"recursion-error",
]


# PEP 621 dependencies declaration
# adapt to your dependencies manager
[project]
dependencies = [
"mkdocstrings-python",
]
rope = "^1.13.0"
ipykernel = "^6.29.5"

0 comments on commit 7ad0d39

Please sign in to comment.