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.

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

Dev containers #1228

Merged
merged 57 commits into from
Dec 23, 2024
Merged
Show file tree
Hide file tree
Changes from 56 commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
c77f716
adding dev container config
drifter089 Oct 10, 2024
b076ea3
updated docekr file
drifter089 Oct 10, 2024
96d333b
updated docker file
drifter089 Oct 10, 2024
151bc2d
update: include java
GbotemiB Oct 14, 2024
05cf1c4
docker docs init
GbotemiB Oct 14, 2024
0d65aac
review welcome message for new users
GbotemiB Oct 14, 2024
a3d22ca
running tutorial before push
drifter089 Oct 21, 2024
952583a
fixing clone command in CI
drifter089 Oct 21, 2024
9a1fb06
fixing variable value
drifter089 Oct 21, 2024
ad189c5
Fix issue of adding H2 store in `add_extra_components` rule (#1134)
yerbol-akhmetov Oct 15, 2024
fffe9c7
[pre-commit.ci] pre-commit autoupdate (#1131)
pre-commit-ci[bot] Oct 16, 2024
ed8e300
Add a restriction to rasterio version (#1146)
ekatef Oct 16, 2024
95e0aab
Enable configfile specification for mock_snakemake (#1135)
yerbol-akhmetov Oct 16, 2024
fb5c61b
update: set env file required for cluster network
GbotemiB Oct 22, 2024
4fc5fc3
update: include mac into the CI
GbotemiB Oct 28, 2024
b54eacd
adding user as secret
drifter089 Oct 29, 2024
5a6e210
delete duplicate file and add user as secret
drifter089 Oct 29, 2024
8abaa7b
setup docekr on macos
drifter089 Oct 29, 2024
a2f570e
trying colima for docekr setup on mac
drifter089 Oct 29, 2024
9f4a0bf
adding mac docker setup
drifter089 Oct 29, 2024
928195e
installing colima on mac
drifter089 Oct 29, 2024
d50db33
disable buildkit for docker
drifter089 Oct 29, 2024
781f8ee
add buildx plugin
drifter089 Oct 29, 2024
d6188d2
include documentation for using docker container
GbotemiB Nov 6, 2024
49e5c5f
update docker docs
GbotemiB Nov 6, 2024
4117756
include docker readme
GbotemiB Nov 7, 2024
9a5dc0f
updated CI to build on ubuntu only and test on both
drifter089 Nov 13, 2024
07590df
pushing test image before runningn tests
drifter089 Nov 13, 2024
9629a2e
adding updated build action
drifter089 Nov 13, 2024
fc27e5a
removing cache
drifter089 Nov 13, 2024
a0ba73a
removing tagging
drifter089 Nov 13, 2024
e1c4054
adding no cache to build
drifter089 Nov 13, 2024
bc4e8fb
no need to push again after checking
drifter089 Nov 13, 2024
52e5fce
Merge pull request #2 from pypsa-meets-earth/main
GbotemiB Dec 6, 2024
4d98000
Update devcontainer.yml
GbotemiB Dec 6, 2024
c610ddc
Update Dockerfile
drifter089 Dec 6, 2024
9c983ca
Update Dockerfile
GbotemiB Dec 6, 2024
c5c823f
Merge pull request #3 from drifter089/main
GbotemiB Dec 7, 2024
68bb45d
pre-commit bot run
drifter089 Dec 11, 2024
dca591b
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 11, 2024
6effd98
Delete .github/.devcontainer/test.sh
drifter089 Dec 11, 2024
d793625
Update devcontainer.yml
drifter089 Dec 11, 2024
05e692d
Merge branch 'main' of github.com:pypsa-meets-earth/pypsa-earth into …
GbotemiB Dec 13, 2024
4d659a3
fix precommit issues
GbotemiB Dec 13, 2024
1420450
trigger and image name
drifter089 Dec 14, 2024
c8654cf
Update setup.sh
drifter089 Dec 14, 2024
e03d724
restore BJ to country selection
GbotemiB Dec 21, 2024
57900e7
Merge branch 'main' into devContainers
GbotemiB Dec 23, 2024
afd9712
Include dev container and docker feature
GbotemiB Dec 23, 2024
4760a39
Update welcome message
GbotemiB Dec 23, 2024
c931b51
Update devcontainer.yml
GbotemiB Dec 23, 2024
1c3e3f4
Update Docker.MD
GbotemiB Dec 23, 2024
65c1ca3
Update Docker.MD
GbotemiB Dec 23, 2024
3106356
Update Docker.MD
GbotemiB Dec 23, 2024
5c96022
revert config.tutorial.yaml
GbotemiB Dec 23, 2024
0c042a0
Update docker_containers.rst
GbotemiB Dec 23, 2024
ee987ba
Merge branch 'main' into devContainers
GbotemiB Dec 23, 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
12 changes: 12 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// SPDX-FileCopyrightText: PyPSA-Earth and PyPSA-Eur Authors
//
// SPDX-License-Identifier: CC-BY-4.0
// For format details, see https://aka.ms/devcontainer.json.
{
"name": "pypsa earth dev",
"image": "ghcr.io/drifter089/pypsa-earth:latest",
"workspaceMount": "source=${localWorkspaceFolder},target=/workspaces,type=bind,consistency=cached",
"initializeCommand": "docker pull ghcr.io/drifter089/pypsa-earth:latest",
Comment on lines +6 to +9
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@drifter089 I understand that it has been crucial to test the docker workflow, and thanks a lot for making it work using your personal repo! For the stable implementation, I wonder if can we use pypsa-earth repo. Obviously, happy to provide you with all the administrative rights to maintain the docker images. Could it work?

"workspaceFolder": "/workspaces",
"postAttachCommand": "bash .devcontainer/setup.sh"
}
6 changes: 6 additions & 0 deletions .devcontainer/setup.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# SPDX-FileCopyrightText: PyPSA-Earth and PyPSA-Eur Authors
#
# SPDX-License-Identifier: CC-BY-4.0
#!/bin/sh

cat .devcontainer/welcome-message.txt
23 changes: 23 additions & 0 deletions .devcontainer/welcome-message.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# SPDX-FileCopyrightText: PyPSA-Earth and PyPSA-Eur Authors
#
# SPDX-License-Identifier: CC-BY-4.0



👋 Welcome to the PyPSA-Earth Development Environment!

We’re excited to have you here! This setup allows you to use and contribute to PyPSA-Earth using a development container in VS Code.

📖 Getting Started for New Users

• For a step-by-step guide on setting up your environment, debugging, and making your first contribution, refer to the PyPSA-Earth README here: (https://github.com/pypsa-meets-earth/pypsa-earth/blob/main/README.md). It covers everything you need to know as a newcomer.
• The configuration files for the development container are located in the .github/.devcontainer folder.

💡 Tips for New Users

• Make the most of VS Code by using the Command Palette (Cmd/Ctrl + Shift + P or F1) for quick access to features and commands.
• If you’re new to development containers, learn the basics at containers.dev.

🚀 Start Exploring and Happy Coding!

Don’t hesitate to reach out if you need help—our community is here to support you. You can access our discord server here: https://discord.gg/AnuJBk23FU
33 changes: 33 additions & 0 deletions .github/.devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/ubuntu
{
"name": "pypsa earth dev",
"build": {
"dockerfile": "../../Dockerfile"
},

"features": {
"ghcr.io/devcontainers-contrib/features/bash-command:1": {},
"ghcr.io/eliises/devcontainer-features/bash-profile:1": {}
},
"customizations": {
"vscode": {
"terminal.integrated.profiles.linux": {
"bash": {
"path": "/bin/bash"
}
},
"extensions": [
"ms-python.python",
"ms-python.vscode-pylance",
"ms-azuretools.vscode-docker",
"ms-toolsai.jupyter",
"zainchen.json",
"tomoki1207.pdf",
"grapecity.gc-excelviewer"
]
}
},

"postCreateCommand": "python -m pip install --upgrade debugpy"
}
32 changes: 32 additions & 0 deletions .github/workflows/devcontainer.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Dev Container Build and Push Image

on:
workflow_dispatch:
push:
branches: [main]
paths:
- envs/linux-pinned.yaml

jobs:
build:
runs-on: ubuntu-latest

steps:
- name: Checkout
id: checkout
uses: actions/checkout@v1

- name: Login to GitHub Container Registry
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ secrets.REGISTRY_USER }}
password: ${{ secrets.REGISTRY_TOKEN }}

- name: Build Dev Container Image
uses: devcontainers/[email protected]
with:
subFolder: .github
cacheFrom: ghcr.io/${{ github.repository }}-dev-env
imageName: ghcr.io/${{ github.repository }}-dev-env
push: always
58 changes: 58 additions & 0 deletions Docker.MD
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<!--
SPDX-FileCopyrightText: PyPSA-Earth and PyPSA-Eur Authors

SPDX-License-Identifier: AGPL-3.0-or-later
-->
# PyPSA-Earth Development Environment Setup with Docker

This guide provides an alternative way to set up a development environment for **PyPSA-Earth** using Docker containers. This method is particularly useful for users who are not familiar with programming or Python, or who prefer not to install Python directly on their local machine. Using Docker simplifies setup by creating a self-contained environment for PyPSA-Earth.

ekatef marked this conversation as resolved.
Show resolved Hide resolved
## Prerequisites

### 1. Install Docker

Ensure Docker is installed on your system. Follow the instructions for your operating system:

- **Windows**: [Docker for Windows](https://docs.docker.com/desktop/install/windows-install/)
- **Linux**: [Docker for Linux](https://docs.docker.com/desktop/install/linux/)
- **MacOS**: [Docker for MacOS](https://docs.docker.com/desktop/install/mac-install/)

### 2. Install Visual Studio Code(VSC)

You can use the link [here](https://code.visualstudio.com/download) to install Visual Studio Code on your operating system. Ensure to select the most compatible file for your operating system.

### 3. Install GitHub Desktop

You will also need GitHub Desktop to clone the PyPSA-Earth repository. Install GitHub Desktop for your operating system from [here](https://desktop.github.com/download/).

## Steps to Set Up PyPSA-Earth with Docker

### Step 1: Clone the Repository

1. Open **GitHub Desktop**.
2. Go to **File** > **Clone Repository**.
3. Paste the following URL in the URL field:

```bash
https://github.com/pypsa-meets-earth/pypsa-earth.git
```

4. Click on **Clone**.
5. Choose the location where you want to save the repository on your local machine.
6. After cloning, click on **Current Branch: main** and select `devContainers`.
7. Click on **Open in Visual Studio Code**.

### Step 2: Rebuild and Open in Container

1. Open the cloned repository in **VSCode**.
2. Click on the icon located at the bottom left corner of the VSCode window.
3. Select **Reopen in Container**.
4. Wait for the container to build and for the repository to open in the container.

Once these steps are completed, your development environment will be ready, and you can start using **PyPSA-Earth** in the Docker container.

---

You are now all set up! You can use the development environment to explore PyPSA-Earth and make modifications as needed within the Docker container.

You can start running the tutorial [here](https://pypsa-earth.readthedocs.io/en/latest/short_tutorial.html)
33 changes: 33 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# SPDX-FileCopyrightText: PyPSA-Earth and PyPSA-Eur Authors
#
# SPDX-License-Identifier: CC-BY-4.0
FROM condaforge/mambaforge

RUN conda update -n base conda
RUN conda install -n base conda-libmamba-solver
RUN conda config --set solver libmamba

RUN apt-get update && apt-get install -y bash git && apt-get install gcc -y
ekatef marked this conversation as resolved.
Show resolved Hide resolved

WORKDIR /pypsa-earth

COPY ./envs ./temp

RUN conda env create -n pypsa-earth -f temp/linux-pinned.yaml

RUN conda init bash
Comment on lines +12 to +18
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@davide-f and @ekatef ,
We are currently using the linux-pinned.yaml file to create the environment. Will these issues be resolved in future once we update the Linux-pinned configuration?
or should we try other way

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You mean the recent environment issues? A solution has still been found, we only need to align on implementing it (realistically speaking, it should be done by tomorrow European evening)


RUN touch ~/.bashrc && echo "conda activate pypsa-earth" >> ~/.bashrc

SHELL ["/bin/bash", "--login", "-c"]

ENV PATH /opt/conda/envs/pypsa-earth/bin:$PATH

RUN conda install conda-forge::openjdk -y

RUN rm -r temp

RUN conda clean -afy && \
rm -rf /tmp/*

CMD ["bash"]
51 changes: 51 additions & 0 deletions doc/docker_containers.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
.. SPDX-FileCopyrightText: PyPSA-Earth and PyPSA-Eur Authors
..
.. SPDX-License-Identifier: CC-BY-4.0

.. _docker_containers:

Alternate Installation with Docker
===============================================

This is an alternative way to create a development environment for PyPSA-Earth. This method is useful for users who are not familiar with programming or Python, or who do not want to install Python on their local machine. It uses Docker containers to create a development environment for PyPSA-Earth.

This section provides a step-by-step guide on how to set up and use Docker containers to run PyPSA-Earth.
ekatef marked this conversation as resolved.
Show resolved Hide resolved

Steps:

1. Install Docker: Follow the instructions for your operating system:

* `Windows <https://docs.docker.com/desktop/install/windows-install/>`_
* `Linux <https://docs.docker.com/desktop/install/linux/>`_
* `MacOS <https://docs.docker.com/desktop/install/mac-install/>`_

Ensure Docker is installed on your system.

2. You can use the link `here <https://code.visualstudio.com/download>`_ to install Visual Studio Code on your operating system. Ensure to select the most compatible file for your operating system.

3. Install GitHub Desktop for your OS `here <https://desktop.github.com/download/>`_.

4. Clone the repository:
* Open GitHub Desktop.
* Click on "File" in the top left corner.
* Click on "Clone Repository".
* Paste the following URL in the URL field:

.. code:: bash

https://github.com/pypsa-meets-earth/pypsa-earth.git

* Click on "Clone".
* Choose the location where you want to save the repository.
* Click on "Current Branch: main" and select `devContainers`.
* Click on "Open in Visual Studio Code".

The repository will be cloned to your local machine.

5. Rebuild and open in a container:
* Open the repository in VSCode.
* Click on the icon in the far bottom left corner of the VSCode window.
* Click on "Reopen in Container".
* Wait for the container to build and open the repository in the container.

The environment will be ready for use. You can now run PyPSA-Earth in the container.
2 changes: 2 additions & 0 deletions doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ Documentation

* :doc:`introduction`
* :doc:`installation`
* :doc:`docker_containers`
* :doc:`short_tutorial`
* :doc:`tutorial`
* :doc:`data_workflow`
Expand All @@ -132,6 +133,7 @@ Documentation

introduction
installation
docker_containers
short_tutorial
tutorial
data_workflow
Expand Down
1 change: 1 addition & 0 deletions doc/release_notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ This part of documentation collects descriptive release notes to capture the mai

* Include option in the config to allow for custom airport data `PR #1241 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/1241>`__

* Added Dev Containers and docker as an option to get started with pypsa-earth `PR #1228 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/1228>`__

**Minor Changes and bug-fixing**

Expand Down
Loading