From 39e980a3d726a3a863f4bb4a6ef0a37147c9be86 Mon Sep 17 00:00:00 2001 From: James Gebbie-Rayet Date: Wed, 16 Sep 2026 13:57:04 +0100 Subject: [PATCH 1/2] Modify Renovate schedule and add custom managers Updated the schedule to run after 5am and before 5pm on weekdays. Added custom managers for pip and conda package installations. --- .github/renovate.json | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/.github/renovate.json b/.github/renovate.json index c54154b..0b3e5d8 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -5,7 +5,7 @@ "helpers:pinGitHubActionDigestsToSemver" ], "timezone": "Europe/London", - "schedule": ["after 9am and before 5pm every weekday"], + "schedule": ["after 5am and before 5pm every weekday"], "dependencyDashboard": true, "assignees": ["jimboid"], "minimumReleaseAge": "3 days", @@ -15,5 +15,34 @@ "groupName": "GitHub Actions", "addLabels": ["ci", "dependencies"] } + ], + "customManagers": [ + { + "customType": "regex", + "managerFilePatterns": [ + "/(^|/)Dockerfile[^/]*$/" + ], + "matchStringsStrategy": "recursive", + "matchStrings": [ + "pip3? install[\\s\\S]*?(?(?:[\\w.-]+==[\\w.-]+[\\s\\\\]*)+)", + "(?[\\w.-]+)==(?[\\w.-]+)" + ], + "datasourceTemplate": "pypi", + "versioningTemplate": "pep440" + }, + { + "customType": "regex", + "managerFilePatterns": [ + "/(^|/)Dockerfile[^/]*$/" + ], + "matchStringsStrategy": "recursive", + "matchStrings": [ + "(?:mamba|conda) install[\\s\\S]*?(?(?:(?:[\\w-]+::)?[\\w.-]+=[\\w.-]+[\\s\\\\]*)+)", + "(?:(?[\\w-]+)::)?(?[\\w.-]+)=(?[\\w.-]+)" + ], + "datasourceTemplate": "conda", + "registryUrlTemplate": "https://api.anaconda.org/package/{{#if channel}}{{channel}}{{else}}conda-forge{{/if}}/", + "versioningTemplate": "pep440" + } ] } From 2578042f3ac8853ac6518958be0562ad7b4b9332 Mon Sep 17 00:00:00 2001 From: James Gebbie-Rayet Date: Wed, 16 Sep 2026 15:15:15 +0100 Subject: [PATCH 2/2] Refactor package installation in Dockerfile Updated package installation to use conda-forge with specific versions for matplotlib, numpy, scipy, and ipywidgets. Updated pip installations to use specific versions for mdtraj, mdplus, and rlcluster. --- docker/Dockerfile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 1734567..4d90f00 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -9,8 +9,15 @@ USER $NB_USER WORKDIR $HOME # Install workshop deps -RUN mamba install matplotlib numpy scipy ipywidgets -y -RUN pip install mdplus mdtraj rlcluster +RUN conda install -y -c conda-forge \ + conda-forge::matplotlib=3.11.1 \ + conda-forge::numpy=2.5.3 \ + conda-forge::scipy=1.18.1 \ + conda-forge::ipywidgets=8.1.9 +RUN pip install --no-cache-dir \ + mdtraj==1.11.1.post2 \ + mdplus==0.1.2 \ + rlcluster==0.0.5 # Get workshop files and move them to jovyan directory. COPY --chown=1000:100 . .