Merge branch 'feature/buff-worms' into fix/ENG-8627

Author: sh-andriy

Dockerfile

@@ -3,14 +3,10 @@ FROM python:3.13-slim
 
 RUN usermod -d /home www-data \
     && chown www-data:www-data /home \
-    # -slim images strip man dirs, but java won't install unless this dir exists.
-    && mkdir -p /usr/share/man/man1 \
-    && echo "deb http://deb.debian.org/debian bookworm-backports main" > /etc/apt/sources.list.d/backports.list \
-    && apt-get update \
-    # HACK: work around bug in install java (dep of libreoffice)
-    && apt-get install -y ca-certificates-java \
+    && apt-get update
+
     # mfr dependencies
-    && apt-get install -y \
+RUN apt-get install -y \
         git \
         make \
         gcc \
@@ -32,17 +28,10 @@ RUN usermod -d /home www-data \
         # pspp dependencies
         pspp \
         # grab gosu for easy step-down from root
-        gosu \
-        # unoconv dependencies
-    && apt-get -t bookworm-backports install -y \
-        libreoffice-core \
-        libreoffice-writer \
-        libreoffice-calc \
-        libreoffice-impress \
-        libreoffice-java-common \
-    && apt-get clean \
-    && apt-get autoremove -y \
-    && rm -rf /var/lib/apt/lists/*
+        gosu
+RUN apt-get clean
+RUN apt-get autoremove -y
+RUN rm -rf /var/lib/apt/lists/*
 
 RUN mkdir -p /code
 WORKDIR /code

docs/conf.py

@@ -176,11 +176,7 @@
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'mfrdoc'
 
+# This block will use the same theme when building locally as on RTD.
 on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
-
-# On RTD we can't import sphinx_rtd_theme, but it will be applied by
-# default anyway.  This block will use the same theme when building locally
-# as on RTD.
 if not on_rtd:
-    import sphinx_rtd_theme  # noqa: F401
     html_theme = 'sphinx_rtd_theme'

poetry.lock

@@ -46,6 +46,9 @@ openpyxl = "^3.1"
 waterbutler = { git = "https://github.com/CenterForOpenScience/waterbutler.git", branch = "feature/buff-worms" }
 markupsafe = "2.0.1"
 celery = "5.5.0"
+black = "^25.1.0"
+isort = "^6.0.1"
+ruff = "^0.12.7"
 
 
 [tool.poetry.group.dev]
@@ -845,3 +848,50 @@ jasp = "mfr.extensions.jasp:JASPRenderer"
 
 # Zip
 zip = "mfr.extensions.zip:ZipRenderer"
+
+[tool.black]
+line-length = 88
+target-version = ["py313"]
+include = '\.pyi?$'
+exclude = '''
+/(
+  \.venv
+ |\.eggs
+ |_build
+ |build
+ |dist
+ |mfr\.egg-info
+)/
+'''
+
+[tool.isort]
+profile = "black"
+line_length = 88
+known_first_party = ["mfr", "tests"]
+default_section = "THIRDPARTY"
+multi_line_output = 3
+include_trailing_comma = true
+force_grid_wrap = 0
+combine_as_imports = true
+skip = ["mfr.egg-info", ".venv"]
+
+[tool.ruff]
+target-version = "py313"
+line-length = 88
+extend-select = [
+  "E",
+  "F",
+  "C90",
+  "I",
+  "B",
+]
+extend-ignore = [
+  "E203"
+]
+exclude = [
+  "mfr.egg-info",
+  ".venv",
+  "build",
+  "dist",
+  "ipynb"
+]