Merge branch 'main' into joss

Author: RemDelaporteMathurin

Dockerfile

@@ -11,6 +11,9 @@ RUN npm run build
 # Python backend stage
 FROM python:3.11-slim
 
+# Build argument for version (can be set at build time)
+ARG VERSION=0.1.0
+
 # Install system dependencies
 RUN apt-get update && apt-get install -y \
     gcc \
@@ -23,22 +26,20 @@ WORKDIR /app
 COPY requirements.txt .
 RUN pip install --no-cache-dir -r requirements.txt
 
-# Install python core package
-RUN pip install .
+# Copy source code and package configuration
+COPY pyproject.toml .
+COPY src/ ./src/
+
+# Install python core package with setuptools-scm version override
+RUN SETUPTOOLS_SCM_PRETEND_VERSION_FOR_FUEL_CYCLE_SIM=${VERSION} pip install .
 
 # Install gunicorn for production WSGI server
 RUN pip install gunicorn
-
-# Copy backend source code
-COPY src/ ./src/
 # COPY *.py ./
 
 # Copy built frontend from previous stage
 COPY --from=frontend-build /app/dist ./dist
 
-# Create necessary directories
-RUN mkdir -p saved_graphs plots
-
 # Create non-root user for security
 RUN useradd --create-home --shell /bin/bash app \
     && chown -R app:app /app

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fuel-cycle-sim"
-version = "0.1.0"
+dynamic = ["version"]
 description = "A Python package for fuel cycle simulation with pathsim integration"
 readme = "README.md"
 license = {file = "LICENSE"}
@@ -24,7 +24,7 @@ classifiers = [
 ]
 requires-python = ">=3.8"
 dependencies = [
-    "pathsim>=0.8.0",
+    "pathsim>=0.8.2",
     "matplotlib>=3.7.0",
     "numpy>=1.24.0",
     "plotly>=6.0",
@@ -46,8 +46,8 @@ Issues = "https://github.com/yourusername/fuel-cycle-sim/issues"
 packages = ["fuel_cycle_sim"]
 package-dir = {"fuel_cycle_sim" = "src/python"}
 
-[tool.setuptools_scm]
-write_to = "src/python/_version.py"
-
 [tool.setuptools.package-data]
 fuel_cycle_sim = ["templates/*"]
+
+[tool.setuptools_scm]
+write_to = "src/python/_version.py"