Skip to content

Commit

Permalink
Merge branch 'devcontainers:main' into check-image-size
Browse files Browse the repository at this point in the history
  • Loading branch information
prathameshzarkar9 authored Mar 6, 2024
2 parents 99696a6 + 6c08bac commit 01cf037
Show file tree
Hide file tree
Showing 19 changed files with 481 additions and 709 deletions.
102 changes: 37 additions & 65 deletions cgmanifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"Type": "Pip",
"Pip": {
"Name": "cryptography",
"Version": "41.0.7"
"Version": "42.0.4"
}
}
},
Expand Down Expand Up @@ -72,7 +72,7 @@
"Type": "Pip",
"Pip": {
"Name": "setuptools",
"Version": "68.0.0"
"Version": "68.2.2"
}
}
},
Expand All @@ -90,7 +90,7 @@
"Type": "Pip",
"Pip": {
"Name": "wheel",
"Version": "0.38.4"
"Version": "0.41.2"
}
}
},
Expand Down Expand Up @@ -179,7 +179,7 @@
"Type": "other",
"Other": {
"Name": "git",
"Version": "2.43.1",
"Version": "2.43.0",
"DownloadUrl": "https://github.com/git/git"
}
}
Expand All @@ -200,7 +200,17 @@
"Git": {
"Name": "Oh My Zsh!",
"repositoryUrl": "https://github.com/ohmyzsh/ohmyzsh",
"commitHash": "8f22370af8bd390ea3b8610da1ccf388826d909d"
"commitHash": "fd01fd66ce27c669e5ffaea94460a37423d1e134"
}
}
},
{
"Component": {
"Type": "other",
"Other": {
"Name": "git",
"Version": "2.44.0",
"DownloadUrl": "https://github.com/git/git"
}
}
},
Expand Down Expand Up @@ -300,7 +310,7 @@
"Git": {
"Name": "vcpkg",
"repositoryUrl": "https://github.com/microsoft/vcpkg",
"commitHash": "345ac44ab8d6a16239d3af55df9608bf725e7a48"
"commitHash": "215a2535590f1f63788ac9bd2ed58ad15e6afdff"
}
}
},
Expand Down Expand Up @@ -459,7 +469,7 @@
"Type": "go",
"Go": {
"Name": "golang.org/x/tools/gopls",
"Version": "0.14.2"
"Version": "0.15.1"
}
}
},
Expand All @@ -468,7 +478,7 @@
"Type": "go",
"Go": {
"Name": "honnef.co/go/tools",
"Version": "0.4.5"
"Version": "0.4.6"
}
}
},
Expand Down Expand Up @@ -513,7 +523,7 @@
"Type": "go",
"Go": {
"Name": "github.com/go-delve/delve",
"Version": "1.22.0"
"Version": "1.22.1"
}
}
},
Expand Down Expand Up @@ -546,16 +556,6 @@
}
}
},
{
"Component": {
"Type": "other",
"Other": {
"Name": "Docker Image: golang",
"Version": "1.20-bookworm",
"DownloadUrl": "https://hub.docker.com/_/golang"
}
}
},
{
"Component": {
"Type": "other",
Expand All @@ -576,16 +576,6 @@
}
}
},
{
"Component": {
"Type": "other",
"Other": {
"Name": "Docker Image: golang",
"Version": "1.20-bullseye",
"DownloadUrl": "https://hub.docker.com/_/golang"
}
}
},
{
"Component": {
"Type": "other",
Expand Down Expand Up @@ -621,7 +611,7 @@
"Type": "npm",
"Npm": {
"Name": "eslint",
"Version": "8.56.0"
"Version": "8.57.0"
}
}
},
Expand All @@ -631,7 +621,7 @@
"Git": {
"Name": "Oh My Zsh!",
"repositoryUrl": "https://github.com/ohmyzsh/ohmyzsh",
"commitHash": "8f22370af8bd390ea3b8610da1ccf388826d909d"
"commitHash": "fd01fd66ce27c669e5ffaea94460a37423d1e134"
}
}
},
Expand Down Expand Up @@ -724,7 +714,7 @@
"Type": "RubyGems",
"RubyGems": {
"Name": "github-pages",
"Version": "229"
"Version": "231"
}
}
},
Expand All @@ -744,7 +734,7 @@
"Git": {
"Name": "ruby-build",
"repositoryUrl": "https://github.com/rbenv/ruby-build.git",
"commitHash": "e1b36a32fb87d61955ac38f1889b7e3cb3b2f407"
"commitHash": "09da542276c0bd9c23d34a71eeaba5aafe5fa975"
}
}
},
Expand Down Expand Up @@ -778,21 +768,12 @@
}
}
},
{
"Component": {
"Type": "Pip",
"Pip": {
"Name": "wheel",
"Version": "0.41.2"
}
}
},
{
"Component": {
"Type": "Pip",
"Pip": {
"Name": "pylint",
"Version": "3.0.3"
"Version": "3.1.0"
}
}
},
Expand All @@ -819,7 +800,7 @@
"Type": "Pip",
"Pip": {
"Name": "black",
"Version": "24.1.1"
"Version": "24.2.0"
}
}
},
Expand Down Expand Up @@ -873,7 +854,7 @@
"Type": "Pip",
"Pip": {
"Name": "virtualenv",
"Version": "20.25.0"
"Version": "20.25.1"
}
}
},
Expand Down Expand Up @@ -1442,7 +1423,7 @@
"Type": "Pip",
"Pip": {
"Name": "pandas",
"Version": "2.2.0"
"Version": "2.2.1"
}
}
},
Expand All @@ -1460,7 +1441,7 @@
"Type": "Pip",
"Pip": {
"Name": "matplotlib",
"Version": "3.8.2"
"Version": "3.8.3"
}
}
},
Expand All @@ -1478,7 +1459,7 @@
"Type": "Pip",
"Pip": {
"Name": "scikit-learn",
"Version": "1.4.0"
"Version": "1.4.1.post1"
}
}
},
Expand All @@ -1487,7 +1468,7 @@
"Type": "Pip",
"Pip": {
"Name": "torch",
"Version": "2.2.0"
"Version": "2.2.1"
}
}
},
Expand All @@ -1496,7 +1477,7 @@
"Type": "Pip",
"Pip": {
"Name": "plotly",
"Version": "5.18.0"
"Version": "5.19.0"
}
}
},
Expand All @@ -1509,15 +1490,6 @@
}
}
},
{
"Component": {
"Type": "Pip",
"Pip": {
"Name": "setuptools",
"Version": "68.2.2"
}
}
},
{
"Component": {
"Type": "Pip",
Expand All @@ -1541,7 +1513,7 @@
"Git": {
"Name": "Oh My Zsh!",
"repositoryUrl": "https://github.com/ohmyzsh/ohmyzsh",
"commitHash": "8f22370af8bd390ea3b8610da1ccf388826d909d"
"commitHash": "fd01fd66ce27c669e5ffaea94460a37423d1e134"
}
}
},
Expand All @@ -1551,7 +1523,7 @@
"Git": {
"Name": "nvs",
"repositoryUrl": "https://github.com/jasongin/nvs",
"commitHash": "22ae0829b84624c49192112213d2556b9d42d99e"
"commitHash": "fe734a2f57fea0065ce70260b441752e3f6c30ae"
}
}
},
Expand All @@ -1570,7 +1542,7 @@
"Type": "other",
"Other": {
"Name": "kubectl",
"Version": "v1.29.1",
"Version": "v1.29.2",
"DownloadUrl": "https://github.com/kubernetes/kubectl"
}
}
Expand All @@ -1580,7 +1552,7 @@
"Type": "other",
"Other": {
"Name": "Helm",
"Version": "3.14.0",
"Version": "3.14.2",
"DownloadUrl": "https://github.com/helm/helm"
}
}
Expand All @@ -1590,7 +1562,7 @@
"Type": "other",
"Other": {
"Name": "Docker Compose",
"Version": "1.29.2",
"Version": "2.24.6",
"DownloadUrl": "https://github.com/docker/compose"
}
}
Expand All @@ -1600,7 +1572,7 @@
"Type": "other",
"Other": {
"Name": "GitHub CLI",
"Version": "2.43.1",
"Version": "2.45.0",
"DownloadUrl": "https://github.com/cli/cli"
}
}
Expand Down
16 changes: 8 additions & 8 deletions src/anaconda/history/dev.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

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

**Digest:** sha256:325da1654aca86e62d4acfb6d0ec94fbccf68e4f431121ad67710583c50797ea
**Digest:** sha256:0229de3856063d83e80f6f9226a953c2eef2fbd4c75b1401437db8b69b9ddd1e

**Tags:**
```
Expand All @@ -23,8 +23,8 @@ mcr.microsoft.com/devcontainers/anaconda:dev-3

| Language / runtime | Version | Path |
|--------------------|---------|------|
| [Python](https://www.python.org/) | 3.11.5 | /opt/conda |
| [Jupyter Notebooks](https://jupyter.org/) | 6.5.4 | /opt/conda |
| [Python](https://www.python.org/) | 3.11.7 | /opt/conda |
| [Jupyter Notebooks](https://jupyter.org/) | 7.0.8 | /opt/conda |
| [Jupyter Lab](https://jupyter.org/) | 4.0.11 | /opt/conda |

**Tools installed using git**
Expand All @@ -39,13 +39,13 @@ mcr.microsoft.com/devcontainers/anaconda:dev-3
|----------------|---------|
| joblib | 1.3.1 |
| cookiecutter | 2.2.3 |
| cryptography | 41.0.7 |
| cryptography | 42.0.4 |
| mistune | 3.0.1 |
| numpy | 1.25.2 |
| certifi | 2024.2.2 |
| setuptools | 68.0.0 |
| setuptools | 68.2.2 |
| future | 0.18.3 |
| wheel | 0.38.4 |
| wheel | 0.41.2 |
| nbconvert | 7.7.3 |
| Werkzeug | 2.3.6 |
| requests | 2.31.0 |
Expand All @@ -57,8 +57,8 @@ mcr.microsoft.com/devcontainers/anaconda:dev-3

| Tool | Version | Path |
|------|---------|------|
| [git](https://github.com/git/git) | 2.43.1 |
| [conda](https://github.com/conda/conda) | 23.7.4 | /opt/conda |
| [git](https://github.com/git/git) | 2.43.0 |
| [conda](https://github.com/conda/conda) | 24.1.2 | /opt/conda |

**Additional linux tools and packages**

Expand Down
Loading

0 comments on commit 01cf037

Please sign in to comment.