Skip to content

Commit ae90a4d

Browse files
committed
Update readme and add tqdm
1 parent 9f9c69a commit ae90a4d

File tree

4 files changed

+51
-33
lines changed

4 files changed

+51
-33
lines changed

README.md

Lines changed: 33 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,61 @@
11
# Gerlich Jupyter
2-
**Gerlich Jupyter** This is the the Gerlich group base container for [JupyterHub](https://jupyterhub.vbc.ac.at/), with all internally used NGS and image analysis tools preinstalled.
2+
**Gerlich Jupyter** This is the Gerlich group base container for [JupyterHub](https://jupyterhub.vbc.ac.at/), with all internally used NGS and image analysis tools preinstalled.
33

44
# Startup on VBC JupyterHub
55

6-
You can run use this container on [JupyterHub](https://jupyterhub.vbc.ac.at/).
7-
To set it up, use the following settings.
6+
You can use this container on [JupyterHub](https://jupyterhub.vbc.ac.at/).
7+
To set it up, use the following settings:
88
- After authenticating on JupyterHub and clicking "Add New Server" on the hub homepage, select `JupyterLab based on custom Singularity image (EXPERIMENTAL)`
9-
- Type in the link to the image location, you can find a link in the [changelog](./changelog.md)
9+
- Type in the link to the image location. You can find a link in the [changelog](./changelog.md).
1010
- **Attention:** You do not need to contact IT. We set everything up for you!
1111

12-
1312
![JupyterHub Settings](images/settings.png)
1413

15-
16-
You change the version by changing the version identifier, which is the part of the image URL after the colon:
14+
You can change the version by modifying the version identifier, which is the part of the image URL after the colon:
1715
`.../gerlichlab/jupyter-gerlich:YOUR_FAVORITE_VERSION`
1816

19-
or <span style="color:red">**copy and past the link from the version subsection below.**<span>
17+
or <span style="color:red">**copy and paste the link from the version subsection below.**<span>
2018

21-
**Please for now use the cached location!**
22-
23-
Once the server is started, do not choose a specific kernel. Rather, choose the basic Python3 kernel.
19+
**Please, for now, use the cached location!**
2420

21+
Once the server is started, do not choose a specific kernel. Instead, choose the basic Python3 kernel.
2522

2623
![Python Kernel](images/kernel.png)
2724

28-
2925
It will contain everything installed in the container.
3026

3127
# Running the notebook locally (OPTIONAL)
32-
For your convenience, you can then start a notebook server with all the necessary libraries installed with:
28+
For your convenience, you can start a notebook server with all the necessary libraries installed by running:
3329
`docker-compose up` from the command line in the directory of this repository.
34-
Then open up a browser and navigate to http://localhost:9999 or http://localhost:9999/lab for the jupyter lab interface.
35-
This will prompt you for a password, which we disclosed in the python club lecture.
30+
Then open a browser and navigate to http://localhost:9999 or http://localhost:9999/lab for the JupyterLab interface.
31+
This will prompt you for a password, which we disclosed in the Python Club lecture.
32+
33+
If you use this setup more regularly, please change the password in the `jupyter_notebook_config.py`.
34+
To do this, modify the following line in the configuration file:
35+
36+
```python
37+
# The string should be of the form type:salt:hashed-password.
38+
c.NotebookApp.password = u'sha1:d1ed07fdae18:5423fffeca03b4b1c1d96f79317abe816a220a69'
39+
```
40+
41+
To create a new hashed password, you can use the following Python code:
42+
43+
```python
44+
from notebook.auth import passwd
45+
print(passwd())
46+
```
3647

37-
If you use this setup more regularly, please change the password in the jupyter_notebook_config.py
48+
This will prompt you to enter a new password and generate a hashed password string. Replace the existing value of `c.NotebookApp.password` with the new hashed password string.
3849

3950
# Connecting the local notebook to VSCode
4051
A brief description by Michael can be found [here](https://github.com/gerlichlab/python_club_seq_formats_I).
4152

4253
# How do I get a custom version?
4354

44-
1. Fork the repository
45-
1. Create a new branch
46-
1. Modify the [gerlich_base.yml](./gerlich_base.yml) (e.g., add all your missing libraries or change the version of the libraries)
47-
1. Test your build by running: `docker-compose -f docker-dev.yml up`
48-
1. Test your notebook in the browser: `http://localhost:9999`
55+
1. Fork the repository.
56+
1. Create a new branch.
57+
1. Modify the [gerlich_base.yml](./gerlich_base.yml) (e.g., add all your missing libraries or change the version of the libraries).
58+
1. Test your build by running: `docker-compose -f docker-dev.yml up`.
59+
1. Test your notebook in the browser: `http://localhost:9999`.
4960
1. Pushing your branch will create a pull request. Add a description for your version, including what is different from the base version and why it was created. The description can be extended and modified on the GitHub homepage.
50-
1. Contact Christoph or Michael. We will give it a new version number and make it available on JupyterHub, at `jupyterhub.vbc.ac.at`
61+
1. Contact Christoph or Michael. We will give it a new version number and make it available on JupyterHub at `jupyterhub.vbc.ac.at`.

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.8
1+
1.9

changelog.md

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
# Changelog
22

3-
## Verion 1.8
3+
## Version 1.9
4+
- Version for the Teloni et al. paper
5+
6+
Cached Location:
7+
8+
`/groups/gerlich/labinfo/Methods/singularity_images/gerlich_jupyter_version-1.9.sif`
9+
10+
## Version 1.8
411
- Version 1.7 - lmfit and linescan tool, and removed legacy NGS packages
512

613
Cached Location:
@@ -11,8 +18,7 @@ Singularity image URL:
1118

1219
`https://singularity.vbc.ac.at/v1/imagefile/library/gerlichlab/jupyter-gerlich:version-1.8`
1320

14-
15-
## Verion 1.7
21+
## Version 1.7
1622
- Version 1.6 - updated bioframe to v0.6.2
1723

1824
Cached Location:
@@ -23,21 +29,21 @@ Singularity image URL:
2329

2430
`https://singularity.vbc.ac.at/v1/imagefile/library/gerlichlab/jupyter-gerlich:main`
2531

26-
## Verion 1.6
32+
## Version 1.6
2733
- Version 1.5 - updated jupyterlab and batch spawner
2834

29-
## Verion 1.5
35+
## Version 1.5
3036
- Version 1.4 + opencv, umap and shap
3137

32-
Chached Location:
38+
Cached Location:
3339

3440
`/groups/gerlich/labinfo/Methods/singularity_images/jupyter-gerlich:version-1.5`
3541

3642
Singularity image URL:
3743

3844
`https://singularity.vbc.ac.at/v1/imagefile/library/gerlichlab/jupyter-gerlich:version-1.5`
3945

40-
## Verion 1.4
46+
## Version 1.4
4147
- Version that supports to read ROI files .zip or .roi generated with ImageJ
4248

4349
Cached Location:
@@ -48,7 +54,7 @@ Singularity image URL:
4854

4955
`https://singularity.vbc.ac.at/v1/imagefile/library/gerlichlab/jupyter-gerlich:version-1.4`
5056

51-
## Verion 1.3
57+
## Version 1.3
5258

5359
- Fixed bug in ngs package
5460

@@ -60,7 +66,7 @@ Singularity image URL:
6066

6167
`https://singularity.vbc.ac.at/v1/imagefile/library/gerlichlab/jupyter-gerlich:version-1.3`
6268

63-
## Verion 1.2
69+
## Version 1.2
6470

6571
- Version with sparse package installed for dask access of coolers
6672

@@ -72,7 +78,7 @@ Singularity image URL:
7278

7379
`https://singularity.vbc.ac.at/v1/imagefile/library/gerlichlab/jupyter-gerlich:version-1.2`
7480

75-
## Verion 1.1
81+
## Version 1.1
7682

7783
- Version with singularity terminal support
7884

gerlich_base.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ dependencies:
5757
- python-graphviz
5858
- umap-learn
5959
- lmfit
60+
- tqdm
6061
#more ngs tools
6162
- pip
6263
- pip:

0 commit comments

Comments
 (0)