From 7c4113e34d5fb46002d8afdf8260d877ad595f83 Mon Sep 17 00:00:00 2001 From: Stefan Negru Date: Mon, 13 Mar 2023 17:18:14 +0200 Subject: [PATCH 1/2] small additions to pyproject.toml --- pyproject.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index f05c3064c..ef8b2dcff 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,6 +7,7 @@ name = "swift-browser-ui" dynamic = ["version"] description = "Object browser Web UI for Openstack Swift API" readme = "README.md" +requires-python = ">=3.10" license = "MIT" authors = [ { name = "CSC Developers" }, @@ -67,6 +68,7 @@ swift-x-account-sharing = "swift_browser_ui.launcher:run_sharing" [project.urls] Source = "https://github.com/CSCfi/swift-browser-ui" +Documentation = "https://swift-browser-ui.readthedocs.io" [tool.hatch.version] path = "swift_browser_ui/__init__.py" From 0a5f7a95f8c57e864a2f871dfc0346781272ee4f Mon Sep 17 00:00:00 2001 From: Stefan Negru Date: Tue, 14 Mar 2023 08:08:42 +0200 Subject: [PATCH 2/2] remove static symlink from dockerfiles --- dockerfiles/Dockerfile-request | 4 ++++ dockerfiles/Dockerfile-runner | 4 ++++ dockerfiles/Dockerfile-sharing | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/dockerfiles/Dockerfile-request b/dockerfiles/Dockerfile-request index db4be1ce2..884de9975 100644 --- a/dockerfiles/Dockerfile-request +++ b/dockerfiles/Dockerfile-request @@ -4,6 +4,10 @@ COPY pyproject.toml /root/swift_request/pyproject.toml COPY README.md /root/swift_request/README.md COPY swift_browser_ui /root/swift_request/swift_browser_ui +# remove this link as it creates issues with hatch +# in pyproject.toml +RUN rm /root/swift_request/swift_browser_ui/ui/static + RUN --mount=type=cache,target=/root/.cache/pip \ pip install --upgrade pip \ && pip install /root/swift_request diff --git a/dockerfiles/Dockerfile-runner b/dockerfiles/Dockerfile-runner index e10b6c0af..d057b5a5d 100644 --- a/dockerfiles/Dockerfile-runner +++ b/dockerfiles/Dockerfile-runner @@ -4,6 +4,10 @@ COPY pyproject.toml /root/swift_upload_runner/pyproject.toml COPY README.md /root/swift_upload_runner/README.md COPY swift_browser_ui /root/swift_upload_runner/swift_browser_ui +# remove this link as it creates issues with hatch +# in pyproject.toml +RUN rm /root/swift_upload_runner/swift_browser_ui/ui/static + RUN --mount=type=cache,target=/root/.cache/pip \ pip install --upgrade pip \ && pip install /root/swift_upload_runner diff --git a/dockerfiles/Dockerfile-sharing b/dockerfiles/Dockerfile-sharing index e0a38f664..0088eeae8 100644 --- a/dockerfiles/Dockerfile-sharing +++ b/dockerfiles/Dockerfile-sharing @@ -4,6 +4,10 @@ COPY pyproject.toml /root/swift_sharing/pyproject.toml COPY README.md /root/swift_sharing/README.md COPY swift_browser_ui /root/swift_sharing/swift_browser_ui +# remove this link as it creates issues with hatch +# in pyproject.toml +RUN rm /root/swift_sharing/swift_browser_ui/ui/static + RUN --mount=type=cache,target=/root/.cache/pip \ pip install --upgrade pip \ && pip install /root/swift_sharing