Skip to content

Commit 5121f6e

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/anaconda_black_GHSA-fj7x-q9j7-g6q6' into anaconda_black_GHSA-fj7x-q9j7-g6q6
2 parents 7c17c45 + 43da6ed commit 5121f6e

File tree

69 files changed

+8837
-481
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+8837
-481
lines changed

cgmanifest.json

Lines changed: 42 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@
200200
"Git": {
201201
"Name": "Oh My Zsh!",
202202
"repositoryUrl": "https://github.com/ohmyzsh/ohmyzsh",
203-
"commitHash": "4fd2af0a82e2826317d9551ecd8d5f44553828d7"
203+
"commitHash": "6dfa9507ce0eb0f4d386bd03268e33943ea55c0f"
204204
}
205205
}
206206
},
@@ -300,7 +300,27 @@
300300
"Git": {
301301
"Name": "vcpkg",
302302
"repositoryUrl": "https://github.com/microsoft/vcpkg",
303-
"commitHash": "0719a71389654b88d827501d88e37e58ea8cbd70"
303+
"commitHash": "1daec834f2095a800631df5d86a7f9075222aebe"
304+
}
305+
}
306+
},
307+
{
308+
"Component": {
309+
"Type": "git",
310+
"Git": {
311+
"Name": "vcpkg",
312+
"repositoryUrl": "https://github.com/microsoft/vcpkg",
313+
"commitHash": "a164ace504d8fe6f50aeec7e235d22b9089ad0d5"
314+
}
315+
}
316+
},
317+
{
318+
"Component": {
319+
"Type": "git",
320+
"Git": {
321+
"Name": "vcpkg",
322+
"repositoryUrl": "https://github.com/microsoft/vcpkg",
323+
"commitHash": "ba5364d24ea72b11d8aafc2566e524d064016988"
304324
}
305325
}
306326
},
@@ -459,7 +479,7 @@
459479
"Type": "go",
460480
"Go": {
461481
"Name": "golang.org/x/tools/gopls",
462-
"Version": "0.15.1"
482+
"Version": "0.15.2"
463483
}
464484
}
465485
},
@@ -611,7 +631,7 @@
611631
"Git": {
612632
"Name": "Oh My Zsh!",
613633
"repositoryUrl": "https://github.com/ohmyzsh/ohmyzsh",
614-
"commitHash": "4fd2af0a82e2826317d9551ecd8d5f44553828d7"
634+
"commitHash": "6dfa9507ce0eb0f4d386bd03268e33943ea55c0f"
615635
}
616636
}
617637
},
@@ -686,7 +706,7 @@
686706
"Type": "RubyGems",
687707
"RubyGems": {
688708
"Name": "bundler",
689-
"Version": "2.5.6"
709+
"Version": "2.5.7"
690710
}
691711
}
692712
},
@@ -724,7 +744,7 @@
724744
"Git": {
725745
"Name": "ruby-build",
726746
"repositoryUrl": "https://github.com/rbenv/ruby-build.git",
727-
"commitHash": "09da542276c0bd9c23d34a71eeaba5aafe5fa975"
747+
"commitHash": "683dc597740c20f60bd460ec1d8362e92cea93dc"
728748
}
729749
}
730750
},
@@ -781,7 +801,7 @@
781801
"Type": "Pip",
782802
"Pip": {
783803
"Name": "autopep8",
784-
"Version": "2.0.4"
804+
"Version": "2.1.0"
785805
}
786806
}
787807
},
@@ -790,7 +810,7 @@
790810
"Type": "Pip",
791811
"Pip": {
792812
"Name": "black",
793-
"Version": "24.2.0"
813+
"Version": "24.3.0"
794814
}
795815
}
796816
},
@@ -853,7 +873,7 @@
853873
"Type": "Pip",
854874
"Pip": {
855875
"Name": "pipx",
856-
"Version": "1.4.3"
876+
"Version": "1.5.0"
857877
}
858878
}
859879
},
@@ -882,7 +902,7 @@
882902
"Type": "other",
883903
"Other": {
884904
"Name": "Composer",
885-
"Version": "2.7.1",
905+
"Version": "2.7.2",
886906
"DownloadUrl": "https://getcomposer.org/"
887907
}
888908
}
@@ -1230,7 +1250,7 @@
12301250
"Type": "cargo",
12311251
"Cargo": {
12321252
"Name": "rust-analysis",
1233-
"Version": "1.76.0"
1253+
"Version": "1.77.1"
12341254
}
12351255
}
12361256
},
@@ -1239,7 +1259,7 @@
12391259
"Type": "cargo",
12401260
"Cargo": {
12411261
"Name": "rust-src",
1242-
"Version": "1.76.0"
1262+
"Version": "1.77.1"
12431263
}
12441264
}
12451265
},
@@ -1248,7 +1268,7 @@
12481268
"Type": "cargo",
12491269
"Cargo": {
12501270
"Name": "clippy",
1251-
"Version": "1.76.0"
1271+
"Version": "1.77.1"
12521272
}
12531273
}
12541274
},
@@ -1296,7 +1316,7 @@
12961316
"Type": "npm",
12971317
"Npm": {
12981318
"Name": "typescript",
1299-
"Version": "5.4.2"
1319+
"Version": "5.4.3"
13001320
}
13011321
}
13021322
},
@@ -1458,7 +1478,7 @@
14581478
"Type": "Pip",
14591479
"Pip": {
14601480
"Name": "torch",
1461-
"Version": "2.2.1"
1481+
"Version": "2.2.2"
14621482
}
14631483
}
14641484
},
@@ -1467,7 +1487,7 @@
14671487
"Type": "Pip",
14681488
"Pip": {
14691489
"Name": "plotly",
1470-
"Version": "5.19.0"
1490+
"Version": "5.20.0"
14711491
}
14721492
}
14731493
},
@@ -1493,7 +1513,7 @@
14931513
"Type": "RubyGems",
14941514
"RubyGems": {
14951515
"Name": "rake",
1496-
"Version": "13.1.0"
1516+
"Version": "13.2.0"
14971517
}
14981518
}
14991519
},
@@ -1503,7 +1523,7 @@
15031523
"Git": {
15041524
"Name": "Oh My Zsh!",
15051525
"repositoryUrl": "https://github.com/ohmyzsh/ohmyzsh",
1506-
"commitHash": "4fd2af0a82e2826317d9551ecd8d5f44553828d7"
1526+
"commitHash": "6dfa9507ce0eb0f4d386bd03268e33943ea55c0f"
15071527
}
15081528
}
15091529
},
@@ -1532,7 +1552,7 @@
15321552
"Type": "other",
15331553
"Other": {
15341554
"Name": "kubectl",
1535-
"Version": "v1.29.2",
1555+
"Version": "v1.29.3",
15361556
"DownloadUrl": "https://github.com/kubernetes/kubectl"
15371557
}
15381558
}
@@ -1542,7 +1562,7 @@
15421562
"Type": "other",
15431563
"Other": {
15441564
"Name": "Helm",
1545-
"Version": "3.14.2",
1565+
"Version": "3.14.3",
15461566
"DownloadUrl": "https://github.com/helm/helm"
15471567
}
15481568
}
@@ -1552,7 +1572,7 @@
15521572
"Type": "other",
15531573
"Other": {
15541574
"Name": "Docker Compose",
1555-
"Version": "2.24.7",
1575+
"Version": "2.26.1",
15561576
"DownloadUrl": "https://github.com/docker/compose"
15571577
}
15581578
}
@@ -1562,7 +1582,7 @@
15621582
"Type": "other",
15631583
"Other": {
15641584
"Name": "GitHub CLI",
1565-
"Version": "2.45.0",
1585+
"Version": "2.46.0",
15661586
"DownloadUrl": "https://github.com/cli/cli"
15671587
}
15681588
}

src/anaconda/.devcontainer/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ RUN python3 -m pip install --upgrade \
3030
pyarrow==14.0.1 \
3131
# https://github.com/advisories/GHSA-v68g-wm8c-6x7j
3232
transformers==4.36.0 \
33-
# https://github.com/advisories/GHSA-3f63-hfp8-52jq
34-
pillow==10.2.0 \
33+
# https://github.com/advisories/GHSA-44wm-f244-xhp3
34+
pillow==10.3.0 \
3535
# https://github.com/advisories/GHSA-44cc-43rp-5947
3636
jupyterlab==4.0.11 \
3737
# https://github.com/advisories/GHSA-5h86-8mv2-jq9f

src/anaconda/.devcontainer/devcontainer-lock.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
"integrity": "sha256:afa1f582e09d6b4e78d21baad80f4729af763c3910e152101f55273fd2921fb5"
77
},
88
"ghcr.io/devcontainers/features/node:1": {
9-
"version": "1.4.0",
10-
"resolved": "ghcr.io/devcontainers/features/node@sha256:71ff7ada788ab351cc535ca390d079e2cde6c4821c892031851953c2b3859fda",
11-
"integrity": "sha256:71ff7ada788ab351cc535ca390d079e2cde6c4821c892031851953c2b3859fda"
9+
"version": "1.4.1",
10+
"resolved": "ghcr.io/devcontainers/features/node@sha256:6c4f444d8e3eb68594d60ec128bce76a80647edc2b9a94960ca377895855145f",
11+
"integrity": "sha256:6c4f444d8e3eb68594d60ec128bce76a80647edc2b9a94960ca377895855145f"
1212
}
1313
}
1414
}

src/anaconda/history/0.204.13.md

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
# [anaconda](https://github.com/devcontainers/images/tree/main/src/anaconda)
2+
3+
**Image version:** 0.204.13
4+
5+
**Source release/branch:** [v0.3.34](https://github.com/devcontainers/images/tree/v0.3.34/src/anaconda)
6+
7+
**Digest:** sha256:5c80c6287fa11f89dfd399906f34771eca639f737c20bc248d9b3c1a543397b2
8+
9+
**Tags:**
10+
```
11+
mcr.microsoft.com/devcontainers/anaconda:0.204.13-3
12+
```
13+
> *To keep up to date, we recommend using partial version numbers. Use the major version number to get all non-breaking changes (e.g. `0-`) or major and minor to only get fixes (e.g. `0.200-`).*
14+
15+
**Linux distribution:** Debian GNU/Linux 11 (bullseye)
16+
17+
**Architectures:** linux/amd64, linux/arm64
18+
19+
**Available (non-root) user:** vscode
20+
21+
### Contents
22+
**Languages and runtimes**
23+
24+
| Language / runtime | Version | Path |
25+
|--------------------|---------|------|
26+
| [Python](https://www.python.org/) | 3.11.7 | /opt/conda |
27+
| [Jupyter Notebooks](https://jupyter.org/) | 7.0.8 | /opt/conda |
28+
| [Jupyter Lab](https://jupyter.org/) | 4.0.11 | /opt/conda |
29+
30+
**Tools installed using git**
31+
32+
| Tool | Commit | Path |
33+
|------|--------|------|
34+
| [Oh My Zsh!](https://github.com/ohmyzsh/ohmyzsh) | fd01fd66ce27c669e5ffaea94460a37423d1e134 | /home/vscode/.oh-my-zsh |
35+
36+
**Pip / pipx installed tools and packages**
37+
38+
| Tool / package | Version |
39+
|----------------|---------|
40+
| joblib | 1.3.1 |
41+
| cookiecutter | 2.2.3 |
42+
| cryptography | 42.0.4 |
43+
| mistune | 3.0.1 |
44+
| numpy | 1.25.2 |
45+
| certifi | 2024.2.2 |
46+
| setuptools | 68.2.2 |
47+
| future | 0.18.3 |
48+
| wheel | 0.41.2 |
49+
| nbconvert | 7.7.3 |
50+
| Werkzeug | 2.3.6 |
51+
| requests | 2.31.0 |
52+
| tornado | 6.3.3 |
53+
| transformers | 4.36.0 |
54+
| jupyter_server | 2.7.2 |
55+
56+
**Other tools and utilities**
57+
58+
| Tool | Version | Path |
59+
|------|---------|------|
60+
| [git](https://github.com/git/git) | 2.44.0 |
61+
| [conda](https://github.com/conda/conda) | 24.3.0 | /opt/conda |
62+
63+
**Additional linux tools and packages**
64+
65+
| Tool / library | Version |
66+
|----------------|---------|
67+
| apt-transport-https | 2.2.4 |
68+
| apt-utils | 2.2.4 |
69+
| ca-certificates | 20210119 |
70+
| curl | 7.74.0-1.3+deb11u11 |
71+
| dialog | 1.3-20201126-1 |
72+
| git | 1:2.30.2-1+deb11u2 |
73+
| gnupg2 | 2.2.27-2+deb11u2 |
74+
| htop | 3.0.5-7 |
75+
| iproute2 | 5.10.0-4 |
76+
| jq | 1.6-2.1 |
77+
| less | 551-2 |
78+
| libc6 | 2.31-13+deb11u8 |
79+
| libgssapi-krb5-2 | 1.18.3-6+deb11u4 |
80+
| libicu67 | 67.1-7 |
81+
| libkrb5-3 | 1.18.3-6+deb11u4 |
82+
| liblttng-ust0 | 2.12.1-1 |
83+
| libssl1.1 | 1.1.1w-0+deb11u1 |
84+
| libstdc++6 | 10.2.1-6 |
85+
| locales | 2.31-13+deb11u8 |
86+
| lsb-release | 11.1.0 |
87+
| lsof | 4.93.2+dfsg-1.1 |
88+
| man-db | 2.9.4-2 |
89+
| manpages | 5.10-1 |
90+
| manpages-dev | 5.10-1 |
91+
| nano | 5.4-2+deb11u2 |
92+
| ncdu | 1.15.1-1 |
93+
| net-tools | 1.60+git20181103.0eebece-1 |
94+
| openssh-client | 1:8.4p1-5+deb11u3 |
95+
| procps | 2:3.3.17-5 |
96+
| psmisc | 23.4-2 |
97+
| rsync | 3.2.3-4+deb11u1 |
98+
| strace | 5.10-1 |
99+
| sudo | 1.9.5p2-3+deb11u1 |
100+
| unzip | 6.0-26+deb11u1 |
101+
| vim-tiny | 2:8.2.2434-3+deb11u1 |
102+
| wget | 1.21-1+deb11u1 |
103+
| yarn | 1.22.19-1 |
104+
| zip | 3.0-12 |
105+
| zlib1g | 1:1.2.11.dfsg-2+deb11u2 |
106+
| zsh | 5.8-6+deb11u1 |
107+

src/anaconda/history/dev.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
**Source release/branch:** [main](https://github.com/devcontainers/images/tree/main/src/anaconda)
66

7-
**Digest:** sha256:7cd8ee54ef3ce8c7d767b227fabffb7b4b674e2d00311694ae8503f223ae8668
7+
**Digest:** sha256:9ff0d07597c74a045b2c485e999b9826fec6555f24306a06ac989e2ff82a1221
88

99
**Tags:**
1010
```
@@ -58,7 +58,7 @@ mcr.microsoft.com/devcontainers/anaconda:dev-3
5858
| Tool | Version | Path |
5959
|------|---------|------|
6060
| [git](https://github.com/git/git) | 2.44.0 |
61-
| [conda](https://github.com/conda/conda) | 24.1.2 | /opt/conda |
61+
| [conda](https://github.com/conda/conda) | 24.3.0 | /opt/conda |
6262

6363
**Additional linux tools and packages**
6464

src/anaconda/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "0.204.12",
2+
"version": "0.204.13",
33
"build": {
44
"latest": true,
55
"rootDistro": "debian",

src/anaconda/test-project/test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ checkPythonPackageVersion "aiohttp" "3.9.2"
4747
checkPythonPackageVersion "jupyter_server" "2.7.2"
4848
checkPythonPackageVersion "tornado" "6.3.3"
4949
checkPythonPackageVersion "pyarrow" "14.0.1"
50-
checkPythonPackageVersion "pillow" "10.2.0"
50+
checkPythonPackageVersion "pillow" "10.3.0"
5151
checkPythonPackageVersion "jupyterlab" "4.0.11"
5252
checkPythonPackageVersion "gitpython" "3.1.41"
5353
checkPythonPackageVersion "jupyter-lsp" "2.2.2"

0 commit comments

Comments
 (0)