Skip to content

Commit fd7f177

Browse files
authored
Merge pull request #69 from CCPBioSim/jimboid-patch-1
change conda install syntax and add renovate custommanager to parse them
2 parents 3f7e3c7 + e84c639 commit fd7f177

2 files changed

Lines changed: 34 additions & 5 deletions

File tree

‎.github/renovate.json‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,34 @@
1515
"groupName": "GitHub Actions",
1616
"addLabels": ["ci", "dependencies"]
1717
}
18+
],
19+
"customManagers": [
20+
{
21+
"customType": "regex",
22+
"managerFilePatterns": [
23+
"/(^|/)Dockerfile[^/]*$/"
24+
],
25+
"matchStringsStrategy": "recursive",
26+
"matchStrings": [
27+
"pip3? install[\\s\\S]*?(?<packages>(?:[\\w.-]+==[\\w.-]+[\\s\\\\]*)+)",
28+
"(?<depName>[\\w.-]+)==(?<currentValue>[\\w.-]+)"
29+
],
30+
"datasourceTemplate": "pypi",
31+
"versioningTemplate": "pep440"
32+
},
33+
{
34+
"customType": "regex",
35+
"managerFilePatterns": [
36+
"/(^|/)Dockerfile[^/]*$/"
37+
],
38+
"matchStringsStrategy": "recursive",
39+
"matchStrings": [
40+
"(?:mamba|conda) install[\\s\\S]*?(?<packages>(?:(?:[\\w-]+::)?[\\w.-]+=[\\w.-]+[\\s\\\\]*)+)",
41+
"(?:(?<channel>[\\w-]+)::)?(?<depName>[\\w.-]+)=(?<currentValue>[\\w.-]+)"
42+
],
43+
"datasourceTemplate": "conda",
44+
"registryUrlTemplate": "https://api.anaconda.org/package/{{#if channel}}{{channel}}{{else}}conda-forge{{/if}}/",
45+
"versioningTemplate": "pep440"
46+
}
1847
]
1948
}

‎docker/Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ WORKDIR $HOME
1010

1111
# Install workshop deps
1212
RUN conda install -y -c conda-forge \
13-
matplotlib=3.11.1 \
14-
numpy=2.5.3 \
15-
pandas=3.0.5 \
16-
nglview=4.0.1 \
17-
ipywidgets=8.1.9
13+
conda-forge::matplotlib=3.11.1 \
14+
conda-forge::numpy=2.5.3 \
15+
conda-forge::pandas=3.0.5 \
16+
conda-forge::nglview=4.0.1 \
17+
conda-forge::ipywidgets=8.1.9
1818
RUN pip install --no-cache-dir \
1919
mdtraj==1.11.1
2020

0 commit comments

Comments
 (0)