Merge pull request #249 from sillsdev/#238_upgrade_poetry

upgrade poetry to 1.7.1 (#249)
sillsdev · Dec 1, 2023 · a6c0a03 · a6c0a03
2 parents bcba32d + caa5c03
commit a6c0a03
Show file tree

Hide file tree

Showing 6 changed files with 2,348 additions and 2,567 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,6 +1,6 @@
 ARG CUDA_VERSION=11.2.2-cudnn8-runtime-ubuntu20.04
 ARG PYTHON_VERSION=3.8
-ARG POETRY_VERSION=1.2.2
+ARG POETRY_VERSION=1.7.1
 FROM nvidia/cuda:$CUDA_VERSION
 ARG PYTHON_VERSION
 ARG POETRY_VERSION

diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 ARG CUDA_VERSION=11.2.2-cudnn8-runtime-ubuntu20.04
 ARG PYTHON_VERSION=3.8
-ARG POETRY_VERSION=1.2.2
+ARG POETRY_VERSION=1.7.1
 
 FROM python:$PYTHON_VERSION-slim as builder
 ARG POETRY_VERSION

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -93,5 +93,4 @@ eflomal = ["eflomal"]
 [[tool.poetry.source]]
 name = "torch"
 url = "https://download.pytorch.org/whl/cu111"
-default = false
-secondary = true
+priority = "explicit"
diff --git a/scripts/clear_clearml_cache.py b/scripts/clear_clearml_cache.py
@@ -11,7 +11,7 @@
         "apt install -y python3-venv",
         "python3 -m pip install --user pipx",
         "PATH=$PATH:/root/.local/bin",
-        "pipx install poetry==1.2.2",
+        "pipx install poetry==1.7.1",
         "rm -rf /root/.cache/pip/{*,.*}",
         "rm -rf /root/.cache/pypoetry/{*,.*}",
         "rm -rf /root/.clearml/pip-download-cache/{*,.*}",

diff --git a/silnlp/nmt/clearml_connection.py b/silnlp/nmt/clearml_connection.py
@@ -55,7 +55,7 @@ def __post_init__(self) -> None:
                     "apt install -y python3-venv",
                     "python3 -m pip install --user pipx",
                     "PATH=$PATH:/root/.local/bin",
-                    "pipx install poetry==1.2.2",
+                    "pipx install poetry==1.7.1",
                 ],
             )
             if self.queue_name.lower() not in ("local", "locally"):