Skip to content

Commit b26713b

Browse files
author
Sricharan Reddy Varra
authored
Removed Docker Builds (#1168)
* removed docker * updated license classifier * removed windows setup, added 'no module named ark' suggestion to make sure the environment is used * adjusted index.rst
1 parent e22a487 commit b26713b

File tree

12 files changed

+8
-490
lines changed

12 files changed

+8
-490
lines changed

.dockerignore

Lines changed: 0 additions & 95 deletions
This file was deleted.

.github/workflows/docker.yml

Lines changed: 0 additions & 86 deletions
This file was deleted.

.github/workflows/release.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1-
name: Build Wheels and upload to PyPI
1+
name: Publish Python 🐍 distribution 📦 to PyPI and TestPyPI
22

33
on:
4-
pull_request:
5-
branches: ["releases/**"]
6-
types: [labeled, opened, synchronize, reopened]
74
release:
85
types: [published]
9-
workflow_dispatch:
106

117
concurrency:
128
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}

Dockerfile

Lines changed: 0 additions & 53 deletions
This file was deleted.

README.md

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ This will automatically open your browser with a link to our Jupyter notebooks.
153153

154154
Be sure to keep this terminal open. **Do not exit the terminal or enter `control-c` until you are finished with the notebooks**.
155155

156-
You can shut down the notebooks and close docker by entering `control-c` in the terminal window.
156+
You can shut down the notebooks by entering `control-c` in the terminal window.
157157

158158
**REMEMBER TO DUPLICATE AND RENAME NOTEBOOKS**
159159

@@ -251,27 +251,6 @@ the cell expression of that marker when you mouse over the cell in Mantis.
251251

252252
![](docs/_images/mantis_feature_view.png)
253253

254-
### External Hard Drives and Google File Stream
255-
256-
To configure external hard drive (or google file stream) access, you will have to add this to Dockers file paths in the Preferences menu.
257-
258-
On Docker for macOS, this can be found in Preferences -> Resources -> File Sharing. Adding `/Volumes` will allow docker to see external drives
259-
260-
On Docker for Windows with the WSL2 backend, no paths need to be added. However, if using the Hyper-V backend, these paths will need to be added as in the macOS case.
261-
262-
![](docs/_images/docker_preferences.png)
263-
264-
Once the path is added, you can run:
265-
```
266-
bash start_docker.sh --external 'path/added/to/preferences'
267-
```
268-
or
269-
```
270-
bash start_docker.sh -e 'path/added/to/preferences'
271-
```
272-
273-
to mount the drive into the virtual `/data/external` path inside the docker.
274-
275254
## Updating the Repository
276255

277256
This project is still under development, and we are making frequent changes and improvements. If you want to update the version on your computer to have the latest changes, perform the following steps. Otherwise, we recommend waiting for new releases.
@@ -283,13 +262,7 @@ git pull
283262
```
284263

285264
Then, run the command below to update the Jupyter notebooks to the latest version
286-
```sh
287-
./start_docker.sh --update
288-
```
289-
or
290-
```sh
291-
./start_docker.sh -u
292-
```
265+
293266

294267
If you have made changes to these notebooks that you would like to keep (specific file paths, settings, custom routines, etc), rename them before updating!
295268

docs/_rtd/data_types.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,6 @@ If you are using your own spatial analysis tools to generate information for the
5858
* `PRE_CHANNEL_COL`: Set this to be the column name which precedes first channel column.
5959
* `POST_CHANNEL_COL`: Set this to be the column name which comes after the last channel column.
6060

61-
Afterwards the Docker Image can be started with the updated settings.
62-
```sh
63-
start_docker.sh
64-
```
6561

6662
---
6763

docs/_rtd/development.md

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -57,48 +57,11 @@ To verify installation, activate your `conda` environment with `conda activate <
5757

5858
You're now set to start working with `ark-analysis`! Please look at [our contributing guidelines](contributing.html) for more information about development. For detailed explanations of the functions available to you in `ark`, please consult the Libraries section of this documentation.
5959
60-
### Updating Ark Analysis in the Docker
6160
62-
**Note** that code changes aren't automatically propagated into the Docker Image.
63-
However there may be times where you would like to work with and test out new changes and features.
64-
65-
You may update the current version of `ark-analysis` by running the following commands
66-
in the Jupyter Lab terminal.
67-
68-
```sh
69-
cd /opt/ark-analysis
70-
git pull
71-
pip install .
72-
```
73-
74-
#### Using ark functions directly
61+
### Using ark functions directly
7562
7663
If you will only be using functions in `ark` without developing on top of it, do not clone the repo. Simply run `pip install ark-analysis` inside the virtual environment to gain access to our functions. To verify installation, type `conda list ark-analysis` after completion. If `ark-analysis` is listed, the installation was successful. You can now access the `ark` library with `import ark`.
7764
78-
### Developing template notebooks via Docker
79-
80-
If you are using docker for your virtual environment, and plan to develop and commit template notebooks, then you should use the `--develop-notebook-templates` flag for `start_docker.sh`.
81-
82-
Typically, the `./templates` folder is copied into `./scripts` before starting docker and Jupyter is started within `./scripts`. This enables users of `ark-analysis` to use the notebooks without dirtying the git working directory—doing so would cause merge conflicts on pull. When using `--develop-notebook-templates`, `./templates` is used directly, so changes are changes reflected directly.
83-
84-
To enable, pass the either `-d` or `--develop-notebook-templates` to `start_docker.sh`
85-
86-
$ ./start_docker -d
87-
88-
Now notebooks can be `git diff`ed and `git commit`ed without having to copy changed notedbooks between `./scripts` and `./templates`.
89-
90-
### Building Docker Images Locally
91-
92-
It may be useful to be able to manually build a new Docker Image as features get added, changes made and libraries updated.
93-
Specifically, updating Python libraries requires building a new docker image from scratch.
94-
95-
96-
Once you are in `ark-analysis`, the Docker Image can be built with the following command.
97-
```
98-
docker build -t ark-analysis .
99-
```
100-
101-
The docker image will now build, and this process can take some time.
10265
10366
### More on xarrays
10467

docs/_rtd/faq.md

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,17 @@
11
## FAQ
2-
32
### When I run the notebook, it says "No module named 'ark'"
4-
5-
This error generally happens if you run the notebook outside of Docker. Simply running `jupyter notebook` or `jupyter lab` on a notebook will not start Docker for you. You need to explicitly run `bash start_docker.sh` and follow the prompts in our [README](https://github.com/angelolab/ark-analysis/blob/main/README.md).
6-
7-
If you continue to run into issues, make sure you don't have any other Docker sessions running.
8-
3+
This could be an issue with the `ark_env` Conda environment. Make sure that `ark_env` is activated before opening `jupyter lab`. You can also try to reinstall the package with `pip install ark-analysis`.
94
### I got an error when running the notebook
105

116
The functions in `ark` have a lot of error checking built in. This means that if any of the arguments are wrong, you will get a ValueError of some kind. There's a good chance that the error message will tell you in very direct terms what the problem is, so please carefully read the error message.
127

138
For example, if you get an invalid path error, the error message indicate which part of the path doesn't exist, helping you to troubleshoot.
149

15-
If you're still stuck, please completely close the notebook, kill the docker, and restart everything. If you've exhausted all of these options and are still getting the same error, feel free to open an [issue](https://github.com/angelolab/ark-analysis/issues/new/choose).
10+
If you're still stuck, please completely close the notebook, and restart everything. If you've exhausted all of these options and are still getting the same error, feel free to open an [issue](https://github.com/angelolab/ark-analysis/issues/new/choose).
1611

1712
### My kernel keeps dying
1813

19-
This means Docker is running out of memory. To increase the memory, open Docker Preferences (on Mac, click the whale logo with boxes on the top menu bar, and select Preferences). Select Resources on the left panel, and a slider will appear for Docker memory usage which you can use to increase.
20-
21-
Keep in mind that you should be careful increasing your Docker memory usage above half of your computer RAM. For example, if you have a 16 GB computer, we recommend not increasing your Docker memory above 8 GB.
22-
23-
Avoid adjusting the CPUs, Swap, and Disk Image Size sliders.
14+
This could be caused by many things. The most common reason may be memory related, please submit an issue.
2415

2516
### How can I help improve this project?
2617

0 commit comments

Comments
 (0)