Merge pull request #17 from gematik/feature/update-for-pipeline

Feature/update for pipeline

Author: cybernop

.gitignore

@@ -1,5 +1,6 @@
 .venv/
 **/__pycache__
+**/*.egg-info
 
 # OS specific
 # MacOS

.vscode/settings.json

@@ -2,9 +2,7 @@
     "python.testing.unittestArgs": [
         "-v",
         "-s",
-        "./test",
-        "-p",
-        "*_test.py"
+        "./test"
     ],
     "python.testing.pytestEnabled": false,
     "python.testing.unittestEnabled": true

ReleaseNotes.md

@@ -2,6 +2,13 @@
 
 # Release Notes FHIR Scripts
 
+## Release 0.15.0
+
+* Support _uv_ and _pipx_ to install in isolated Python environments (_uv_ is default)
+* Dry-run (`--dry-run`) option to simulate deployment
+* Promote argument (`--promote-from`) to promote content from one environment to another
+* First version of a unified Docker image
+
 ## Release 0.14.0
 
 * Allow to define additional OpenAPI files to be added to the archive using the config file

docker/devcontainer/Dockerfile

@@ -0,0 +1,48 @@
+FROM mcr.microsoft.com/devcontainers/base:alpine-3.20
+
+# Setzen der Umgebungsvariablen
+ENV CLOUD_SDK_VERSION=464.0.0
+ENV FIRELY_TERMINAL_VERSION=3.3.2
+ENV JAVA_VALIDATOR_VERSION=6.3.25
+
+# Google Cloud SDK herunterladen und installieren
+RUN curl -O https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-${CLOUD_SDK_VERSION}-linux-x86_64.tar.gz && \
+    tar -xf google-cloud-cli-${CLOUD_SDK_VERSION}-linux-x86_64.tar.gz && \
+    ./google-cloud-sdk/install.sh --quiet && \
+    rm google-cloud-cli-${CLOUD_SDK_VERSION}-linux-x86_64.tar.gz
+
+RUN apk add --no-cache \
+    # .NET SDK for Firely Terminal
+    dotnet8-sdk \
+    # icu-libs \
+    # Node.js and NPM for FSH Sushi
+    nodejs npm \
+    # Java (OpenJDK) and Jeykll for IG Publisher
+    openjdk17 jekyll \
+    # Additional dependencies
+    # jq findutils curl ca-certificates \
+    # PlantUML
+    graphviz fontconfig
+
+# Setup for FHIR Validator
+RUN mkdir -p /home/vscode/.fhir/validators/
+RUN wget -q https://github.com/hapifhir/org.hl7.fhir.core/releases/download/$JAVA_VALIDATOR_VERSION/validator_cli.jar -O /home/vscode/.fhir/validators/validator_cli.jar
+
+# Switch to the vscode user
+USER vscode
+
+# Add gcloud to user path
+ENV PATH="/google-cloud-sdk/bin:${PATH}"
+
+# Install UV for Python environments
+RUN curl -LsSf https://astral.sh/uv/install.sh | sh
+ENV PATH="/home/vscode/.local/bin:${PATH}"
+
+RUN uv tool install git+https://github.com/gematik/fhir-scripts.git
+
+RUN fhirscripts install \
+    --sushi \
+    --firely-terminal
+
+# Add Firely Terminal to user path
+ENV PATH="/home/vscode/.dotnet/tools:${PATH}"

docker/devcontainer/example.devcontainer.json

@@ -0,0 +1,6 @@
+{
+    "name": "FHIR Development",
+    "image": "gematik1/fhir-devcontainer",
+    "postCreateCommand": "fhirscripts install --config-file",
+    "postStartCommand": "fhirscripts update"
+}

poetry.lock

@@ -1,11 +1,11 @@
 [project]
 name = "fhir-scripts"
-version = "0.14.0"
+version = "0.15.0"
 description = ""
 authors = [
     { name = "Alexander Essenwanger", email = "alexander.essenwanger@gematik.de" },
 ]
-license = { text = "Apache-2.0" }
+license-files = ["LICENSE"]
 readme = "README.md"
 requires-python = ">=3.12"
 dependencies = [
@@ -15,19 +15,8 @@ dependencies = [
     "requests (>=2.32.5,<3.0.0)",
 ]
 
-[build-system]
-requires = ["poetry-core>=2.0.0,<3.0.0"]
-build-backend = "poetry.core.masonry.api"
-
 [project.scripts]
 fhirscripts = "fhir_scripts.main:main"
 
 [dependency-groups]
 dev = ["black (>=25.9.0,<26.0.0)"]
-
-# [project.optional-dependencies]
-# igtools = ["igtools @ git+https://github.com/onyg/req-tooling"]
-# epatools = ["epatools @ git+https://github.com/onyg/epa-tools.git"]
-# publishtools = [
-#     "publish-tools @ git+https://github.com/gematik/publish-tools.git",
-# ]

pyproject.toml

@@ -58,4 +58,10 @@ def get_args(
                 f"No setup function for parser or subparser defined for '{module.__name__}'"
             )
 
-    return parser.parse_args()
+    args = parser.parse_args()
+
+    if args.cmd is None:
+        parser.print_help()
+        exit(0)
+
+    return args