Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge recent changes from dev and VSCode installation into main #34

Merged
merged 13 commits into from
Oct 1, 2024
+9,569 −987
Merged

Merge recent changes from dev and VSCode installation into main #34

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ef378c5
testing new environment
betolink Mar 26, 2024
58f4bc8
testing new environment
betolink Mar 26, 2024
8cb5468
only build linux64
betolink Mar 26, 2024
0fa5433
testing leaner env
betolink Mar 26, 2024
e324d1e
update start
betolink Mar 26, 2024
e65f5ad
updaing environment
betolink Apr 3, 2024
ff76d1b
updating env
betolink Apr 3, 2024
0100a87
updating env
betolink Apr 3, 2024
39dffde
move pip to environment.yml
betolink Apr 10, 2024
c157f90
Merge branch 'main' into dev
ateucher Jun 25, 2024
dd58964
Update environment
ateucher Jun 25, 2024
693163b
Add docker USER command back in
ateucher Jun 26, 2024
91640aa
Update pangeo base image and env.
ateucher Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Update pangeo base image and env. 
Closes #35
@ateucher
ateucher committed Sep 11, 2024
commit 91640aacf8323d5e3fd28a9d6bd3836d5f97fdd7
2 changes: 1 addition & 1 deletion ci/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM pangeo/base-image:2024.03.22
FROM pangeo/base-image:2024.08.18
# build file for pangeo images
RUN conda init zsh && conda init bash

12,253 changes: 1,985 additions & 10,268 deletions ci/conda-lock.yml
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ci/environment-lock.yml
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,6 @@ name: env-lock
channels:
- conda-forge
dependencies:
- conda-lock=1.2.1
- conda-lock
- mamba>=1.0
- pip